You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2020/04/21 12:56:32 UTC
[jena] branch master updated: Ensure there is a final newline
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/master by this push:
new 1f6475c Ensure there is a final newline
new a08db86 Merge pull request #730 from afs/final-newline
1f6475c is described below
commit 1f6475cbfc26b6f0aa762d3a1842d87f5db4fb9f
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Mon Apr 20 14:31:13 2020 +0100
Ensure there is a final newline
---
.../jena/atlas/data/AbortableComparator.java | 2 +-
.../apache/jena/atlas/web/TypedInputStream.java | 22 +-
.../main/java/org/apache/jena/query/QueryType.java | 2 +-
.../main/java/org/apache/jena/query/TxnType.java | 19 +-
.../org/apache/jena/riot/lang/ReaderRDFNULL.java | 6 +-
.../riot/lang/extra/TurtleJavaccReaderRIOT.java | 7 +-
.../apache/jena/riot/resultset/rw/ResultsStAX.java | 18 +-
.../org/apache/jena/riot/system/FactoryRDF.java | 12 +-
.../apache/jena/riot/system/FactoryRDFCaching.java | 16 +-
.../org/apache/jena/riot/system/FactoryRDFStd.java | 16 +-
.../apache/jena/riot/system/ParserProfileStd.java | 2 +-
.../jena/riot/system/ParserProfileWrapper.java | 4 +-
.../org/apache/jena/riot/system/PrefixMap.java | 2 +-
.../org/apache/jena/riot/system/PrefixMapBase.java | 2 +-
.../java/org/apache/jena/riot/system/SQuad.java | 13 +-
.../java/org/apache/jena/riot/system/STriple.java | 10 +-
.../org/apache/jena/riot/system/StreamRDFLib.java | 60 +-
.../org/apache/jena/riot/writer/JsonLDWriter.java | 43 +-
.../apache/jena/riot/writer/TurtleWriterFlat.java | 4 +-
.../sparql/algebra/TransformQuadBlockGraph.java | 37 +-
.../jena/sparql/algebra/TransformQuadGraph.java | 39 +-
.../algebra/optimize/VariableUsagePopper.java | 4 +-
.../algebra/optimize/VariableUsagePusher.java | 6 +-
.../algebra/optimize/VariableUsageTracker.java | 4 +-
.../algebra/optimize/VariableUsageVisitor.java | 5 +-
.../apache/jena/sparql/core/DatasetChanges.java | 15 +-
.../jena/sparql/core/TransactionHandlerView.java | 8 +-
.../org/apache/jena/sparql/core/mem/TupleSlot.java | 2 +-
.../jena/sparql/engine/http/QueryEngineHTTP.java | 127 ++-
.../engine/iterator/QueryIterDistinctMem.java | 4 +-
.../sparql/expr/aggregate/lib/AccStatBase.java | 24 +-
.../aggregate/lib/AccStatStdDevPopulation.java | 6 +-
.../expr/aggregate/lib/AccStatStdDevSample.java | 4 +-
.../expr/aggregate/lib/AccStatVarPopulation.java | 4 +-
.../expr/aggregate/lib/AccStatVarSample.java | 4 +-
.../jena/sparql/expr/aggregate/lib/AggURI.java | 6 +-
.../sparql/function/js/FunctionJavaScript.java | 8 +-
.../org/apache/jena/sparql/function/js/NV.java | 42 +-
.../org/apache/jena/sparql/function/js/RDFJS.java | 6 +-
.../jena/sparql/graph/NodeTransformExpr.java | 16 +-
.../apache/jena/sparql/graph/NodeTransformLib.java | 30 +-
.../apache/jena/sparql/graph/NodeTransformOp.java | 8 +-
.../apache/jena/sparql/graph/PrefixMappingMem.java | 20 +-
.../jena/sparql/graph/PrefixMappingSink.java | 9 +-
.../jena/sparql/graph/PrefixMappingZero.java | 4 +-
.../sparql/modify/UpdateProcessRemoteBase.java | 34 +-
.../org/apache/jena/sparql/modify/UpdateSink.java | 3 +-
.../sparql/modify/request/UpdateSerializer.java | 11 +-
.../sparql/modify/request/UpdateWriterVisitor.java | 48 +-
.../jena/sparql/resultset/ResultSetWrapper.java | 7 +-
.../jena/sparql/serializer/TriplesListBlock.java | 6 +-
.../ApplyElementTransformVisitor.java | 6 +-
.../org/apache/jena/sparql/util/EqualityTest.java | 2 +-
.../org/apache/jena/sparql/util/RomanNumeral.java | 24 +-
.../java/org/apache/jena/common/TC_Common.java | 1 -
.../apache/jena/riot/lang/CatchParserOutput.java | 18 +-
.../apache/jena/riot/lang/extra/TS_LangExtra.java | 6 +-
.../sparql/algebra/optimize/TestReorderBGP.java | 17 +-
.../core/mem/TestDatasetGraphInMemoryPromote.java | 4 +-
.../apache/jena/sparql/engine/TestJsonEval.java | 16 +-
.../engine/TestQueryEngineMultiThreaded.java | 22 +-
.../iterator/TestSortedDataBagCancellation.java | 6 +-
.../org/apache/jena/sparql/expr/TestCastXSD.java | 14 +-
.../org/apache/jena/system/ExceptionFromTest.java | 2 +-
.../jena/atlas/iterator/IteratorTruncate.java | 4 +-
.../main/java/org/apache/jena/atlas/lib/Alarm.java | 4 +-
.../java/org/apache/jena/atlas/lib/AlarmClock.java | 4 +-
.../org/apache/jena/atlas/lib/PairOfSameType.java | 4 +-
.../apache/jena/atlas/lib/tuple/TConsumer3.java | 2 +-
.../apache/jena/atlas/lib/tuple/TConsumer4.java | 2 +-
.../apache/jena/atlas/lib/tuple/TFunction3.java | 6 +-
.../apache/jena/atlas/lib/tuple/TFunction4.java | 6 +-
.../org/apache/jena/atlas/lib/tuple/Tuple0.java | 2 +-
.../org/apache/jena/atlas/lib/tuple/Tuple1.java | 4 +-
.../org/apache/jena/atlas/lib/tuple/Tuple2.java | 4 +-
.../org/apache/jena/atlas/lib/tuple/Tuple3.java | 4 +-
.../org/apache/jena/atlas/lib/tuple/Tuple4.java | 4 +-
.../org/apache/jena/atlas/lib/tuple/Tuple5.java | 4 +-
.../org/apache/jena/atlas/lib/tuple/Tuple6.java | 4 +-
.../org/apache/jena/atlas/lib/tuple/Tuple7.java | 4 +-
.../org/apache/jena/atlas/lib/tuple/Tuple8.java | 4 +-
.../org/apache/jena/atlas/lib/tuple/TupleBase.java | 7 +-
.../apache/jena/atlas/lib/tuple/TupleFactory.java | 10 +-
.../org/apache/jena/atlas/lib/tuple/TupleList.java | 2 +-
.../apache/jena/atlas/lib/TestDateTimeUtils.java | 8 +-
.../main/java/org/apache/jena/graph/Factory.java | 14 +-
.../org/apache/jena/mem/HashedTripleBunch.java | 31 +-
.../jena/sys/JenaSubsystemRegistryBasic.java | 20 +-
.../jena/rdf/model/test/TestSelectorUse.java | 7 +-
.../jena/testing_framework/IResourceProducer.java | 2 +-
.../apache/jena/dboe/base/file/AlreadyLocked.java | 2 +-
.../java/org/apache/jena/dboe/index/TS_Index.java | 2 +-
.../jena/dboe/storage/prefixes/PrefixEntry.java | 2 +-
.../jena/dboe/transaction/Transactional.java | 2 +-
.../dboe/transaction/TransactionalMonitor.java | 2 +-
.../dboe/transaction/txn/IteratorTxnTracker.java | 4 +-
.../jena/tdb2/loader/base/MonitorOutput.java | 2 +-
.../apache/jena/tdb2/loader/main/DataBlock.java | 2 +-
.../apache/jena/tdb2/loader/main/InputStage.java | 2 +-
.../apache/jena/tdb2/loader/main/LoaderPlan.java | 2 +-
.../jena/tdb2/loader/main/PrefixHandler.java | 2 +-
.../tdb2/store/IteratorCheckNotConcurrent.java | 2 +-
.../apache/jena/tdb2/store/IteratorTxnTracker.java | 55 --
.../org/apache/jena/tdb2/store/NodeIdType.java | 2 +-
.../jena/tdb2/store/nodetable/NodeTableTRDF.java | 2 +-
.../store/AbstractTestStoreConnectionBasics.java | 2 +-
.../jena/tdb2/store/TestVisibilityOfChanges.java | 2 +-
.../org/apache/jena/fuseki/access/GraphFilter.java | 2 +-
.../apache/jena/fuseki/access/GraphFilterTDB1.java | 2 +-
.../apache/jena/fuseki/access/GraphFilterTDB2.java | 2 +-
.../org/apache/jena/fuseki/servlets/GSPTarget.java | 2 +-
.../jena/fuseki/system/UploadDetailsWithName.java | 18 +-
.../apache/jena/fuseki/main/cmds/FusekiMain.java | 902 ++++++++++-----------
.../apache/jena/fuseki/main/cmds/ServerConfig.java | 2 +-
.../java/org/apache/jena/fuseki/cmd/FusekiCmd.java | 6 +-
.../org/apache/jena/fuseki/TS_FusekiWebapp.java | 4 +-
.../org/apache/jena/fuseki/TestDatasetOps.java | 2 +-
.../rdfconnection/JenaConnectionException.java | 4 +-
.../org/apache/jena/rdfconnection/LibRDFConn.java | 18 +-
.../rdfconnection/RDFConnectionRemoteBuilder.java | 84 +-
.../org/apache/jena/shacl/ValidationReport.java | 6 +-
.../org/apache/jena/shacl/engine/TargetType.java | 2 +-
.../shacl/engine/constraint/ConstraintTerm.java | 4 +-
.../engine/constraint/DatatypeConstraint.java | 2 +-
.../engine/constraint/QualifiedValueShape.java | 2 +-
.../apache/jena/shacl/engine/constraint/ShAnd.java | 2 +-
.../jena/shacl/engine/constraint/ShNode.java | 4 +-
.../apache/jena/shacl/engine/constraint/ShNot.java | 2 +-
.../apache/jena/shacl/engine/constraint/ShOr.java | 2 +-
.../jena/shacl/engine/constraint/ShXone.java | 4 +-
.../shacl/engine/constraint/SparqlConstraint.java | 2 +-
.../jena/shacl/engine/exec/ValidationOp.java | 2 +-
.../apache/jena/shacl/lib/RDFDataException.java | 2 +-
.../org/apache/jena/shacl/parser/Constraints.java | 8 +-
.../org/apache/jena/shacl/parser/NodeShape.java | 3 +-
.../apache/jena/shacl/parser/PropertyShape.java | 2 +-
.../java/org/apache/jena/shacl/parser/Shape.java | 3 +-
.../apache/jena/shacl/validation/ReportEntry.java | 2 +-
.../jena/tdb/transaction/TestTransPromoteTDB.java | 2 +-
139 files changed, 1114 insertions(+), 1195 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/data/AbortableComparator.java b/jena-arq/src/main/java/org/apache/jena/atlas/data/AbortableComparator.java
index 124c6be..2b92f2c 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/data/AbortableComparator.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/data/AbortableComparator.java
@@ -68,4 +68,4 @@ public final class AbortableComparator<E> implements Comparator<E> {
public void cancel() {
cancelled = true;
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java b/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java
index 7740490..834974c 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java
@@ -25,46 +25,46 @@ import java.io.InputStream ;
import org.apache.jena.atlas.io.IO ;
public class TypedInputStream extends FilterInputStream
-{
+{
private ContentType mediaType ;
// The URI to use when parsing.
- // May be different from the URI used to access the resource
- // e.g. 303 redirection, mapped URI redirection
+ // May be different from the URI used to access the resource
+ // e.g. 303 redirection, mapped URI redirection
private String baseURI ;
private boolean isClosed = false ;
-
+
public static TypedInputStream wrap(InputStream in) {
return new TypedInputStream(in);
}
-
+
private TypedInputStream(InputStream in)
{ this(in, (ContentType)null, null) ; }
-
+
public TypedInputStream(InputStream in, String contentType)
{ this(in, ContentType.create(contentType), null) ; }
public TypedInputStream(InputStream in, ContentType ct)
{ this(in, ct, null) ; }
-
+
public TypedInputStream(InputStream in, ContentType ct, String baseURI)
{
super(in) ;
this.mediaType = ct ;
this.baseURI = baseURI ;
}
-
+
public String getContentType() { return mediaType == null ? null : mediaType.getContentTypeStr() ; }
public String getCharset() { return mediaType == null ? null : mediaType.getCharset() ; }
public ContentType getMediaType() { return mediaType ; }
public String getBaseURI() { return baseURI ; }
public InputStream getInputStream() { return super.in ; }
-
+
@Override
public void close() {
if ( isClosed )
return ;
isClosed = true;
- try { super.close(); }
+ try { super.close(); }
catch (IOException ex) { IO.exception(ex); }
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/query/QueryType.java b/jena-arq/src/main/java/org/apache/jena/query/QueryType.java
index 15ecb7d..83b8234 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/QueryType.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/QueryType.java
@@ -27,4 +27,4 @@ public enum QueryType {
SELECT, CONSTRUCT, ASK, DESCRIBE,
// ARQ special formats.
CONSTRUCT_JSON, CONSTRUCT_QUADS
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/query/TxnType.java b/jena-arq/src/main/java/org/apache/jena/query/TxnType.java
index 5367a74..121065b 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/TxnType.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/TxnType.java
@@ -28,18 +28,18 @@ public enum TxnType {
* <ul>
* <li>{@code WRITE}: this guarantees a WRITE will complete if {@code commit()} is
* called. The same as {@code begin(ReadWrite.WRITE)}.
- *
+ *
* <li>{@code READ}: the transaction can not promote to WRITE,ensuring read-only
* access to the data. The same as {@code begin(ReadWrite.READ)}.
- *
+ *
* <li>{@code READ_PROMOTE}: the transaction will go from "read" to "write" if the
* dataset has not been modified but if it has, the promotion fails with
* exception.
- *
- * <li>{@code READ_COMMITTED_PROMOTE}: Use this with care. The promotion will succeed but
+ *
+ * <li>{@code READ_COMMITTED_PROMOTE}: Use this with care. The promotion will succeed but
* changes from other transactions become visible.
* </ul>
- *
+ *
* Read committed: at the point transaction attempts promotion from "read" to
* "write", the system checks if the dataset has changed since the transaction started
* (called {@code begin}). If {@code READ_PROMOTE}, the dataset must not have
@@ -66,10 +66,10 @@ public enum TxnType {
default: throw new JenaTransactionException("Incompatible mode: "+txnType);
}
}
- /**
+ /**
* Translate a {@code TxnType} to it's initial {@link ReadWrite} mode.
- * {@code WRITE -> WRITE}, {@code READ* -> READ} regardless of promotion setting.
- */
+ * {@code WRITE -> WRITE}, {@code READ* -> READ} regardless of promotion setting.
+ */
public static ReadWrite initial(TxnType txnType) {
Objects.requireNonNull(txnType);
return (txnType == TxnType.WRITE) ? ReadWrite.WRITE : ReadWrite.READ;
@@ -80,5 +80,4 @@ public enum TxnType {
Objects.requireNonNull(promoteMode);
return (promoteMode == Transactional.Promote.ISOLATED) ? READ_PROMOTE : READ_COMMITTED_PROMOTE;
}
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRDFNULL.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRDFNULL.java
index e7f919a..cec8a26 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRDFNULL.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRDFNULL.java
@@ -37,9 +37,9 @@ public class ReaderRDFNULL implements ReaderRIOT {
return new ReaderRDFNULL();
}
}
-
+
public ReaderRDFNULL() {}
-
+
@Override
public void read(InputStream in, String baseURI, ContentType ct, StreamRDF output, Context context) {
IO.close(in);
@@ -49,4 +49,4 @@ public class ReaderRDFNULL implements ReaderRIOT {
public void read(Reader reader, String baseURI, ContentType ct, StreamRDF output, Context context) {
IO.close(reader);
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/TurtleJavaccReaderRIOT.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/TurtleJavaccReaderRIOT.java
index c308a63..230298f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/TurtleJavaccReaderRIOT.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/TurtleJavaccReaderRIOT.java
@@ -35,7 +35,7 @@ public class TurtleJavaccReaderRIOT implements ReaderRIOT {
// Must be a different content type.
// Must be a different file extension.
public static Lang lang = LangBuilder.create("TurtleJavaCC", "text/turtle-jcc").addFileExtensions("ttljcc").build();
-
+
public static void register() {
// This just registers the name, not the parser.
RDFLanguages.register(lang);
@@ -50,7 +50,7 @@ public class TurtleJavaccReaderRIOT implements ReaderRIOT {
private final ParserProfile profile;
private static ReaderRIOTFactory factory = (Lang language, ParserProfile profile) -> new TurtleJavaccReaderRIOT(profile) ;
-
+
public TurtleJavaccReaderRIOT(ParserProfile profile) { this.profile = profile; }
@Override
@@ -98,5 +98,4 @@ public class TurtleJavaccReaderRIOT implements ReaderRIOT {
throw new RiotParseException(ex.getMessage(), -1 , -1);
}
}
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/resultset/rw/ResultsStAX.java b/jena-arq/src/main/java/org/apache/jena/riot/resultset/rw/ResultsStAX.java
index b6dde3a..cb1949d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/resultset/rw/ResultsStAX.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/resultset/rw/ResultsStAX.java
@@ -85,7 +85,7 @@ public class ResultsStAX implements ResultSet, Closeable {
ResultsStAX rss = new ResultsStAX(xReader, model, context) ;
return rss.read();
}
-
+
// ResultSet variables
private QuerySolution current = null;
private XMLStreamReader parser = null;
@@ -107,9 +107,9 @@ public class ResultsStAX implements ResultSet, Closeable {
private boolean askResult = false;
private ResultsStAX(XMLStreamReader reader, Model model, Context context) {
-
-
-
+
+
+
parser = reader ;
this.model = model ;
boolean inputGraphBNodeLabels = (context != null) && context.isTrue(ARQ.inputGraphBNodeLabels);
@@ -125,7 +125,7 @@ public class ResultsStAX implements ResultSet, Closeable {
else
return new SPARQLResult(askResult);
}
-
+
private void init() {
try {
// Because all the tags are different, we could use one big
@@ -351,9 +351,9 @@ public class ResultsStAX implements ResultSet, Closeable {
return ;
}
-
+
static final String XML_NS = ARQConstants.XML_NS ;
-
+
private Binding getOneSolution() throws XMLStreamException {
if ( finished )
return null ;
@@ -441,7 +441,7 @@ public class ResultsStAX implements ResultSet, Closeable {
staxError("getOneSolution: Hit end unexpectedly") ;
return null ;
}
-
+
static protected void addBinding(BindingMap binding, Var var, Node value) {
Node n = binding.get(var);
if ( n != null ) {
@@ -470,4 +470,4 @@ public class ResultsStAX implements ResultSet, Closeable {
Log.warn(this, "StAX error: " + msg, th) ;
throw new ResultSetException(msg, th) ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDF.java b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDF.java
index b86732e..83a9006 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDF.java
@@ -43,18 +43,18 @@ public interface FactoryRDF {
/** Create a blank node which is completely new and used nowhere else. */
public Node createBlankNode() ;
- /** Create a blank node with the given string as internal system id */
+ /** Create a blank node with the given string as internal system id */
public Node createBlankNode(String label) ;
-
+
/** Create a blank with the internal system id taken from 128 bit number provided.
* This must be compatible with {@link java.util.UUID} so the variant and version
- * bits must agree with <a href="http://www.ietf.org/rfc/rfc4122.txt">RFC 4122</a>.
- *
+ * bits must agree with <a href="http://www.ietf.org/rfc/rfc4122.txt">RFC 4122</a>.
+ *
* @see java.util.UUID
* @see <a href="http://www.ietf.org/rfc/rfc4122.txt" ><i>RFC 4122: A Universally Unique IDentifier (UUID) URN Namespace</i></a>
*/
public Node createBlankNode(long mostSigBits, long leastSigBits) ;
-
+
/** Reset any internal state that should not be carried across parse runs (e.g. blank node labels). */
public void reset();
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFCaching.java b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFCaching.java
index 7a42b79..f412e7c 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFCaching.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFCaching.java
@@ -31,9 +31,9 @@ import org.apache.jena.riot.RiotException ;
import org.apache.jena.riot.lang.LabelToNode ;
import org.apache.jena.sparql.graph.NodeConst ;
-/** Adds some caching of created nodes - the caching is tuned to RIOT parser usage */
+/** Adds some caching of created nodes - the caching is tuned to RIOT parser usage */
public class FactoryRDFCaching extends FactoryRDFStd {
- public static final int DftNodeCacheSize = 5000 ;
+ public static final int DftNodeCacheSize = 5000 ;
// Control the setup - for one thread; start size = 50% of full size, no stats
private final Cache<String, Node> cache ;
@@ -41,7 +41,7 @@ public class FactoryRDFCaching extends FactoryRDFStd {
public FactoryRDFCaching() {
this(DftNodeCacheSize) ;
}
-
+
public FactoryRDFCaching(int cacheSize) {
super() ;
cache = setCache(cacheSize) ;
@@ -76,12 +76,12 @@ public class FactoryRDFCaching extends FactoryRDFStd {
}
// A few constants
-
+
@Override
public Node createTypedLiteral(String lexical, RDFDatatype datatype) {
if ( XSDDatatype.XSDinteger.equals(datatype) ) {
switch(lexical) {
- case "0" : return NodeConst.nodeZero ;
+ case "0" : return NodeConst.nodeZero ;
case "1" : return NodeConst.nodeOne ;
case "2" : return NodeConst.nodeTwo ;
case "-1" : return NodeConst.nodeMinusOne ;
@@ -89,7 +89,7 @@ public class FactoryRDFCaching extends FactoryRDFStd {
// fallthrough.
} else if ( XSDDatatype.XSDboolean.equals(datatype) ) {
switch(lexical) {
- case "true" : return NodeConst.nodeTrue ;
+ case "true" : return NodeConst.nodeTrue ;
case "false" : return NodeConst.nodeFalse ;
}
// fallthrough.
@@ -109,7 +109,7 @@ public class FactoryRDFCaching extends FactoryRDFStd {
// public void reset() {
// super.reset();
// }
-
+
public CacheInfo stats() {
CacheStats stats = cache.stats() ;
if ( stats.missCount() == 0 && stats.hitCount() == 0 )
@@ -117,4 +117,4 @@ public class FactoryRDFCaching extends FactoryRDFStd {
return null ;
return new CacheInfo(DftNodeCacheSize, stats) ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java
index 57cb958..cc2314d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java
@@ -30,15 +30,15 @@ import org.apache.jena.sparql.core.Quad ;
public class FactoryRDFStd implements FactoryRDF {
// Needs reset?
private final LabelToNode labelMapping ;
-
+
public FactoryRDFStd() {
this(SyntaxLabels.createLabelToNode()) ;
}
-
+
public FactoryRDFStd(LabelToNode labelMapping) {
- this.labelMapping = labelMapping ;
+ this.labelMapping = labelMapping ;
}
-
+
@Override
public Triple createTriple(Node subject, Node predicate, Node object) {
return Triple.create(subject, predicate, object);
@@ -75,12 +75,12 @@ public class FactoryRDFStd implements FactoryRDF {
if ( false ) {
//int version = (int)BitsLong.unpack(mostSigBits, 12,16) ;
int variant = (int)BitsLong.unpack(leastSigBits, 62, 64) ;
- if ( variant != 2 )
+ if ( variant != 2 )
Log.warn(this, "Bad variant "+variant+" for blank node") ;
}
-
+
// XXX Style: Do this fast. Guava? Apache commons? Special case for char[32]
- // (Eventually, blank node Nodes will have two longs normally.)
+ // (Eventually, blank node Nodes will have two longs normally.)
return createBlankNode(String.format("%08X%08X", mostSigBits, leastSigBits)) ;
}
@@ -101,4 +101,4 @@ public class FactoryRDFStd implements FactoryRDF {
public void reset() {
labelMapping.clear();
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java
index e394666..ebd5366 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java
@@ -299,4 +299,4 @@ public class ParserProfileStd implements ParserProfile
}
return expansion;
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileWrapper.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileWrapper.java
index dd30610..0bcefc7 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileWrapper.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileWrapper.java
@@ -106,7 +106,7 @@ public class ParserProfileWrapper implements ParserProfile
public Node createTripleNode(Triple triple, long line, long col) {
return get().createTripleNode(triple, line, col);
}
-
+
@Override
public Node createGraphNode(Graph graph, long line, long col) {
return get().createGraphNode(graph, line, col);
@@ -126,4 +126,4 @@ public class ParserProfileWrapper implements ParserProfile
public PrefixMap getPrefixMap() {
return get().getPrefixMap();
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap.java b/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap.java
index 5a615ea..8193d9f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap.java
@@ -171,4 +171,4 @@ public interface PrefixMap {
* Return the number of entries in the prefix map.
*/
public int size();
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java b/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java
index 5424cc2..1c81d57 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java
@@ -130,4 +130,4 @@ public abstract class PrefixMapBase implements PrefixMap {
sb.append(" }");
return sb.toString();
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/SQuad.java b/jena-arq/src/main/java/org/apache/jena/riot/system/SQuad.java
index 12abe3d..e2d47f3 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/SQuad.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/SQuad.java
@@ -28,14 +28,14 @@ import org.apache.jena.riot.thrift.wire.RDF_Term;
import org.apache.jena.sparql.core.Quad;
import org.apache.thrift.protocol.TProtocol;
-/** Serialization of a {@link Quad} using Thrift for the serialization. */
+/** Serialization of a {@link Quad} using Thrift for the serialization. */
public final class SQuad implements Serializable {
private static final long serialVersionUID = 0x993530716d72ff06L;
private transient Quad quad;
-
+
public SQuad(Quad quad) { this.quad = quad; }
public Quad getQuad() { return quad; }
-
+
private void writeObject(java.io.ObjectOutputStream out) throws IOException {
TProtocol protocol = TRDF.protocol(out);
RDF_Term tterm = new RDF_Term();
@@ -50,13 +50,12 @@ public final class SQuad implements Serializable {
TProtocol protocol = TRDF.protocol(in);
RDF_Term tterm = new RDF_Term();
Node g = SerializerRDF.read(protocol, tterm);
- Node s = SerializerRDF.read(protocol, tterm);
+ Node s = SerializerRDF.read(protocol, tterm);
Node p = SerializerRDF.read(protocol, tterm);
Node o = SerializerRDF.read(protocol, tterm);
quad = Quad.create(g, s, p, o);
}
-
+
Object readResolve() throws ObjectStreamException
{ return quad; }
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/STriple.java b/jena-arq/src/main/java/org/apache/jena/riot/system/STriple.java
index dc5ab23..ec9dedb 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/STriple.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/STriple.java
@@ -28,14 +28,14 @@ import org.apache.jena.riot.thrift.TRDF;
import org.apache.jena.riot.thrift.wire.RDF_Term;
import org.apache.thrift.protocol.TProtocol;
-/** Serialization of a {@link Triple} using Thrift for the serialization. */
+/** Serialization of a {@link Triple} using Thrift for the serialization. */
public final class STriple implements Serializable {
private static final long serialVersionUID = 0xa08f3324dc69187dL;
private transient Triple triple;
public STriple(Triple triple) { this.triple = triple; }
public Triple getTriple() { return triple; }
-
+
private void writeObject(java.io.ObjectOutputStream out) throws IOException {
TProtocol protocol = TRDF.protocol(out);
RDF_Term tterm = new RDF_Term();
@@ -48,12 +48,12 @@ public final class STriple implements Serializable {
private void readObject(java.io.ObjectInputStream in) throws IOException {
TProtocol protocol = TRDF.protocol(in);
RDF_Term tterm = new RDF_Term();
- Node s = SerializerRDF.read(protocol, tterm);
+ Node s = SerializerRDF.read(protocol, tterm);
Node p = SerializerRDF.read(protocol, tterm);
Node o = SerializerRDF.read(protocol, tterm);
triple = Triple.create(s, p, o);
}
-
+
Object readResolve() throws ObjectStreamException
{ return triple; }
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java b/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
index 4892049..21e80ca 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
@@ -47,17 +47,17 @@ public class StreamRDFLib
* buffered.
*/
public static StreamRDF writer(OutputStream out) { return new WriterStreamRDFPlain(IO.wrapUTF8(out)) ; }
-
+
/** Create a {@link StreamRDF} that outputs to an {@link AWriter}. */
public static StreamRDF writer(AWriter out) { return new WriterStreamRDFPlain(out) ; }
-
+
/**
* Create a {@link StreamRDF} that outputs to an {@link Writer}. It is important to
* call {@link StreamRDF#start} and {@link StreamRDF#finish} because the output is
* buffered.
*/
public static StreamRDF writer(Writer out) { return new WriterStreamRDFPlain(IO.wrap(out)) ; }
-
+
/**
* Create a {@link StreamRDF} that outputs to an {@link OutputStream} with a specific
* {@link CharSpace} (ASCII or UTF-8).
@@ -99,31 +99,31 @@ public class StreamRDFLib
}
public static StreamRDF graph(Graph graph) { return new ParserOutputGraph(graph) ; }
-
+
public static StreamRDF dataset(DatasetGraph dataset) { return new ParserOutputDataset(dataset) ; }
-
- /**
+
+ /**
* Output to a sink; prefix and base handled only within the parser.
- * Unfortunately, Java needs different names for the triples and
- * quads versions because of type erasure.
+ * Unfortunately, Java needs different names for the triples and
+ * quads versions because of type erasure.
*/
public static StreamRDF sinkTriples(Sink<Triple> sink) { return new ParserOutputSinkTriples(sink) ; }
- /**
+ /**
* Output to a sink; prefix and base handled only within the parser.
- * Unfortunately, Java needs different names for the triples and
- * quads versions because of type erasure.
+ * Unfortunately, Java needs different names for the triples and
+ * quads versions because of type erasure.
*/
public static StreamRDF sinkQuads(Sink<Quad> sink) { return new ParserOutputSinkQuads(sink) ; }
-
+
/** Convert any triples seen to a quads, adding a graph node of {@link Quad#tripleInQuad} */
public static StreamRDF extendTriplesToQuads(StreamRDF base)
{ return extendTriplesToQuads(Quad.tripleInQuad, base) ; }
-
+
/** Convert any triples seen to a quads, adding the specified graph node */
public static StreamRDF extendTriplesToQuads(Node graphNode, StreamRDF base)
{ return new ParserOutputSinkTriplesToQuads(graphNode, base) ; }
-
+
public static StreamRDFCounting count()
{ return new StreamRDFCountingBase(sinkNull()) ; }
@@ -135,7 +135,7 @@ public class StreamRDFLib
private final Node gn ;
ParserOutputSinkTriplesToQuads(Node gn, StreamRDF base)
{ super(base) ; this.gn = gn ; }
-
+
@Override public void triple(Triple triple)
{ other.quad(new Quad(gn, triple)) ; }
}
@@ -155,7 +155,7 @@ public class StreamRDFLib
public void finish()
{ sink.flush() ; }
}
-
+
private static class ParserOutputSinkQuads extends StreamRDFBase
{
private final Sink<Quad> sink ;
@@ -171,13 +171,13 @@ public class StreamRDFLib
public void finish()
{ sink.flush() ; }
}
-
+
private static class ParserOutputGraph extends StreamRDFBase
{
protected final Graph graph ;
protected boolean warningIssued = false ;
public ParserOutputGraph(Graph graph) { this.graph = graph ; }
-
+
@Override public void triple(Triple triple) { graph.add(triple) ; }
@Override public void quad(Quad quad)
{
@@ -195,7 +195,7 @@ public class StreamRDFLib
}
//throw new IllegalStateException("Quad passed to graph parsing") ;
}
-
+
@Override public void base(String base)
{ }
@@ -203,7 +203,7 @@ public class StreamRDFLib
{
try { // Jena applies XML rules to prerfixes.
graph.getPrefixMapping().setNsPrefix(prefix, uri) ;
- } catch (JenaException ex) {}
+ } catch (JenaException ex) {}
}
}
@@ -211,36 +211,36 @@ public class StreamRDFLib
{
protected final DatasetGraph dsg ;
protected final PrefixMapping prefixMapping ;
-
+
public ParserOutputDataset(DatasetGraph dsg)
- {
+ {
this.dsg = dsg ;
this.prefixMapping = dsg.getDefaultGraph().getPrefixMapping() ;
// = dsg.getPrefixMapping().setNsPrefix(prefix, uri) ;
}
-
- @Override public void triple(Triple triple)
+
+ @Override public void triple(Triple triple)
{
dsg.add(Quad.defaultGraphNodeGenerated, triple.getSubject(), triple.getPredicate(), triple.getObject()) ;
//throw new IllegalStateException("Triple passed to dataset parsing") ;
}
-
- @Override public void quad(Quad quad)
- {
+
+ @Override public void quad(Quad quad)
+ {
if ( quad.isTriple() )
dsg.add(Quad.defaultGraphNodeGenerated, quad.getSubject(), quad.getPredicate(), quad.getObject()) ;
else
dsg.add(quad) ;
}
-
+
@Override public void base(String base)
{ }
@Override public void prefix(String prefix, String uri)
{
- try { // Jena applies XML rules to prerfixes.
+ try { // Jena applies XML rules to prerfixes.
prefixMapping.setNsPrefix(prefix, uri) ;
} catch (JenaException ex) {}
}
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/JsonLDWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/JsonLDWriter.java
index db4c97b..3a70dfb 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/JsonLDWriter.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/JsonLDWriter.java
@@ -57,13 +57,13 @@ import org.apache.jena.vocabulary.RDF ;
/**
* Writer that prints out JSON-LD.
- *
+ *
* By default, the output is "compact" (in JSON-LD terminology), and the JSON is "pretty" (using line breaks).
* One can choose another form using one of the dedicated RDFFormats (JSONLD_EXPAND_PRETTY, etc.).
- *
+ *
* For formats using a context (that is, which have an "@context" node), (compact and expand),
* this automatically generates a default one.
- *
+ *
* One can pass a jsonld context using the (jena) Context mechanism, defining a (jena) Context
* (sorry for this clash of "contexts"), (cf. last argument in
* {@link WriterDatasetRIOT#write(OutputStream out, DatasetGraph datasetGraph, PrefixMap prefixMap, String baseURI, Context context)})
@@ -73,17 +73,17 @@ import org.apache.jena.vocabulary.RDF ;
* jenaCtx.set(JsonLDWriter.JSONLD_CONTEXT, contextAsJsonString);
* </pre>
* where contextAsJsonString is a JSON string containing the value of the "@context".
- *
+ *
* It is possible to change the content of the "@context" node in the output using the {@link #JSONLD_CONTEXT_SUBSTITUTION} Symbol.
- *
+ *
* For a frame output, one must pass a frame in the jenaContext using the {@link #JSONLD_FRAME} Symbol.
- *
+ *
* It is also possible to define the different options supported
- * by JSONLD-java using the {@link #JSONLD_OPTIONS} Symbol
- *
+ * by JSONLD-java using the {@link #JSONLD_OPTIONS} Symbol
+ *
* The {@link org.apache.jena.riot.JsonLDWriteContext} is a convenience class that extends Context and
* provides methods to set the values of these different Symbols that are used in controlling the writing of JSON-LD.
- *
+ *
* Note that this class also provides a static method to convert jena RDF data to the corresponding object in JsonLD API:
* {@link #toJsonLDJavaAPI(org.apache.jena.riot.RDFFormat.JSONLDVariant, DatasetGraph, PrefixMap, String, Context)}
*/
@@ -94,7 +94,7 @@ public class JsonLDWriter extends WriterDatasetRIOTBase
return Symbol.create(SYMBOLS_NS + localName);
}
/**
- * Expected value: the value of the "@context"
+ * Expected value: the value of the "@context"
* (a JSON String, or the object expected by the JSONLD-java API) */
public static final Symbol JSONLD_CONTEXT = createSymbol("JSONLD_CONTEXT");
/**
@@ -104,17 +104,17 @@ public class JsonLDWriter extends WriterDatasetRIOTBase
* This is useful<ol><li>for the cases you want to have a URI as value of @context,
* without having JSON-LD java to download it and</li><li>as a trick to
* change the URIs in your result.</li></ol>
- *
+ *
* Only for compact and flatten formats.
- *
+ *
* Note that it is supposed to be a JSON String: to set the value of @context to a URI,
* the String must be quoted.*/
- public static final Symbol JSONLD_CONTEXT_SUBSTITUTION = createSymbol("JSONLD_CONTEXT_SUBSTITUTION");
+ public static final Symbol JSONLD_CONTEXT_SUBSTITUTION = createSymbol("JSONLD_CONTEXT_SUBSTITUTION");
/** value: a JSON String, or the frame object expected by JsonLdProcessor.frame */
public static final Symbol JSONLD_FRAME = createSymbol("JSONLD_FRAME");
/** value: the option object expected by JsonLdProcessor (instance of JsonLdOptions) */
public static final Symbol JSONLD_OPTIONS = createSymbol("JSONLD_OPTIONS");
- /**
+ /**
* if creating a (jsonld) context from dataset, should we include all the prefixes defined in graph's prefix mappings
* value: a Boolean (default: true) */
public static final Symbol JSONLD_ADD_ALL_PREFIXES_TO_CONTEXT = createSymbol("JSONLD_ADD_ALL_PREFIXES_TO_CONTEXT");
@@ -153,7 +153,7 @@ public class JsonLDWriter extends WriterDatasetRIOTBase
}
if (opts == null) {
opts = defaultJsonLdOptions(baseURI);
- }
+ }
return opts;
}
@@ -165,7 +165,7 @@ public class JsonLDWriter extends WriterDatasetRIOTBase
opts.useNamespaces = true ; // this is NOT jsonld-java's default
// opts.setUseRdfType(true); // false -> use "@type"
opts.setUseNativeTypes(true); // this is NOT jsonld-java's default
- opts.setCompactArrays(true); // this is jsonld-java's default
+ opts.setCompactArrays(true); // this is jsonld-java's default
return opts;
}
@@ -314,7 +314,7 @@ public class JsonLDWriter extends WriterDatasetRIOTBase
if ( p.equals(RDF.type.asNode()) )
return ;
- // JENA-1744 : split as a "Curie" (at the last / or #, regardless of th characters in a lcoal name).
+ // JENA-1744 : split as a "Curie" (at the last / or #, regardless of th characters in a lcoal name).
// Curie : https://www.w3.org/TR/curie/
String x = SplitIRI.localname(p.getURI());
@@ -332,9 +332,9 @@ public class JsonLDWriter extends WriterDatasetRIOTBase
// typed literal)
Map<String, Object> x2 = new LinkedHashMap<>() ;
x2.put("@id", p.getURI()) ;
- if (! isLangString(o) && ! isSimpleString(o) )
+ if (! isLangString(o) && ! isSimpleString(o) )
// RDF 1.1 : Skip if rdf:langString or xsd:string.
- x2.put("@type", literalDatatypeURI) ;
+ x2.put("@type", literalDatatypeURI) ;
ctx.put(x, x2) ;
} else {
// add property as an untyped attribute (the object is
@@ -386,7 +386,7 @@ public class JsonLDWriter extends WriterDatasetRIOTBase
if (pair != null) {
String prefix = pair.getLeft();
addOnePrefix(ctx, prefix, mapping.get(prefix).toString());
- }
+ }
}
} ;
g.find(ANY).forEachRemaining(x);
@@ -417,5 +417,4 @@ public class JsonLDWriter extends WriterDatasetRIOTBase
// default
return true;
}
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterFlat.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterFlat.java
index da75ded..b76e05d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterFlat.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterFlat.java
@@ -25,7 +25,7 @@ import org.apache.jena.riot.system.StreamRDFOps ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.sparql.util.Context ;
-/** Write Turtle with one triple on one line with prefixed names, with short form literals (e.g. integers) */
+/** Write Turtle with one triple on one line with prefixed names, with short form literals (e.g. integers) */
public class TurtleWriterFlat extends TurtleWriterBase
{
@Override
@@ -35,4 +35,4 @@ public class TurtleWriterFlat extends TurtleWriterBase
StreamRDFOps.sendGraphToStream(graph, dest, baseURI, prefixMap) ;
dest.finish() ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformQuadBlockGraph.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformQuadBlockGraph.java
index abd57a3..5dea138 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformQuadBlockGraph.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformQuadBlockGraph.java
@@ -41,19 +41,19 @@ public class TransformQuadBlockGraph extends TransformCopy
this.beforeVisitor = before ;
this.afterVisitor = after ;
}
-
+
private Node getNode() { return tracker.peek().rewriteGraphName ; }
@Override
public Op transform(OpGraph opGraph, Op op) {
-
- // ?? Could just leave the (graph) in place always - just rewrite BGPs.
+
+ // ?? Could just leave the (graph) in place always - just rewrite BGPs.
boolean noPattern = false ;
-
+
/* One case to consider is when the pattern for the GRAPH
- * statement includes uses the variable inside the GRAPH clause.
+ * statement includes uses the variable inside the GRAPH clause.
* In this case, we must rename away the inner variable
- * to allow stream execution via index joins,
+ * to allow stream execution via index joins,
* and then put back the value via an assign.
* (This is what QueryIterGraph does using a streaming join
* for triples)
@@ -61,11 +61,11 @@ public class TransformQuadBlockGraph extends TransformCopy
// Note: op is already quads by this point.
// Must test scoping by the subOp of GRAPH
-
+
QuadSlot qSlot = tracker.peek() ;
Node actualName= qSlot.actualGraphName ;
- Node rewriteName= qSlot.rewriteGraphName ;
-
+ Node rewriteName= qSlot.rewriteGraphName ;
+
if ( OpBGP.isBGP(op) )
{
// Empty BGP
@@ -78,7 +78,7 @@ public class TransformQuadBlockGraph extends TransformCopy
if ( ((OpTable)op).isJoinIdentity() )
noPattern = true ;
}
-
+
if ( noPattern )
{
// The case of something like:
@@ -86,7 +86,7 @@ public class TransformQuadBlockGraph extends TransformCopy
// which are ways of accessing the names in the dataset.
return new OpDatasetNames(opGraph.getNode()) ;
}
-
+
if ( actualName != rewriteName )
op = OpAssign.assign(op, Var.alloc(actualName), new ExprVar(rewriteName)) ;
@@ -94,7 +94,7 @@ public class TransformQuadBlockGraph extends TransformCopy
// have been converted to quads.
return op ;
}
-
+
@Override
public Op transform(OpPropFunc opPropFunc, Op subOp) {
if ( opPropFunc.getSubOp() != subOp )
@@ -102,25 +102,24 @@ public class TransformQuadBlockGraph extends TransformCopy
// Put the (graph) back round it so the property function works on the named graph.
return new OpGraph(getNode() , opPropFunc) ;
}
-
+
@Override
public Op transform(OpPath opPath) {
// Put the (graph) back round it
// ?? inc default graph node.
return new OpGraph(getNode() , opPath) ;
// Does not get removed by transform above because this is
- // not the OpGraph that gets walked by the transform.
+ // not the OpGraph that gets walked by the transform.
}
-
+
@Override
- public Op transform(OpBGP opBGP) {
+ public Op transform(OpBGP opBGP) {
//System.out.print("transform(OpBGP) : "+getNode()+"\n"+opBGP) ;
return OpQuadBlock.create(getNode(), opBGP.getPattern()) ;
}
-
+
@Override
public Op transform(OpExt opExt) {
return opExt.apply(this, beforeVisitor, afterVisitor) ;
}
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformQuadGraph.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformQuadGraph.java
index daaf8b1..07c2c0e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformQuadGraph.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformQuadGraph.java
@@ -41,21 +41,21 @@ public class TransformQuadGraph extends TransformCopy
this.beforeVisitor = before ;
this.afterVisitor = after ;
}
-
+
private Node getNode() { return tracker.peek().rewriteGraphName ; }
@Override
public Op transform(OpGraph opGraph, Op op) {
-
+
//System.err.println("transform(OpGraph)\n"+opGraph+op) ;
-
- // ?? Could just leave the (graph) in place always - just rewrite BGPs.
+
+ // ?? Could just leave the (graph) in place always - just rewrite BGPs.
boolean noPattern = false ;
-
+
/* One case to consider is when the pattern for the GRAPH
- * statement includes uses the variable inside the GRAPH clause.
+ * statement includes uses the variable inside the GRAPH clause.
* In this case, we must rename away the inner variable
- * to allow stream execution via index joins,
+ * to allow stream execution via index joins,
* and then put back the value via an assign.
* (This is what QueryIterGraph does using a streaming join
* for triples)
@@ -63,11 +63,11 @@ public class TransformQuadGraph extends TransformCopy
// Note: op is already quads by this point.
// Must test scoping by the subOp of GRAPH
-
+
QuadSlot qSlot = tracker.peek() ;
Node actualName= qSlot.actualGraphName ;
- Node rewriteName= qSlot.rewriteGraphName ;
-
+ Node rewriteName= qSlot.rewriteGraphName ;
+
if ( OpBGP.isBGP(op) )
{
// Empty BGP
@@ -80,7 +80,7 @@ public class TransformQuadGraph extends TransformCopy
if ( ((OpTable)op).isJoinIdentity() )
noPattern = true ;
}
-
+
if ( noPattern )
{
// The case of something like:
@@ -88,7 +88,7 @@ public class TransformQuadGraph extends TransformCopy
// which are ways of accessing the names in the dataset.
return new OpDatasetNames(opGraph.getNode()) ;
}
-
+
if ( actualName != rewriteName )
op = OpAssign.assign(op, Var.alloc(actualName), new ExprVar(rewriteName)) ;
@@ -96,7 +96,7 @@ public class TransformQuadGraph extends TransformCopy
// have been converted to quads.
return op ;
}
-
+
@Override
public Op transform(OpPropFunc opPropFunc, Op subOp) {
if ( opPropFunc.getSubOp() != subOp )
@@ -104,25 +104,24 @@ public class TransformQuadGraph extends TransformCopy
// Put the (graph) back round it so the property function works on the named graph.
return new OpGraph(getNode() , opPropFunc) ;
}
-
+
@Override
public Op transform(OpPath opPath) {
// Put the (graph) back round it
// ?? inc default graph node.
return new OpGraph(getNode() , opPath) ;
// Does not get removed by transform above because this is
- // not the OpGraph that gets walked by the transform.
+ // not the OpGraph that gets walked by the transform.
}
-
+
@Override
- public Op transform(OpBGP opBGP) {
+ public Op transform(OpBGP opBGP) {
//System.out.print("transform(OpBGP) : "+getNode()+"\n"+opBGP) ;
return new OpQuadPattern(getNode(), opBGP.getPattern()) ;
}
-
+
@Override
public Op transform(OpExt opExt) {
return opExt.apply(this, beforeVisitor, afterVisitor) ;
}
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsagePopper.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsagePopper.java
index 80b078b..e2fe9fe 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsagePopper.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsagePopper.java
@@ -25,7 +25,7 @@ import org.apache.jena.sparql.core.Var;
/**
* An after visitor for tracking variable usage
- *
+ *
*/
public class VariableUsagePopper extends VariableUsageVisitor {
@@ -54,4 +54,4 @@ public class VariableUsagePopper extends VariableUsageVisitor {
this.tracker.pop();
super.visit(opProject);
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsagePusher.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsagePusher.java
index bc778d0..090735e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsagePusher.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsagePusher.java
@@ -25,7 +25,7 @@ import org.apache.jena.sparql.core.Var;
/**
* A before visitor for tracking variable usage
- *
+ *
*/
public class VariableUsagePusher extends VariableUsageVisitor {
@@ -54,6 +54,4 @@ public class VariableUsagePusher extends VariableUsageVisitor {
this.tracker.push();
super.visit(opProject);
}
-
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsageTracker.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsageTracker.java
index 00c98a1..1757f2d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsageTracker.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsageTracker.java
@@ -27,7 +27,7 @@ import org.apache.jena.sparql.core.Var;
/**
* Tracker for variable usage
- *
+ *
*/
public class VariableUsageTracker {
@@ -89,4 +89,4 @@ public class VariableUsageTracker {
public int getUsageCount(Var var) {
return getUsageCount(var.getName());
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsageVisitor.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsageVisitor.java
index 3a45f3c..9cc3bb1 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsageVisitor.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/VariableUsageVisitor.java
@@ -49,7 +49,7 @@ import org.apache.jena.sparql.expr.ExprVars;
/**
* A visitor which tracks variable usage
- *
+ *
*/
public abstract class VariableUsageVisitor extends OpVisitorBase {
@@ -202,5 +202,4 @@ public abstract class VariableUsageVisitor extends OpVisitorBase {
}
action(vars);
}
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChanges.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChanges.java
index 3cedb49..e667e6f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChanges.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChanges.java
@@ -25,18 +25,17 @@ import org.apache.jena.graph.Node ;
*/
public interface DatasetChanges
{
- /** Indicator that a sequence of changes is about to start */
+ /** Indicator that a sequence of changes is about to start */
public void start() ;
-
- /** A change has occurred
- * @see QuadAction
+
+ /** A change has occurred
+ * @see QuadAction
*/
public void change(QuadAction qaction, Node g, Node s, Node p, Node o) ;
-
+
/** Indicator that a sequence of changes has now finished */
public void finish() ;
-
+
/** Release any resources */
public void reset() ;
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/TransactionHandlerView.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/TransactionHandlerView.java
index fbf511e..b9adf27 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/TransactionHandlerView.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/TransactionHandlerView.java
@@ -21,8 +21,8 @@ package org.apache.jena.sparql.core;
import org.apache.jena.graph.impl.TransactionHandlerBase;
import org.apache.jena.query.TxnType;
-/** A graph TransactionHandler that for a graph view of a {@link DatasetGraph}*/
-public class TransactionHandlerView extends TransactionHandlerBase
+/** A graph TransactionHandler that for a graph view of a {@link DatasetGraph}*/
+public class TransactionHandlerView extends TransactionHandlerBase
{
private final DatasetGraph dsg;
@@ -30,7 +30,7 @@ public class TransactionHandlerView extends TransactionHandlerBase
this.dsg = dsg;
}
- protected DatasetGraph getDSG() { return dsg; }
+ protected DatasetGraph getDSG() { return dsg; }
@Override
public void begin() {
@@ -54,4 +54,4 @@ public class TransactionHandlerView extends TransactionHandlerBase
// Abort required.
return getDSG().supportsTransactionAbort();
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/TupleSlot.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/TupleSlot.java
index 72f26aa..d81c548 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/TupleSlot.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/TupleSlot.java
@@ -24,4 +24,4 @@ package org.apache.jena.sparql.core.mem;
*/
public enum TupleSlot {
GRAPH, SUBJECT, PREDICATE, OBJECT;
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
index 5852022..444d363 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory ;
/**
* A query execution implementation where queries are executed against a remote
* service
- *
+ *
*/
public class QueryEngineHTTP implements QueryExecution {
private static Logger log = LoggerFactory.getLogger(QueryEngineHTTP.class);
@@ -91,14 +91,14 @@ public class QueryEngineHTTP implements QueryExecution {
private String selectContentType = defaultSelectHeader();
private String askContentType = defaultAskHeader();
private String modelContentType = defaultConstructHeader();
-
+
private String constructContentType = defaultConstructHeader() ;
private String datasetContentType = defaultConstructDatasetHeader() ;
-
- // If this is non-null, it overrides the ???ContentType choice.
+
+ // If this is non-null, it overrides the ???ContentType choice.
private String acceptHeader = null;
-
- // Received content type
+
+ // Received content type
private String httpResponseContentType = null ;
/**
* Supported content types for SELECT queries
@@ -119,7 +119,7 @@ public class QueryEngineHTTP implements QueryExecution {
public QueryEngineHTTP(String serviceURI, Query query) {
this(serviceURI, query, null, null);
}
-
+
public QueryEngineHTTP(String serviceURI, Query query, HttpClient client) {
this(serviceURI, query, client, null);
}
@@ -131,7 +131,7 @@ public class QueryEngineHTTP implements QueryExecution {
public QueryEngineHTTP(String serviceURI, String queryString) {
this(serviceURI, queryString, null, null);
}
-
+
public QueryEngineHTTP(String serviceURI, String queryString, HttpClient client) {
this(serviceURI, queryString, client, null);
}
@@ -139,7 +139,7 @@ public class QueryEngineHTTP implements QueryExecution {
public QueryEngineHTTP(String serviceURI, String queryString, HttpClient client, HttpContext httpContext) {
this(serviceURI, null, queryString, client, httpContext);
}
-
+
private QueryEngineHTTP(String serviceURI, Query query, String queryString, HttpClient client, HttpContext httpContext) {
this.query = query;
this.queryString = queryString;
@@ -148,7 +148,7 @@ public class QueryEngineHTTP implements QueryExecution {
// Apply service configuration if relevant
applyServiceConfig(serviceURI, this);
-
+
// Don't want to overwrite client config we may have picked up from
// service context in the parent constructor if the specified
// client is null
@@ -168,7 +168,7 @@ public class QueryEngineHTTP implements QueryExecution {
* omits parameter merging since that will be done automatically whenever
* the {@link QueryEngineHTTP} instance makes a query for remote submission.
* </p>
- *
+ *
* @param serviceURI
* Service URI
*/
@@ -200,7 +200,7 @@ public class QueryEngineHTTP implements QueryExecution {
/**
* Applies context provided timeouts to the given engine
- *
+ *
* @param engine
* Engine
* @param context
@@ -300,35 +300,35 @@ public class QueryEngineHTTP implements QueryExecution {
/**
* Sets the HTTP client to use, if none is set then the default
* client is used.
- *
+ *
* @param client
* HTTP client
*/
public void setClient(HttpClient client) {
this.client = client;
}
-
+
/**
* Get the HTTP client in use, if none is set then null.
- *
+ *
* @return client HTTP client
*/
public HttpClient getClient() {
return client;
}
-
+
/**
* Sets the HTTP context to use, if none is set then the default context is used.
- *
+ *
* @param context HTTP context
*/
public void setHttpContext(HttpContext context) {
this.httpContext = context;
}
-
+
/**
* Get the HTTP context in use, if none is set then null.
- *
+ *
* @return the {@code HttpContext} in scope
*/
public HttpContext getHttpContext() {
@@ -346,7 +346,7 @@ public class QueryEngineHTTP implements QueryExecution {
ResultSet rs = execResultSetInner() ;
return new ResultSetCheckCondition(rs, this) ;
}
-
+
private ResultSet execResultSetInner() {
HttpQuery httpQuery = makeHttpQuery();
httpQuery.setAccept(chooseAcceptHeader(acceptHeader, selectContentType));
@@ -372,14 +372,14 @@ public class QueryEngineHTTP implements QueryExecution {
actualContentType = selectContentType;
}
- // Map to lang, with pragmatic alternatives.
+ // Map to lang, with pragmatic alternatives.
Lang lang = WebContent.contentTypeToLangResultSet(actualContentType);
if ( lang == null )
throw new QueryException("Endpoint returned Content-Type: " + actualContentType + " which is not recognized for SELECT queries");
if ( !ResultSetReaderRegistry.isRegistered(lang) )
throw new QueryException("Endpoint returned Content-Type: " + actualContentType + " which is not supported for SELECT queries");
// This returns a streaming result set for some formats.
- // Do not close the InputStream at this point.
+ // Do not close the InputStream at this point.
ResultSet result = ResultSetMgr.read(in, lang);
return result;
}
@@ -405,12 +405,12 @@ public class QueryEngineHTTP implements QueryExecution {
public Iterator<Triple> execConstructTriples() {
return execTriples();
}
-
+
@Override
public Iterator<Quad> execConstructQuads(){
return execQuads();
}
-
+
@Override
public Dataset execConstructDataset(){
return execConstructDataset(DatasetFactory.createTxnMem());
@@ -463,7 +463,7 @@ public class QueryEngineHTTP implements QueryExecution {
// Base URI?
return RDFDataMgr.createIteratorTriples(in, lang, null);
}
-
+
private Iterator<Quad> execQuads() {
Pair<InputStream, Lang> p = execConstructWorker(datasetContentType) ;
InputStream in = p.getLeft() ;
@@ -477,7 +477,7 @@ public class QueryEngineHTTP implements QueryExecution {
HttpQuery httpQuery = makeHttpQuery();
httpQuery.setAccept(chooseAcceptHeader(acceptHeader, contentType));
InputStream in = httpQuery.exec();
-
+
// Don't assume the endpoint actually gives back the content type we
// asked for
String actualContentType = httpQuery.getContentType();
@@ -491,11 +491,11 @@ public class QueryEngineHTTP implements QueryExecution {
Lang lang = RDFLanguages.contentTypeToLang(actualContentType);
if ( ! RDFLanguages.isQuads(lang) && ! RDFLanguages.isTriples(lang) )
throw new QueryException("Endpoint returned Content Type: "
- + actualContentType
+ + actualContentType
+ " which is not a valid RDF syntax");
return Pair.create(in, lang) ;
}
-
+
@Override
public boolean execAsk() {
checkNotClosed() ;
@@ -530,7 +530,7 @@ public class QueryEngineHTTP implements QueryExecution {
} catch (ResultSetException e) {
log.warn("Returned content is not a boolean result", e);
throw e;
- } catch (QueryExceptionHTTP e) {
+ } catch (QueryExceptionHTTP e) {
throw e ;
}
catch (java.io.IOException e) {
@@ -561,11 +561,11 @@ public class QueryEngineHTTP implements QueryExecution {
public Iterator<JsonObject> execJsonItems()
{
// Non-streaming.
- // TODO Integrate with the JSON parser to stream the results.
+ // TODO Integrate with the JSON parser to stream the results.
JsonArray array = execJson().getAsArray();
List<JsonObject> x = new ArrayList<>(array.size());
array.forEach(elt->{
- if ( ! elt.isObject())
+ if ( ! elt.isObject())
throw new QueryExecException("Item in an array from a JSON query isn't an object");
x.add(elt.getAsObject());
});
@@ -597,7 +597,7 @@ public class QueryEngineHTTP implements QueryExecution {
if ( queryString != null ) {
// Object not created with a Query object, may be because there is forgein
// syntax in the query or may be because the queystrign was available and the app
- // didn't want the overhead of parsing it everytime.
+ // didn't want the overhead of parsing it everytime.
// Try to parse it else return null;
try { return QueryFactory.create(queryString, Syntax.syntaxARQ); }
catch (QueryParseException ex) {}
@@ -655,7 +655,7 @@ public class QueryEngineHTTP implements QueryExecution {
/**
* Gets whether HTTP requests will indicate to the remote server that
* compressed encoding of responses is accepted
- *
+ *
* @return True if compressed encoding will be accepted
*/
public boolean getAllowCompression() {
@@ -686,7 +686,7 @@ public class QueryEngineHTTP implements QueryExecution {
if (params != null) httpQuery.merge(params);
httpQuery.setAllowCompression(allowCompression);
-
+
// check for service context overrides
if (context.isDefined(Service.serviceContext)) {
Map<String, Context> servicesContext = context.get(Service.serviceContext);
@@ -698,7 +698,7 @@ public class QueryEngineHTTP implements QueryExecution {
httpQuery.setClient(client);
HttpClientContext hcc = ( httpContext == null ) ? null : HttpClientContext.adapt(httpContext);
httpQuery.setContext(hcc);
-
+
// Apply timeouts
if (connectTimeout > 0) httpQuery.setConnectTimeout((int) connectTimeoutUnit.toMillis(connectTimeout));
@@ -786,7 +786,7 @@ public class QueryEngineHTTP implements QueryExecution {
/**
* Sets the Content Type for SELECT queries provided that the format is
* supported
- *
+ *
* @param contentType
*/
public void setSelectContentType(String contentType) {
@@ -806,7 +806,7 @@ public class QueryEngineHTTP implements QueryExecution {
/**
* Sets the Content Type for ASK queries provided that the format is
* supported
- *
+ *
* @param contentType
*/
public void setAskContentType(String contentType) {
@@ -825,7 +825,7 @@ public class QueryEngineHTTP implements QueryExecution {
/**
* Sets the Content Type for CONSTRUCT/DESCRIBE queries provided that the
* format is supported
- *
+ *
* @param contentType
*/
public void setModelContentType(String contentType) {
@@ -837,7 +837,7 @@ public class QueryEngineHTTP implements QueryExecution {
throw new IllegalArgumentException("Given Content Type '" + contentType + "' is not a RDF Graph format");
modelContentType = contentType;
}
-
+
public void setDatasetContentType(String contentType) {
// Check that this is a valid setting
Lang lang = RDFLanguages.contentTypeToLang(contentType);
@@ -847,7 +847,7 @@ public class QueryEngineHTTP implements QueryExecution {
throw new IllegalArgumentException("Given Content Type '" + contentType + "' is not a RDF Dataset format");
datasetContentType = contentType;
}
-
+
private static final String dftSelectContentTypeHeader = initSelectContentTypes() ;
public static String defaultSelectHeader() {
@@ -858,11 +858,11 @@ public class QueryEngineHTTP implements QueryExecution {
StringBuilder sBuff = new StringBuilder() ;
accumulateContentTypeString(sBuff, WebContent.contentTypeResultsJSON, 1.0);
accumulateContentTypeString(sBuff, WebContent.contentTypeResultsXML, 0.9); // Less efficient
-
+
accumulateContentTypeString(sBuff, WebContent.contentTypeTextTSV, 0.7);
accumulateContentTypeString(sBuff, WebContent.contentTypeTextCSV, 0.5);
-
- accumulateContentTypeString(sBuff, WebContent.contentTypeJSON, 0.2); // We try to parse these in
+
+ accumulateContentTypeString(sBuff, WebContent.contentTypeJSON, 0.2); // We try to parse these in
accumulateContentTypeString(sBuff, WebContent.contentTypeXML, 0.2) ; // the hope they are right.
accumulateContentTypeString(sBuff, "*/*", 0.1) ; // Get something!
return sBuff.toString() ;
@@ -882,7 +882,7 @@ public class QueryEngineHTTP implements QueryExecution {
public static String defaultConstructHeader() {
return dftConstructContentTypeHeader ;
}
-
+
private static String initConstructContentTypes() {
// Or use WebContent.defaultGraphAcceptHeader which is slightly
// narrower. Here, we have a tuned setting for SPARQL operations.
@@ -890,14 +890,14 @@ public class QueryEngineHTTP implements QueryExecution {
accumulateContentTypeString(sBuff, WebContent.contentTypeTurtle, 1.0);
accumulateContentTypeString(sBuff, WebContent.contentTypeNTriples, 1.0);
accumulateContentTypeString(sBuff, WebContent.contentTypeRDFXML, 0.9);
-
+
accumulateContentTypeString(sBuff, WebContent.contentTypeTurtleAlt1, 0.8);
accumulateContentTypeString(sBuff, WebContent.contentTypeTurtleAlt2, 0.8);
-
+
accumulateContentTypeString(sBuff, WebContent.contentTypeN3, 0.7);
accumulateContentTypeString(sBuff, WebContent.contentTypeN3Alt1, 0.6);
accumulateContentTypeString(sBuff, WebContent.contentTypeN3Alt2, 0.6);
-
+
accumulateContentTypeString(sBuff, WebContent.contentTypeNTriplesAlt, 0.5);
accumulateContentTypeString(sBuff, "*/*", 0.1) ;
@@ -907,14 +907,14 @@ public class QueryEngineHTTP implements QueryExecution {
private static final String dftConstructDatasetContentTypeHeader = initConstructDatasetContentTypes() ;
public static String defaultConstructDatasetHeader() {
- return dftConstructDatasetContentTypeHeader ;
+ return dftConstructDatasetContentTypeHeader ;
}
-
+
private static String initConstructDatasetContentTypes() {
// Or use WebContent.defaultDatasetAcceptHeader which is slightly
// narrower. Here, we have a tuned setting for SPARQL operations.
StringBuilder sBuff = new StringBuilder() ;
-
+
accumulateContentTypeString(sBuff, WebContent.contentTypeTriG, 1.0) ;
accumulateContentTypeString(sBuff, WebContent.contentTypeTriGAlt1, 1.0) ;
accumulateContentTypeString(sBuff, WebContent.contentTypeTriGAlt2, 1.0) ;
@@ -922,29 +922,29 @@ public class QueryEngineHTTP implements QueryExecution {
accumulateContentTypeString(sBuff, WebContent.contentTypeNQuads, 1.0) ;
accumulateContentTypeString(sBuff, WebContent.contentTypeNQuadsAlt1, 1.0) ;
accumulateContentTypeString(sBuff, WebContent.contentTypeNQuadsAlt2, 1.0) ;
-
+
accumulateContentTypeString(sBuff, WebContent.contentTypeJSONLD, 0.9) ;
- // And triple formats (the case of execConstructDatasets but a regular triples CONSTRUCT).
+ // And triple formats (the case of execConstructDatasets but a regular triples CONSTRUCT).
accumulateContentTypeString(sBuff, WebContent.contentTypeTurtle, 0.8);
accumulateContentTypeString(sBuff, WebContent.contentTypeNTriples, 0.8);
-
+
accumulateContentTypeString(sBuff, WebContent.contentTypeRDFXML, 0.7);
-
+
accumulateContentTypeString(sBuff, WebContent.contentTypeTurtleAlt1, 0.6);
accumulateContentTypeString(sBuff, WebContent.contentTypeTurtleAlt2, 0.6);
-
+
accumulateContentTypeString(sBuff, WebContent.contentTypeN3, 0.5);
accumulateContentTypeString(sBuff, WebContent.contentTypeN3Alt1, 0.5);
accumulateContentTypeString(sBuff, WebContent.contentTypeN3Alt2, 0.5);
-
+
accumulateContentTypeString(sBuff, WebContent.contentTypeNTriplesAlt, 0.4);
-
+
accumulateContentTypeString(sBuff, "*/*", 0.1) ;
return sBuff.toString();
}
-
+
private static void accumulateContentTypeString(StringBuilder sBuff, String str, double v) {
if ( sBuff.length() != 0 )
sBuff.append(", ") ;
@@ -953,17 +953,16 @@ public class QueryEngineHTTP implements QueryExecution {
sBuff.append(";q=").append(v) ;
}
- /** Get the HTTP Accept header for the request. */
+ /** Get the HTTP Accept header for the request. */
public String getAcceptHeader() {
return this.acceptHeader;
}
-
+
/** Set the HTTP Accept header for the request.
- * Unlike the {@code set??ContentType} operations, this is not checked
+ * Unlike the {@code set??ContentType} operations, this is not checked
* for validity.
- */
+ */
public void setAcceptHeader(String acceptHeader) {
this.acceptHeader = acceptHeader;
}
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctMem.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctMem.java
index 78929b4..88a19d2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctMem.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDistinctMem.java
@@ -29,7 +29,7 @@ import org.apache.jena.sparql.engine.binding.Binding ;
public class QueryIterDistinctMem extends QueryIterDistinctReduced
{
private Set<Binding> seen = new HashSet<>() ;
-
+
public QueryIterDistinctMem(QueryIterator iter, ExecutionContext context)
{
super(iter, context) ;
@@ -50,4 +50,4 @@ public class QueryIterDistinctMem extends QueryIterDistinctReduced
seen.add(binding) ;
return true ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatBase.java
index ade562d..a3d82d9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatBase.java
@@ -25,10 +25,10 @@ import org.apache.jena.sparql.expr.NodeValue ;
import org.apache.jena.sparql.expr.aggregate.AccumulatorExpr ;
import org.apache.jena.sparql.function.FunctionEnv ;
-/** Base for statistics aggregations */
+/** Base for statistics aggregations */
abstract class AccStatBase extends AccumulatorExpr {
// Could also be used for AVG and SUM but those came before this.
-
+
private static final NodeValue noValuesToAvg = NodeValue.nvZERO ; // null? NaN?
private static final NodeValue errorValue = null ;
@@ -47,7 +47,7 @@ abstract class AccStatBase extends AccumulatorExpr {
@Override
final protected NodeValue getAccValue() {
if ( super.errorCount != 0 )
- //throw new ExprEvalException("avg: error in group") ;
+ //throw new ExprEvalException("avg: error in group") ;
return null ;
if ( count <= 0 ) return noValuesToAvg ;
try {
@@ -58,18 +58,18 @@ abstract class AccStatBase extends AccumulatorExpr {
abstract protected double calc() ;
- /** Calculate the variance (sample) */
+ /** Calculate the variance (sample) */
final protected double calcVarianceSample() {
- // (N*sum(?x*?x) - sum(?x) ) / N*(N-1)
- return AccStatLib.calcVarianceSample(sumSquared, sum, count) ;
+ // (N*sum(?x*?x) - sum(?x) ) / N*(N-1)
+ return AccStatLib.calcVarianceSample(sumSquared, sum, count) ;
}
-
- /** Calculate the variance (population) */
+
+ /** Calculate the variance (population) */
final protected double calcVariancePop() {
- // (N*sum(?x*?x) - sum(?x) ) / N*N
+ // (N*sum(?x*?x) - sum(?x) ) / N*N
return AccStatLib.calcVariancePopulation(sumSquared, sum, count) ;
}
-
+
@Override
protected void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv) {
// shifted_data_variance
@@ -80,7 +80,7 @@ abstract class AccStatBase extends AccumulatorExpr {
K = d ;
sum = (d-K) ; // == 0 of K set.
sumSquared = (d-K)*(d-K) ; // == 0
- return ;
+ return ;
}
else {
double dk = (d-K) ;
@@ -96,4 +96,4 @@ abstract class AccStatBase extends AccumulatorExpr {
@Override
protected void accumulateError(Binding binding, FunctionEnv functionEnv)
{}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevPopulation.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevPopulation.java
index 2058147..03608b8 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevPopulation.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevPopulation.java
@@ -20,15 +20,15 @@ package org.apache.jena.sparql.expr.aggregate.lib;
import org.apache.jena.sparql.expr.Expr ;
-/** Aggregate - statistical standard deviation - population (i.e. N) */
+/** Aggregate - statistical standard deviation - population (i.e. N) */
public class AccStatStdDevPopulation extends AccStatVarPopulation {
public AccStatStdDevPopulation(Expr expr, boolean distinct) {
super(expr, distinct);
}
-
+
@Override
protected double calc() {
return Math.sqrt(super.calc());
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevSample.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevSample.java
index 940d5da..5c41e33 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevSample.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevSample.java
@@ -20,7 +20,7 @@ package org.apache.jena.sparql.expr.aggregate.lib;
import org.apache.jena.sparql.expr.Expr ;
-/** Aggregate - statistical standard deviation - sample (i.e. N-1) */
+/** Aggregate - statistical standard deviation - sample (i.e. N-1) */
public class AccStatStdDevSample extends AccStatVarSample {
public AccStatStdDevSample(Expr expr, boolean distinct) {
@@ -31,4 +31,4 @@ public class AccStatStdDevSample extends AccStatVarSample {
protected double calc() {
return Math.sqrt(super.calc());
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarPopulation.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarPopulation.java
index 8172baf..85dc69b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarPopulation.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarPopulation.java
@@ -20,7 +20,7 @@ package org.apache.jena.sparql.expr.aggregate.lib;
import org.apache.jena.sparql.expr.Expr ;
-/** Aggregate - statistical variance - population (i.e. N) */
+/** Aggregate - statistical variance - population (i.e. N) */
public class AccStatVarPopulation extends AccStatVarSample {
public AccStatVarPopulation(Expr expr, boolean distinct) {
@@ -31,4 +31,4 @@ public class AccStatVarPopulation extends AccStatVarSample {
protected double calc() {
return super.calcVariancePop();
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarSample.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarSample.java
index 8f5e1a8..48c74bf 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarSample.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarSample.java
@@ -20,7 +20,7 @@ package org.apache.jena.sparql.expr.aggregate.lib;
import org.apache.jena.sparql.expr.Expr ;
-/** Aggregate - statistical variance - sample (i.e. N-1) */
+/** Aggregate - statistical variance - sample (i.e. N-1) */
public class AccStatVarSample extends AccStatBase {
public AccStatVarSample(Expr expr, boolean distinct) {
@@ -31,4 +31,4 @@ public class AccStatVarSample extends AccStatBase {
protected double calc() {
return super.calcVarianceSample() ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AggURI.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AggURI.java
index 5b1d721..2ad1c5c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AggURI.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AggURI.java
@@ -20,10 +20,10 @@ package org.apache.jena.sparql.expr.aggregate.lib;
public class AggURI {
// = stddev-samp except one element -> 0. ?????????????
- public static final String stdev = StandardAggregates.BASE + "stdev";
- public static final String stdev_samp = StandardAggregates.BASE + "stdev_samp";
+ public static final String stdev = StandardAggregates.BASE + "stdev";
+ public static final String stdev_samp = StandardAggregates.BASE + "stdev_samp";
public static final String stdev_pop = StandardAggregates.BASE + "stdev_pop";
public static final String variance = StandardAggregates.BASE + "variance";
public static final String var_samp = StandardAggregates.BASE + "var_samp";
public static final String var_pop = StandardAggregates.BASE + "var_pop";
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/js/FunctionJavaScript.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/js/FunctionJavaScript.java
index cacef8e..627cdff 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/js/FunctionJavaScript.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/js/FunctionJavaScript.java
@@ -46,7 +46,7 @@ import org.apache.jena.sparql.function.FunctionBase;
* {@code xsd:integer} and {@code xsd:double}.
* <p>
* Functions that return null or undefined will result in a {@link ExprEvalException}.
- *
+ *
* @see EnvJavaScript
* @see NV
*/
@@ -56,7 +56,7 @@ public class FunctionJavaScript extends FunctionBase {
private final String functionName;
private boolean initialized = false;
-
+
public FunctionJavaScript(String functionName, EnvJavaScript env) {
this.functionName = functionName;
this.envJS = env;
@@ -68,7 +68,7 @@ public class FunctionJavaScript extends FunctionBase {
@Override
public NodeValue exec(List<NodeValue> args) {
try {
- // Convert NodeValues to types more akin to Javascript.
+ // Convert NodeValues to types more akin to Javascript.
// Pass strings as string, and numbers as Number.
Object[] a = new Object[args.size()];
for ( int i = 0 ; i < args.size(); i++ )
@@ -88,4 +88,4 @@ public class FunctionJavaScript extends FunctionBase {
throw new ExprEvalException("Failed to evaluate javascript function '"+functionName+"'", e);
}
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/js/NV.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/js/NV.java
index ffd3824..50e982c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/js/NV.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/js/NV.java
@@ -31,11 +31,11 @@ import org.apache.jena.sparql.lib.RDFTerm2Json;
/**
* General representation of an {@link NodeValue} for JavaScript. Conversion is to native
* types where possible, otherwise {@code NV}. {@code NV.toString} of a URI returns the
- * uri as a string so {@code NV} works naturally in Java/Nashorn.
- *
+ * uri as a string so {@code NV} works naturally in Java/Nashorn.
+ *
* @see #fromNodeValue
* @see #toNodeValue
- * @see RDFTerm2Json RDFTerm2Json, for one way conversion JSON.
+ * @see RDFTerm2Json RDFTerm2Json, for one way conversion JSON.
*/
public class NV implements RDFJS {
@@ -47,9 +47,9 @@ public class NV implements RDFJS {
// String
// Symbol (new in ECMAScript 6; not in Nashorn/Java8).
// and Object
-
+
private NodeValue nv;
- /**
+ /**
* Enable restoring integer from doubles.
*/
private final static boolean narrowDoubles = true;
@@ -94,15 +94,15 @@ public class NV implements RDFJS {
if ( r instanceof Number )
return number2value((Number)r);
if ( r instanceof Boolean ) {
- return NodeValue.makeBoolean((Boolean)r);
+ return NodeValue.makeBoolean((Boolean)r);
}
if ( r instanceof URI ) {
Node n = NodeFactory.createURI(((URI)r).toString());
- return NodeValue.makeNode(n);
+ return NodeValue.makeNode(n);
}
- throw new ExprEvalException("Can't convert '"+r+"' to a NodeValue. r is of class "+r.getClass().getName());
+ throw new ExprEvalException("Can't convert '"+r+"' to a NodeValue. r is of class "+r.getClass().getName());
}
-
+
// Convert the numeric values that Nashorn can return.
static NodeValue number2value(Number r) {
if ( r instanceof Integer )
@@ -120,7 +120,7 @@ public class NV implements RDFJS {
// If is a very large integer (larger than long)?
if ( d == Math.floor(d) && Double.isFinite(d) ) {
BigInteger big = new BigInteger(Double.toString(x));
- return NodeValue.makeInteger(big);
+ return NodeValue.makeInteger(big);
}
if ( false ) {
// This always works but it is confusing decimal and double.
@@ -136,15 +136,15 @@ public class NV implements RDFJS {
}
// These are carried NV.value returns.
if ( r instanceof BigInteger )
- return NodeValue.makeInteger((BigInteger)r);
+ return NodeValue.makeInteger((BigInteger)r);
if ( r instanceof BigDecimal )
- return NodeValue.makeDecimal((BigDecimal)r);
-
- throw new ExprEvalException("Unknown return type for number: "+r);
+ return NodeValue.makeDecimal((BigDecimal)r);
+
+ throw new ExprEvalException("Unknown return type for number: "+r);
}
-
+
// ------ Object NV
-
+
// Javascript names and RDF extras.
public boolean isURI() { return nv.isIRI(); }
public boolean isBlank() { return nv.isBlank(); }
@@ -160,18 +160,18 @@ public class NV implements RDFJS {
return "BlankNode";
if ( isLiteral() )
return "Literal";
- return null;
+ return null;
}
@Override
- public String getValue() {
+ public String getValue() {
if ( isURI() )
return getUri();
if ( isBlank() )
return getLabel();
if ( isLiteral() )
return getLex();
- return null;
+ return null;
}
// -- rdfjs
@@ -215,5 +215,5 @@ public class NV implements RDFJS {
} else if ( !nv.equals(other.nv) )
return false;
return true;
- }
- }
\ No newline at end of file
+ }
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/js/RDFJS.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/js/RDFJS.java
index a4fdf92..eba0992 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/js/RDFJS.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/js/RDFJS.java
@@ -21,15 +21,15 @@ package org.apache.jena.sparql.function.js;
/**
* The <a href="https://github.com/rdfjs/representation-task-force/">rdfjs/representation-task-force</a>
* API for RDF terms.
- *
+ *
*/
public interface RDFJS {
public String getTermType();
public String getValue();
-
+
// public interface RDFJS_NamedNode {}
// public interface RDFJS_BlankNode {}
// public interface RDFJS_Literal {}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformExpr.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformExpr.java
index d683fb7..0ca88cd 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformExpr.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformExpr.java
@@ -28,9 +28,9 @@ import org.apache.jena.sparql.expr.*;
* to {@link NodeValue} and {@link ExprVar} inside expressions.
* <p>
* This does not transform triple patterns in {@link ExprFunctionOp}
- * which is done as part of {@link ApplyTransformVisitor}.
- *
- * @see NodeTransformOp
+ * which is done as part of {@link ApplyTransformVisitor}.
+ *
+ * @see NodeTransformOp
*/
public class NodeTransformExpr extends ExprTransformCopy {
private final NodeTransform transform ;
@@ -38,7 +38,7 @@ public class NodeTransformExpr extends ExprTransformCopy {
{
this.transform = transform ;
}
-
+
@Override
public Expr transform(NodeValue nv) {
return transform(nv.asNode());
@@ -48,15 +48,15 @@ public class NodeTransformExpr extends ExprTransformCopy {
public Expr transform(ExprVar exprVar) {
return transform(exprVar.getAsNode());
}
-
+
/** Transform node then create a {@link ExprVar} or {@link NodeValue}. */
private Expr transform(Node input) {
Node n = transform.apply(input);
if ( n == null )
throw new InternalErrorException("NodeTransform creates a null");
- if ( ! Var.isVar(n) )
- return NodeValue.makeNode(n);
+ if ( ! Var.isVar(n) )
+ return NodeValue.makeNode(n);
String name = Var.alloc(n).getVarName();
return new ExprVar(n.getName());
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java
index ac5af98..4a8261d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java
@@ -47,7 +47,7 @@ public class NodeTransformLib
ExprTransform exprTransform = new NodeTransformExpr(nodeTransform) ;
return Transformer.transform(opTransform, exprTransform, op);
}
-
+
/** Do a node{@literal ->}node conversion of a BGP - return original BGP for "no change" */
public static BasicPattern transform(NodeTransform nodeTransform, BasicPattern pattern) {
BasicPattern bgp2 = new BasicPattern() ;
@@ -86,14 +86,14 @@ public class NodeTransformLib
Node s = triple.getSubject() ;
Node p = triple.getPredicate() ;
Node o = triple.getObject() ;
-
+
Node s1 = nodeTransform.apply(s) ;
if ( s1 != s ) { change = true ; s = s1 ; }
Node p1 = nodeTransform.apply(p) ;
if ( p1 != p ) { change = true ; p = p1 ; }
Node o1 = nodeTransform.apply(o) ;
if ( o1 != o ) { change = true ; o = o1 ; }
-
+
if ( ! change )
return triple ;
return new Triple(s,p,o) ;
@@ -106,7 +106,7 @@ public class NodeTransformLib
Node p = quad.getPredicate() ;
Node o = quad.getObject() ;
Node g = quad.getGraph() ;
-
+
Node g1 = nodeTransform.apply(g) ;
if ( g1 != g ) { change = true ; g = g1 ; }
Node s1 = nodeTransform.apply(s) ;
@@ -115,25 +115,25 @@ public class NodeTransformLib
if ( p1 != p ) { change = true ; p = p1 ; }
Node o1 = nodeTransform.apply(o) ;
if ( o1 != o ) { change = true ; o = o1 ; }
-
+
if ( ! change )
return quad ;
return new Quad(g,s,p,o) ;
}
-
+
public static Table transform(Table table, NodeTransform transform) {
- // Non-streaming rewrite
+ // Non-streaming rewrite
List<Var> vars = transformVars(transform, table.getVars()) ;
- Iterator<Binding> iter = table.rows() ;
+ Iterator<Binding> iter = table.rows() ;
List<Binding> newRows = new ArrayList<>() ;
- for ( ; iter.hasNext() ; ) {
+ for ( ; iter.hasNext() ; ) {
Binding b = iter.next() ;
Binding b2 = transform(b, transform) ;
newRows.add(b2) ;
}
return new TableData(vars, newRows) ;
}
-
+
public static Binding transform(Binding b, NodeTransform transform) {
BindingMap b2 = BindingFactory.create() ;
List<Var> vars = Iter.toList(b.vars()) ;
@@ -149,7 +149,7 @@ public class NodeTransformLib
/** Do a node{@literal ->}node conversion of a List<Quad> - return original List<Quad> for "no change" */
public static List<Quad> transformQuads(NodeTransform nodeTransform, List<Quad> quads) {
List<Quad> x = new ArrayList<>() ;
- boolean changed = false ;
+ boolean changed = false ;
for ( Quad q : quads )
{
Quad q2 = NodeTransformLib.transform(nodeTransform, q) ;
@@ -161,7 +161,7 @@ public class NodeTransformLib
return quads ;
return x ;
}
-
+
/** Apply the NodeTransform to the variables of a VarExprList. */
public static VarExprList transformVars(NodeTransform transform, VarExprList varExprList) {
VarExprList varExprList2 = new VarExprList() ;
@@ -175,7 +175,7 @@ public class NodeTransformLib
varExprList2.add(v2, expr) ;
}
if ( ! changed )
- return varExprList ;
+ return varExprList ;
return varExprList2 ;
}
@@ -189,7 +189,7 @@ public class NodeTransformLib
changed = true ;
}
if ( ! changed )
- return varList ;
+ return varList ;
return varList2 ;
}
@@ -209,4 +209,4 @@ public class NodeTransformLib
public static Expr transform(NodeTransform nodeTransform, Expr expr) {
return expr.applyNodeTransform(nodeTransform) ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformOp.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformOp.java
index f6a300d..6efb3a0 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformOp.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformOp.java
@@ -39,8 +39,8 @@ import org.apache.jena.sparql.path.Path ;
* to graph patterns.
* <p>
* This does not transform expressions. That is done by {@link NodeTransformExpr}.
- *
- * @see NodeTransformExpr
+ *
+ * @see NodeTransformExpr
*/
class NodeTransformOp extends TransformCopy
{
@@ -51,7 +51,7 @@ class NodeTransformOp extends TransformCopy
// Extend, Assign
// Table
// Project
-
+
private final NodeTransform transform ;
NodeTransformOp(NodeTransform transform)
{
@@ -176,4 +176,4 @@ class NodeTransformOp extends TransformCopy
return super.transform(opGroup, subOp);
return OpGroup.create(subOp, groupVars2, opGroup.getAggregators());
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingMem.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingMem.java
index 07c6809..80c927a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingMem.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingMem.java
@@ -27,20 +27,20 @@ import java.util.function.BiConsumer;
import org.apache.jena.shared.PrefixMapping;
import org.apache.jena.shared.impl.PrefixMappingImpl;
-/**
+/**
* A {@link PrefixMapping} implemented as a pair of in-memory maps.
- *
+ *
* @implNote
* {@link PrefixMappingImpl} is the long time implementation.
- * This class should be exactly the same within the {@link PrefixMappingBase} framework.
- */
+ * This class should be exactly the same within the {@link PrefixMappingBase} framework.
+ */
public class PrefixMappingMem extends PrefixMappingBase {
private Map<String, String> prefixToUri = new ConcurrentHashMap<>();
private Map<String, String> uriToPrefix = new ConcurrentHashMap<>();
public PrefixMappingMem() {}
-
+
@Override
protected void add(String prefix, String uri) {
prefixToUri.put(prefix, uri);
@@ -51,9 +51,9 @@ public class PrefixMappingMem extends PrefixMappingBase {
* This is a complete implementation.
* <p>
* Test {@lcode AbstractTestPrefixMapping.testSecondPrefixDeletedUncoversPreviousMap}.
- */
+ */
@Override
- protected void remove(String prefix) {
+ protected void remove(String prefix) {
String u = prefixToUri(prefix);
if ( u == null )
return;
@@ -76,7 +76,7 @@ public class PrefixMappingMem extends PrefixMappingBase {
}
return null;
}
-
+
@Override
protected void clear() {
prefixToUri.clear();
@@ -84,7 +84,7 @@ public class PrefixMappingMem extends PrefixMappingBase {
}
@Override
- protected boolean isEmpty() {
+ protected boolean isEmpty() {
return prefixToUri.isEmpty();
}
@@ -117,4 +117,4 @@ public class PrefixMappingMem extends PrefixMappingBase {
protected void apply(BiConsumer<String, String> action) {
prefixToUri.forEach(action);
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingSink.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingSink.java
index b23a10d..e5a845d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingSink.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingSink.java
@@ -26,7 +26,7 @@ import java.util.function.BiConsumer;
import org.apache.jena.shared.PrefixMapping;
-/** Sink {@link PrefixMapping}. Accepts changes but does not retain state. */
+/** Sink {@link PrefixMapping}. Accepts changes but does not retain state. */
public class PrefixMappingSink extends PrefixMappingBase {
@Override
protected void add(String prefix, String uri) { }
@@ -38,7 +38,7 @@ public class PrefixMappingSink extends PrefixMappingBase {
protected void clear() {}
@Override
- protected boolean isEmpty() {
+ protected boolean isEmpty() {
return true;
}
@@ -74,10 +74,9 @@ public class PrefixMappingSink extends PrefixMappingBase {
@Override
protected void apply(BiConsumer<String, String> action) {}
-
+
@Override
public String toString() {
return "pm:Sink";
}
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingZero.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingZero.java
index f329ff4..f7ad75c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingZero.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingZero.java
@@ -32,9 +32,9 @@ public class PrefixMappingZero extends PrefixMappingSink {
protected void remove(String prefix) {
throw new UnsupportedOperationException("remove prefix");
}
-
+
@Override
public String toString() {
return "pm:Zero";
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteBase.java
index bf80a51..3f97881 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteBase.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory ;
/**
* Abstract base class for update processors that perform remote updates over
* HTTP
- *
+ *
*/
public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
private static Logger log = LoggerFactory.getLogger(UpdateProcessRemoteBase.class);
@@ -62,7 +62,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
/**
* Creates a new remote update processor
- *
+ *
* @param request
* Update request
* @param endpoint
@@ -93,7 +93,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
* omits parameter merging since that will be done automatically whenever
* the {@link QueryEngineHTTP} instance makes a query for remote submission.
* </p>
- *
+ *
* @param serviceURI
* Service URI
*/
@@ -123,7 +123,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
/**
* Gets the endpoint
- *
+ *
* @return Endpoint URI
*/
public String getEndpoint() {
@@ -143,7 +143,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
* decide whether to add this themselves since the generated query string
* may be being used in addition to an existing query string.
* </p>
- *
+ *
* @return Generated query string
*/
public String getUpdateString() {
@@ -152,7 +152,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
/**
* Gets the parameters for the execution
- *
+ *
* @return Parameters
*/
public Params getParams() {
@@ -172,7 +172,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
/**
* Gets the update request
- *
+ *
* @return Update request
*/
public UpdateRequest getUpdateRequest() {
@@ -181,7 +181,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
/**
* Adds a default graph
- *
+ *
* @param defaultGraph
* Default Graph URI
*/
@@ -194,7 +194,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
/**
* Adds a named graph
- *
+ *
* @param namedGraph
* Named Graph URi
*/
@@ -207,7 +207,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
/**
* Adds a custom parameter to the request
- *
+ *
* @param field
* Field
* @param value
@@ -221,7 +221,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
/**
* Sets the default graphs
- *
+ *
* @param defaultGraphs
* Default Graphs
*/
@@ -231,7 +231,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
/**
* Sets the named graphs
- *
+ *
* @param namedGraphs
* Named Graphs
*/
@@ -241,7 +241,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
/**
* Convenience method to set the {@link HttpContext}
- *
+ *
* @param httpContext
* HTTP Context
*/
@@ -251,7 +251,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
/**
* Convenience method to get the {@link HttpContext}
- *
+ *
* @return HttpContext
*/
public HttpContext getHttpContext() {
@@ -270,7 +270,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
* {@link HttpOp#setDefaultHttpClient(HttpClient)} to avoid the
* need to set client on a per-request basis
* </p>
- *
+ *
* @param client
* HTTP client
*/
@@ -285,10 +285,10 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
* this can be configured via the
* {@link HttpOp#setDefaultHttpClient(HttpClient)} method.
* </p>
- *
+ *
* @return HTTP client if set, null otherwise
*/
public HttpClient getClient() {
return this.client;
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateSink.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateSink.java
index 41530b2..c340472 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateSink.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateSink.java
@@ -37,5 +37,4 @@ public interface UpdateSink extends Sink<Update>
public QuadDataAccSink createInsertDataSink();
public QuadDataAccSink createDeleteDataSink();
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateSerializer.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateSerializer.java
index a6c9404..106ef76 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateSerializer.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateSerializer.java
@@ -29,7 +29,7 @@ import org.apache.jena.update.Update ;
* Interface for update serializers which may be registered indirectly with the
* {@link SerializerRegistry} via a {@link UpdateSerializerFactory} thus
* allowing the customisation of update serialization.
- *
+ *
*/
public interface UpdateSerializer extends Closeable {
@@ -40,7 +40,7 @@ public interface UpdateSerializer extends Closeable {
/**
* Serializes the given update
- *
+ *
* @param update
* Update
*/
@@ -48,7 +48,7 @@ public interface UpdateSerializer extends Closeable {
/**
* Serializes a sequence of updates
- *
+ *
* @param updates
* Updates
*/
@@ -56,10 +56,9 @@ public interface UpdateSerializer extends Closeable {
/**
* Serializes a sequence of updates
- *
+ *
* @param updateIter
* Updates
*/
public abstract void update(Iterator<? extends Update> updateIter);
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriterVisitor.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriterVisitor.java
index cf38e50..be4f9b2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriterVisitor.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriterVisitor.java
@@ -39,7 +39,7 @@ public class UpdateWriterVisitor implements UpdateVisitor
protected static final int BLOCK_INDENT = 2 ;
protected final IndentedWriter out ;
protected final SerializationContext sCxt ;
-
+
// TODO newline policy - don't add until needed.
public UpdateWriterVisitor(IndentedWriter out, SerializationContext sCxt)
@@ -55,9 +55,9 @@ public class UpdateWriterVisitor implements UpdateVisitor
out.print(" ") ;
if ( update.isSilent() )
out.print("SILENT ") ;
-
+
printTarget(update.getTarget()) ;
-
+
}
protected void printTarget(Target target)
@@ -66,7 +66,7 @@ public class UpdateWriterVisitor implements UpdateVisitor
else if ( target.isAllNamed() ) { out.print("NAMED") ; }
else if ( target.isDefault() ) { out.print("DEFAULT") ; }
else if ( target.isOneNamedGraph() )
- {
+ {
out.print("GRAPH ") ;
String s = FmtUtils.stringForNode(target.getGraph(), sCxt) ;
out.print(s) ;
@@ -108,9 +108,9 @@ public class UpdateWriterVisitor implements UpdateVisitor
out.print(" ") ;
if ( update.getSilent() )
out.print("SILENT ") ;
-
+
outputStringAsURI(update.getSource()) ;
-
+
if ( update.getDest() != null )
{
out.print(" INTO GRAPH ") ;
@@ -123,12 +123,12 @@ public class UpdateWriterVisitor implements UpdateVisitor
String x = FmtUtils.stringForURI(uriStr, sCxt) ;
out.print(x) ;
}
-
+
protected void printTargetUpdate2(Target target)
{
if ( target.isDefault() ) { out.print("DEFAULT") ; }
else if ( target.isOneNamedGraph() )
- {
+ {
//out.print("GRAPH ") ;
String s = FmtUtils.stringForNode(target.getGraph(), sCxt) ;
out.print(s) ;
@@ -139,7 +139,7 @@ public class UpdateWriterVisitor implements UpdateVisitor
throw new ARQException("Malformed Target / Update2") ;
}
}
-
+
protected void printUpdate2(UpdateBinaryOp update, String name)
{
out.print(name) ;
@@ -150,8 +150,8 @@ public class UpdateWriterVisitor implements UpdateVisitor
out.print(" TO ") ;
printTargetUpdate2(update.getDest()) ;
}
-
-
+
+
@Override
public void visit(UpdateAdd update)
{ printUpdate2(update, "ADD") ; }
@@ -178,7 +178,7 @@ public class UpdateWriterVisitor implements UpdateVisitor
{
Iter.sendToSink(update.getQuads().iterator(), createInsertDataSink()); // Iter.sendToSink() will call close() on the sink
}
-
+
@Override
public Sink<Quad> createDeleteDataSink()
{
@@ -194,7 +194,7 @@ public class UpdateWriterVisitor implements UpdateVisitor
}
// Prettier later.
-
+
protected void outputQuadsBraced(List<Quad> quads)
{
if ( quads.size() == 0 )
@@ -202,18 +202,18 @@ public class UpdateWriterVisitor implements UpdateVisitor
out.print("{ }") ;
return ;
}
-
+
SinkQuadBracedOutput sink = new SinkQuadBracedOutput(out, sCxt);
sink.open();
Iter.sendToSink(quads.iterator(), sink);
}
-
+
protected void output(Node node)
- {
+ {
String $ = FmtUtils.stringForNode(node, sCxt) ;
out.print($) ;
}
-
+
@Override
public void visit(UpdateDeleteWhere update)
{
@@ -232,7 +232,7 @@ public class UpdateWriterVisitor implements UpdateVisitor
out.print("WITH ") ;
output(update.getWithIRI()) ;
}
-
+
if ( update.hasDeleteClause() )
{
List<Quad> deleteQuads = update.getDeleteQuads() ;
@@ -240,7 +240,7 @@ public class UpdateWriterVisitor implements UpdateVisitor
out.print("DELETE ") ;
outputQuadsBraced(deleteQuads) ;
}
-
+
if ( update.hasInsertClause() )
{
List<Quad> insertQuads = update.getInsertQuads() ;
@@ -248,28 +248,28 @@ public class UpdateWriterVisitor implements UpdateVisitor
out.print("INSERT ") ;
outputQuadsBraced(insertQuads) ;
}
-
+
if ( ! update.hasInsertClause() && ! update.hasDeleteClause() )
{
// Fake a clause to make it legal syntax.
out.ensureStartOfLine() ;
out.println("INSERT { }") ;
}
-
+
for ( Node x : update.getUsing() )
{
out.ensureStartOfLine() ;
out.print("USING ") ;
output(x) ;
}
-
+
for ( Node x : update.getUsingNamed() )
{
out.ensureStartOfLine() ;
out.print("USING NAMED ") ;
output(x) ;
}
-
+
// Wrong.
Element el = update.getWherePattern() ;
out.ensureStartOfLine() ;
@@ -293,4 +293,4 @@ public class UpdateWriterVisitor implements UpdateVisitor
sCxt1.setBNodeMap(new NodeToLabelMapBNode("x", false));
return new FormatterElement(out, sCxt1);
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetWrapper.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetWrapper.java
index 112c7e2..02f315e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetWrapper.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetWrapper.java
@@ -27,14 +27,14 @@ import org.apache.jena.sparql.engine.binding.Binding ;
/** Wrap another {@link ResultSet} (probably to modify operations on it). */
public class ResultSetWrapper implements ResultSet {
-
+
protected ResultSet get() { return rs ; }
private final ResultSet rs;
public ResultSetWrapper(ResultSet rs) {
this.rs = rs ;
}
-
+
@Override
public boolean hasNext() {
return get().hasNext() ;
@@ -69,5 +69,4 @@ public class ResultSetWrapper implements ResultSet {
public Model getResourceModel() {
return get().getResourceModel() ;
}
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/TriplesListBlock.java b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/TriplesListBlock.java
index df33ea4..4b14b7f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/TriplesListBlock.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/TriplesListBlock.java
@@ -34,13 +34,13 @@ import org.apache.jena.graph.Triple;
listElementsMap.putAll(other.listElementsMap);
triplesInLists.addAll(other.triplesInLists);
}
-
+
@Override
public String toString() {
-
+
return Iter.asString(listElementsMap.keySet().iterator(), ", ")
+ "\n" + "{"+
Iter.asString(triplesInLists.iterator(), "\n")
+"}";
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ApplyElementTransformVisitor.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ApplyElementTransformVisitor.java
index a8475cb..2ebd8fd 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ApplyElementTransformVisitor.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ApplyElementTransformVisitor.java
@@ -151,7 +151,7 @@ class ApplyElementTransformVisitor implements ElementVisitor {
Node n = el.getGraphNameNode() ;
Node n1 = transformNode(n) ;
Element elt1 = pop() ;
- Element el2 = transform.transform(el, n1, elt1) ;
+ Element el2 = transform.transform(el, n1, elt1) ;
push(el2) ;
}
@@ -171,7 +171,7 @@ class ApplyElementTransformVisitor implements ElementVisitor {
push(el2) ;
}
- // When you need to force the walking of the tree ...
+ // When you need to force the walking of the tree ...
// EXISTS / NOT EXISTS
private Element subElement(Element elt) {
ElementWalker.walk(elt, this) ;
@@ -221,4 +221,4 @@ class ApplyElementTransformVisitor implements ElementVisitor {
return expr ;
return ExprTransformer.transform(exprTransform, expr) ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/EqualityTest.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/EqualityTest.java
index 3ebe7e0..631ce6f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/EqualityTest.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/EqualityTest.java
@@ -28,4 +28,4 @@ import org.apache.jena.graph.Node;
@FunctionalInterface
public interface EqualityTest {
boolean equal(Node n1, Node n2);
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/RomanNumeral.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/RomanNumeral.java
index 551003b..63b2d17 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/RomanNumeral.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/RomanNumeral.java
@@ -50,15 +50,15 @@ public class RomanNumeral
@Override
public String toString() { return i2r(intValue) ; }
-
+
public int intValue() { return intValue ; }
-
-
+
+
//String pat = "M*(CM|DC{0,3}|CD|C{0,3})(XC|LX{0,3}|XL|X{0,3})(IX|VI{0,3}|IV|I{0,3})" ;
// Added I{0,4}
static String numeralPattern = "M*(CM|DC{0,3}|CD|C{0,3})(XC|LX{0,3}|XL|X{0,3})(IX|VI{0,3}|IV|I{0,4})" ;
static Pattern pattern = Pattern.compile(numeralPattern) ;
-
+
public static boolean isValid(String lex) {
lex = lex.toUpperCase(Locale.ENGLISH) ;
// Excludes IIII
@@ -113,9 +113,9 @@ public class RomanNumeral
}
return sbuff.toString() ;
}
-
+
private static int i2r(StringBuffer sbuff, int i,
- String tens, int iTens,
+ String tens, int iTens,
String nines, int iNines,
String fives, int iFives,
String fours, int iFours)
@@ -125,7 +125,7 @@ public class RomanNumeral
sbuff.append(tens) ;
i -= iTens ;
}
-
+
if ( i >= iNines )
{
sbuff.append(nines) ;
@@ -144,12 +144,12 @@ public class RomanNumeral
}
return i ;
}
-
+
// Only subtract ten's C,X,I
// Only allow one of them
// One do 10^x from 10^(x+1)
// CM, CD, XC, XL, IX, IV
-
+
static private int charToNum(char ch)
{
if ( ch == 0 ) return 0 ;
@@ -167,12 +167,12 @@ public class RomanNumeral
new RValue[] { new RValue('M', 1000) ,
new RValue('D', 500) ,
new RValue('C', 100) ,
- new RValue('L', 50) ,
+ new RValue('L', 50) ,
new RValue('X', 10) ,
new RValue('V', 5) ,
new RValue('I', 1) } ;
char lex ; int val ;
- RValue(char s, int v) { lex = s ; val = v ; }
+ RValue(char s, int v) { lex = s ; val = v ; }
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/common/TC_Common.java b/jena-arq/src/test/java/org/apache/jena/common/TC_Common.java
index f19c527..184b2a1 100644
--- a/jena-arq/src/test/java/org/apache/jena/common/TC_Common.java
+++ b/jena-arq/src/test/java/org/apache/jena/common/TC_Common.java
@@ -31,4 +31,3 @@ import org.junit.runners.Suite.SuiteClasses ;
public class TC_Common
{
}
-
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/CatchParserOutput.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/CatchParserOutput.java
index 1a20ca0..ed1cb95 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/CatchParserOutput.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/CatchParserOutput.java
@@ -32,20 +32,20 @@ class CatchParserOutput implements StreamRDF
List<Quad> quads = new ArrayList<>() ;
List<Pair<String,String>> prefixes = new ArrayList<>() ;
List<String> bases = new ArrayList<>() ;
-
+
int startCalled = 0 ;
-
+
int finishCalled = 0 ;
-
+
@Override public void start() { startCalled++ ; }
-
+
@Override public void triple(Triple triple) { triples.add(triple) ; }
-
+
@Override public void quad(Quad quad) { quads.add(quad) ; }
-
+
@Override public void base(String base) { bases.add(base) ; }
-
+
@Override public void prefix(String prefix, String iri) { prefixes.add(Pair.create(prefix, iri)) ; }
-
+
@Override public void finish() { finishCalled++ ; }
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/extra/TS_LangExtra.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/extra/TS_LangExtra.java
index 2651357..16aa029 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/extra/TS_LangExtra.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/extra/TS_LangExtra.java
@@ -23,7 +23,7 @@ import org.apache.jena.sys.JenaSystem;
import org.junit.runner.RunWith;
import org.junit.runners.AllTests;
-/** Tests for "lang.extra" such as the JavaCC version of the Turtle parser */
+/** Tests for "lang.extra" such as the JavaCC version of the Turtle parser */
@RunWith(AllTests.class)
public class TS_LangExtra
@@ -36,11 +36,11 @@ public class TS_LangExtra
{
JenaSystem.init();
TurtleJavaccReaderRIOT.register();
-
+
TestSuite ts = new TestSuite(TS_LangExtra.class.getName());
ts.addTest(FactoryTestTurtleJavacc.make(manifest1, null, null));
ts.addTest(FactoryTestTurtleJavacc.make(manifest2, null, null));
ts.addTest(FactoryTestTurtleJavacc.make(manifest3, null, null));
return ts;
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestReorderBGP.java b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestReorderBGP.java
index 3e3151e..e0667c3 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestReorderBGP.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestReorderBGP.java
@@ -22,16 +22,16 @@ import org.apache.jena.sparql.algebra.Transform ;
import org.apache.jena.sparql.engine.optimizer.reorder.ReorderLib ;
import org.junit.Test ;
-/** Test BGP reordering using the fixed reordering algorithm */
+/** Test BGP reordering using the fixed reordering algorithm */
public class TestReorderBGP extends AbstractTestTransform {
- private static Transform t_reorder = new TransformReorder(ReorderLib.fixed()) ;
-
+ private static Transform t_reorder = new TransformReorder(ReorderLib.fixed()) ;
+
public TestReorderBGP() {}
@Test public void reorderbgp_1_1() {
testOp("(bgp (?s :p ?o))", t_reorder, "(bgp (?s :p ?o))") ;
}
-
+
@Test public void reorderbgp_1_2() {
testOp("(bgp (?s ?p ?o))", t_reorder, "(bgp (?s ?p ?o))") ;
}
@@ -43,7 +43,7 @@ public class TestReorderBGP extends AbstractTestTransform {
@Test public void reorderbgp_2_2() {
testOp("(bgp (?s :p 123) (?s :p ?o) )", t_reorder, "(bgp (?s :p 123) (?s :p ?o))") ;
}
-
+
@Test public void reorderbgp_2_3() {
testOp("(bgp (?s :p 123) (?s rdf:type :T) )", t_reorder, "(bgp (?s :p 123) (?s rdf:type :T))") ;
}
@@ -58,7 +58,7 @@ public class TestReorderBGP extends AbstractTestTransform {
testOp("(bgp (?s rdf:type :T) (?s :p ?o) (?s :p 123) )",
t_reorder, expected3) ;
}
-
+
@Test public void reorderbgp_3_2() {
testOp("(bgp (?s :p ?o) (?s :p 123) (?s rdf:type :T) )",
t_reorder, expected3) ;
@@ -73,7 +73,7 @@ public class TestReorderBGP extends AbstractTestTransform {
testOp("(bgp (?s rdf:type :T) (?s :p 123) (?s :p ?o) )",
t_reorder, expected3) ;
}
-
+
@Test public void reorderbgp_3_5() {
testOp("(bgp (?s :p 123) (?s :p ?o) (?s rdf:type :T))",
t_reorder, expected3) ;
@@ -82,5 +82,4 @@ public class TestReorderBGP extends AbstractTestTransform {
testOp("(bgp (?s :p ?o) (?s rdf:type :T) (?s :p 123) )",
t_reorder, expected3) ;
}
-
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryPromote.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryPromote.java
index 9fb81b7..7eb7291 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryPromote.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryPromote.java
@@ -36,9 +36,9 @@ public class TestDatasetGraphInMemoryPromote extends AbstractTestTransPromote {
private static String[] getLoggers() {
return new String[]{ DatasetGraphInMemory.class.getName() };
}
-
+
@Override
protected Class<JenaTransactionException> getTransactionExceptionClass() {
return JenaTransactionException.class ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/TestJsonEval.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/TestJsonEval.java
index 47c8548..aab3246 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/TestJsonEval.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/TestJsonEval.java
@@ -31,37 +31,37 @@ public class TestJsonEval {
@Test public void json_eval_01() {
test("JSON { 'x' : ?x } WHERE { VALUES ?x { 'X' } }",
- "[ { 'x' : 'X' } ]");
+ "[ { 'x' : 'X' } ]");
}
@Test public void json_eval_02() {
test("JSON { 'x' : ?x } WHERE { VALUES ?x { 'X' 'Y' } }",
- "[ { 'x' : 'X' } , {'x' : 'Y' }]");
+ "[ { 'x' : 'X' } , {'x' : 'Y' }]");
}
@Test public void json_eval_03() {
test("JSON { 's' : 'FOO' } WHERE { }",
- "[ { 's' : 'FOO' } ]");
+ "[ { 's' : 'FOO' } ]");
}
@Test public void json_eval_04() {
test("JSON { 'F' : 'string' } WHERE { }",
- "[ { 'F' : 'string' } ]");
+ "[ { 'F' : 'string' } ]");
}
@Test public void json_eval_05() {
test("JSON { 'x' : 123 } WHERE { }",
- "[ { 'x' : 123 }]");
+ "[ { 'x' : 123 }]");
}
@Test public void json_eval_06() {
test("JSON { 'x' : 123.5 } WHERE { }",
- "[ { 'x' : 123.5 }]");
+ "[ { 'x' : 123.5 }]");
}
@Test public void json_eval_07() {
test("JSON { 'x' : -10 } WHERE { }",
- "[ { 'x' : -10 }]");
+ "[ { 'x' : -10 }]");
}
private void test(String queryString, String jsonExpected) {
@@ -74,4 +74,4 @@ public class TestJsonEval {
assertEquals(jvExpected, jvGot);
}
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/TestQueryEngineMultiThreaded.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/TestQueryEngineMultiThreaded.java
index 1a17c9e..73e413a 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/TestQueryEngineMultiThreaded.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/TestQueryEngineMultiThreaded.java
@@ -43,7 +43,7 @@ public class TestQueryEngineMultiThreaded {
public int numFailures;
public List<Exception> exceptions = new ArrayList<>();
}
-
+
@Test
public void parallel_sparql_construct_default_model_read_lock() throws Exception {
Model model = this.createDefaultModel();
@@ -55,7 +55,7 @@ public class TestQueryEngineMultiThreaded {
Model model = createForwardChainingModel();
this.testParallelConstruct(model, Lock.READ, EXPECTED_NUM_REASONER_TRIPLES);
}
-
+
@Test
public void parallel_sparql_construct_default_model_write_lock() throws Exception {
Model model = this.createDefaultModel();
@@ -67,7 +67,7 @@ public class TestQueryEngineMultiThreaded {
Model model = createForwardChainingModel();
this.testParallelConstruct(model, Lock.WRITE, EXPECTED_NUM_REASONER_TRIPLES);
}
-
+
@Test
public void parallel_sparql_select_default_model_read_lock() throws Exception {
Model model = this.createDefaultModel();
@@ -79,7 +79,7 @@ public class TestQueryEngineMultiThreaded {
Model model = createForwardChainingModel();
this.testParallelSelect(model, Lock.READ, EXPECTED_NUM_REASONER_RESULTS);
}
-
+
@Test
public void parallel_sparql_select_default_model_write_lock() throws Exception {
Model model = this.createDefaultModel();
@@ -99,7 +99,7 @@ public class TestQueryEngineMultiThreaded {
assertEquals(0, runResult.exceptions.size());
assertEquals(0, runResult.numFailures);
}
-
+
private void testParallelSelect(Model model, boolean lock, int expected) throws Exception {
RunResult runResult = new RunResult();
List<Thread> threads = createSparqlSelectExecutionThreads(model, lock, expected, runResult);
@@ -116,10 +116,10 @@ public class TestQueryEngineMultiThreaded {
}
return threads;
}
-
+
private List<Thread> createSparqlSelectExecutionThreads(Model model, boolean lock, int expected, RunResult runResult) {
List<Thread> threads = new ArrayList<>();
-
+
for (int thread = 0; thread < NUMBER_OF_THREADS; thread++) {
threads.add(createExecuteSparqlSelectThread(model, lock, expected, runResult));
}
@@ -143,7 +143,7 @@ public class TestQueryEngineMultiThreaded {
}
};
}
-
+
private Thread createExecuteSparqlSelectThread(final Model model, final boolean lock, final int expected, final RunResult runResult) {
return new Thread() {
@Override
@@ -181,7 +181,7 @@ public class TestQueryEngineMultiThreaded {
finally { model.leaveCriticalSection() ; }
}
}
-
+
private ResultSetRewindable executeSparqlSelect(Model model, String sparql, boolean lock) {
Query query = QueryFactory.create(sparql);
try(QueryExecution queryExec = QueryExecutionFactory.create(query, model)) {
@@ -193,7 +193,7 @@ public class TestQueryEngineMultiThreaded {
}
}
}
-
+
private Model createDefaultModel() {
Model def = ModelFactory.createDefaultModel();
def.read(new ByteArrayInputStream(TURTLE_RDF.getBytes()), "", "TURTLE");
@@ -298,4 +298,4 @@ public class TestQueryEngineMultiThreaded {
+ "<patient/1239> <med> \"Atenolol\" ."
+ "<patient/1239> <med> \"Acetominophen\" ."
+ "<patient/1239> <med> \"Ibuprofen\" .";
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java
index 7707407..8a44dcb 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java
@@ -49,11 +49,11 @@ import org.junit.Test;
/*
Test that a SortedDataBag used inside a QueryIterSort
does indeed cut off when cancelled.
-
+
This is horribly clunky because of the effort of
setting up. Maybe we should instead be content to
test the SortedDataBag correctly?
-
+
*/
public class TestSortedDataBagCancellation {
@@ -229,4 +229,4 @@ public class TestSortedDataBagCancellation {
return base.compare(x, y);
}
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCastXSD.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCastXSD.java
index 050a415..9ac05e1 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCastXSD.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCastXSD.java
@@ -32,7 +32,7 @@ import org.junit.BeforeClass ;
import org.junit.Test ;
public class TestCastXSD {
-
+
private static boolean origValue ;
@BeforeClass public static void beforeClass() {
origValue = NodeValue.VerboseWarnings;
@@ -89,11 +89,11 @@ public class TestCastXSD {
@Test public void cast_from_boolean_04() { testCast ("xsd:decimal('false'^^xsd:boolean)", "0.0" ) ; }
@Test public void cast_from_boolean_05() { testCast ("xsd:double('false'^^xsd:boolean)", "0.0E0" ) ; }
- @Test public void cast_to_duration_01() { testCast ("xsd:duration('PT10S')", "'PT10S'^^xsd:duration") ; }
- @Test public void cast_to_duration_02() { testCast ("xsd:duration('P1DT10S'^^xsd:dayTimeDuration)", "'P1DT10S'^^xsd:duration") ; }
+ @Test public void cast_to_duration_01() { testCast ("xsd:duration('PT10S')", "'PT10S'^^xsd:duration") ; }
+ @Test public void cast_to_duration_02() { testCast ("xsd:duration('P1DT10S'^^xsd:dayTimeDuration)", "'P1DT10S'^^xsd:duration") ; }
- @Test public void cast_to_duration_03() { testCast ("xsd:dayTimeDuration('P1Y2M3DT1H2M3S'^^xsd:duration)", "'P3DT1H2M3S'^^xsd:dayTimeDuration") ; }
- @Test public void cast_to_duration_04() { testCast ("xsd:dayTimeDuration('P1Y'^^xsd:duration)", "'PT0S'^^xsd:dayTimeDuration") ; }
+ @Test public void cast_to_duration_03() { testCast ("xsd:dayTimeDuration('P1Y2M3DT1H2M3S'^^xsd:duration)", "'P3DT1H2M3S'^^xsd:dayTimeDuration") ; }
+ @Test public void cast_to_duration_04() { testCast ("xsd:dayTimeDuration('P1Y'^^xsd:duration)", "'PT0S'^^xsd:dayTimeDuration") ; }
@Test public void cast_to_duration_05() { testCast ("xsd:yearMonthDuration('P1Y2M3DT1H2M3S'^^xsd:duration)", "'P1Y2M'^^xsd:yearMonthDuration") ; }
// This is what the XSD spec says, not "no cast"
@@ -131,7 +131,7 @@ public class TestCastXSD {
private NodeValue cast(String input$) {
Expr input = ExprUtils.parse(input$) ;
ARQ.getContext().set(ARQConstants.sysCurrentTime, NodeFactoryExtra.nowAsDateTime()) ;
- FunctionEnv env = new ExecutionContext(ARQ.getContext(), null, null, null) ;
+ FunctionEnv env = new ExecutionContext(ARQ.getContext(), null, null, null) ;
return input.eval(null, env) ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/system/ExceptionFromTest.java b/jena-arq/src/test/java/org/apache/jena/system/ExceptionFromTest.java
index 42efda6..c0ac7f6 100644
--- a/jena-arq/src/test/java/org/apache/jena/system/ExceptionFromTest.java
+++ b/jena-arq/src/test/java/org/apache/jena/system/ExceptionFromTest.java
@@ -18,4 +18,4 @@
package org.apache.jena.system;
-class ExceptionFromTest extends RuntimeException {}
\ No newline at end of file
+class ExceptionFromTest extends RuntimeException {}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorTruncate.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorTruncate.java
index 4370976..1c70a3b 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorTruncate.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorTruncate.java
@@ -23,7 +23,7 @@ import java.util.function.Predicate ;
import org.apache.jena.atlas.iterator.IteratorSlotted ;
-/** Iterate while a condition is true, then stop.
+/** Iterate while a condition is true, then stop.
* This iterator does not touch any elements after the first
* where the predicate is false.
*/
@@ -58,4 +58,4 @@ public class IteratorTruncate<T> extends IteratorSlotted<T> {
protected void closeIterator() {
Iter.close(iter);
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/Alarm.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/Alarm.java
index fae5f65..96ca8ed 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/Alarm.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/Alarm.java
@@ -25,11 +25,11 @@ public class Alarm {
public final Runnable task ;
public final ScheduledFuture<?> future ;
/*package*/ final AlarmClock alarmClock;
-
+
Alarm(AlarmClock alarmClock, Runnable task, ScheduledFuture<? > future) {
super();
this.alarmClock = alarmClock ;
this.task = task;
this.future = future;
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/AlarmClock.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/AlarmClock.java
index 94d13e1..e920aa0 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/AlarmClock.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/AlarmClock.java
@@ -34,7 +34,7 @@ public class AlarmClock {
.namingPattern("alarm-clock-%d")
//.uncaughtExceptionHandler(null)
.build() ;
-
+
private ScheduledThreadPoolExecutor timer = new ScheduledThreadPoolExecutor(1, threadFactory) ;
/* package */AlarmClock() {}
@@ -69,4 +69,4 @@ public class AlarmClock {
public void release() {
timer.shutdownNow() ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/PairOfSameType.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/PairOfSameType.java
index 5386fe0..c195400 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/PairOfSameType.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/PairOfSameType.java
@@ -38,8 +38,8 @@ public class PairOfSameType<T> extends Pair<T, T> {
public boolean either(Function<T, Boolean> op) {
return apply(Boolean::logicalOr, op);
}
-
+
public <S, X> S apply(BiFunction<X, X, S> f, Function<T, X> op) {
return f.apply(op.apply(a), op.apply(b));
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TConsumer3.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TConsumer3.java
index d5e2868..2be56a9 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TConsumer3.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TConsumer3.java
@@ -29,4 +29,4 @@ public interface TConsumer3<X> {
void accept(X x1, X x2, X x3);
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TConsumer4.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TConsumer4.java
index c924394..9d7ca6f 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TConsumer4.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TConsumer4.java
@@ -29,4 +29,4 @@ public interface TConsumer4<X> {
void accept(X x1, X x2, X x3, X x4);
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TFunction3.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TFunction3.java
index e318bd6..de34672 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TFunction3.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TFunction3.java
@@ -26,7 +26,7 @@ package org.apache.jena.atlas.lib.tuple;
*/
@FunctionalInterface
public interface TFunction3<X, Z> {
-
+
Z apply(X x1, X x2, X x3);
-
-}
\ No newline at end of file
+
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TFunction4.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TFunction4.java
index 2976da4..934c828 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TFunction4.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TFunction4.java
@@ -26,7 +26,7 @@ package org.apache.jena.atlas.lib.tuple;
*/
@FunctionalInterface
public interface TFunction4<X, Z> {
-
+
Z apply(X x1, X x2, X x3, X x4);
-
-}
\ No newline at end of file
+
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple0.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple0.java
index 94ba91c..72b700c 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple0.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple0.java
@@ -34,4 +34,4 @@ public class Tuple0<X> extends TupleBase<X> {
public final int len() {
return 0 ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple1.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple1.java
index dfb8601..e2dcc5d 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple1.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple1.java
@@ -22,7 +22,7 @@ package org.apache.jena.atlas.lib.tuple;
* A tuple of 1 item.
*/
public class Tuple1<X> extends TupleBase<X> {
- protected final X x1 ;
+ protected final X x1 ;
protected Tuple1(X x1) {
this.x1 = x1 ;
@@ -39,4 +39,4 @@ public class Tuple1<X> extends TupleBase<X> {
public final int len() {
return 1 ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple2.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple2.java
index bdf6679..eecc9bb 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple2.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple2.java
@@ -22,7 +22,7 @@ package org.apache.jena.atlas.lib.tuple;
* A tuple of 2 items.
*/
public class Tuple2<X> extends TupleBase<X> {
- protected final X x1 ;
+ protected final X x1 ;
protected final X x2 ;
protected Tuple2(X x1, X x2) {
@@ -43,4 +43,4 @@ public class Tuple2<X> extends TupleBase<X> {
public final int len() {
return 2 ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple3.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple3.java
index 3d2dd29..969c475 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple3.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple3.java
@@ -22,7 +22,7 @@ package org.apache.jena.atlas.lib.tuple;
* A tuple of 3 items.
*/
public class Tuple3<X> extends TupleBase<X> {
- protected final X x1 ;
+ protected final X x1 ;
protected final X x2 ;
protected final X x3 ;
@@ -46,4 +46,4 @@ public class Tuple3<X> extends TupleBase<X> {
public final int len() {
return 3 ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple4.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple4.java
index dcb5066..1afef15 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple4.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple4.java
@@ -22,7 +22,7 @@ package org.apache.jena.atlas.lib.tuple;
* A tuple of 4 items.
*/
public class Tuple4<X> extends TupleBase<X> {
- protected final X x1 ;
+ protected final X x1 ;
protected final X x2 ;
protected final X x3 ;
protected final X x4 ;
@@ -49,4 +49,4 @@ public class Tuple4<X> extends TupleBase<X> {
public final int len() {
return 4 ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple5.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple5.java
index 1d87dea..5f4efc9 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple5.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple5.java
@@ -22,7 +22,7 @@ package org.apache.jena.atlas.lib.tuple;
* A tuple of 5 items.
*/
public class Tuple5<X> extends TupleBase<X> {
- protected final X x1 ;
+ protected final X x1 ;
protected final X x2 ;
protected final X x3 ;
protected final X x4 ;
@@ -52,4 +52,4 @@ public class Tuple5<X> extends TupleBase<X> {
public final int len() {
return 5 ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple6.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple6.java
index a4ba6ce..76211b6 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple6.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple6.java
@@ -22,7 +22,7 @@ package org.apache.jena.atlas.lib.tuple;
* A tuple of 6 items.
*/
public class Tuple6<X> extends TupleBase<X> {
- protected final X x1 ;
+ protected final X x1 ;
protected final X x2 ;
protected final X x3 ;
protected final X x4 ;
@@ -55,4 +55,4 @@ public class Tuple6<X> extends TupleBase<X> {
public final int len() {
return 6 ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple7.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple7.java
index b001fd1..a5a9ae4 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple7.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple7.java
@@ -22,7 +22,7 @@ package org.apache.jena.atlas.lib.tuple;
* A tuple of 7 items.
*/
public class Tuple7<X> extends TupleBase<X> {
- protected final X x1 ;
+ protected final X x1 ;
protected final X x2 ;
protected final X x3 ;
protected final X x4 ;
@@ -58,4 +58,4 @@ public class Tuple7<X> extends TupleBase<X> {
public final int len() {
return 7 ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple8.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple8.java
index 7039478..d2e309d 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple8.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/Tuple8.java
@@ -22,7 +22,7 @@ package org.apache.jena.atlas.lib.tuple;
* A tuple of 8 items.
*/
public class Tuple8<X> extends TupleBase<X> {
- protected final X x1 ;
+ protected final X x1 ;
protected final X x2 ;
protected final X x3 ;
protected final X x4 ;
@@ -61,4 +61,4 @@ public class Tuple8<X> extends TupleBase<X> {
public final int len() {
return 8 ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleBase.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleBase.java
index 90cdbf3..63d72b3 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleBase.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleBase.java
@@ -32,7 +32,7 @@ abstract class TupleBase<X> implements Tuple<X> {
result = prime * result + Objects.hashCode(get(i)) ;
return result;
}
-
+
@Override
public final
boolean equals(Object obj) {
@@ -40,13 +40,13 @@ abstract class TupleBase<X> implements Tuple<X> {
return true;
if ( obj == null )
return false ;
- if ( ! ( obj instanceof Tuple<?> ) )
+ if ( ! ( obj instanceof Tuple<?> ) )
return false ;
Tuple<?> other = (Tuple<?>)obj ;
if ( this.len() != other.len() )
return false ;
for ( int i = 0 ; i < this.len() ; i++ )
- if ( ! Objects.equals(this.get(i), other.get(i)) )
+ if ( ! Objects.equals(this.get(i), other.get(i)) )
return false ;
return true;
}
@@ -56,4 +56,3 @@ abstract class TupleBase<X> implements Tuple<X> {
return asList().toString() ;
}
}
-
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleFactory.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleFactory.java
index 7632960..8b70f92 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleFactory.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleFactory.java
@@ -25,7 +25,7 @@ public class TupleFactory {
private TupleFactory() {}
- /** Create a Tuple */
+ /** Create a Tuple */
@SafeVarargs
public static <X> Tuple<X> tuple(X...xs) {
switch(xs.length) {
@@ -44,7 +44,7 @@ public class TupleFactory {
}
}
- /** Create a Tuple from an array */
+ /** Create a Tuple from an array */
public static <X> Tuple<X> create(X[] xs) {
switch(xs.length) {
case 0 : return create0() ;
@@ -61,12 +61,12 @@ public class TupleFactory {
}
}
- /** Treat an array as a Tuple. The array must not be mutated */
+ /** Treat an array as a Tuple. The array must not be mutated */
public static <X> Tuple<X> asTuple(X[] xs) {
return TupleN.wrap(xs) ;
}
- /** Create a Tuple from a list */
+ /** Create a Tuple from a list */
public static <X> Tuple<X> create(List<X> xs) {
@SuppressWarnings("unchecked")
X[] xa = (X[])(new Object[xs.size()]) ;
@@ -117,6 +117,4 @@ public class TupleFactory {
public static <X> Tuple8<X> create8(X x1, X x2, X x3, X x4, X x5, X x6, X x7, X x8) {
return new Tuple8<>(x1, x2, x3, x4, x5, x6, x7, x8) ;
}
-
-
}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleList.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleList.java
index f87ae68..e55902f 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleList.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleList.java
@@ -40,4 +40,4 @@ import java.util.RandomAccess ;
public int size() {
return tuple.len() ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java
index c25c697..feaa5f6 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java
@@ -52,7 +52,7 @@ public class TestDateTimeUtils {
cal.setTimeZone(TimeZone.getTimeZone("MST"));
assertEquals("1984-03-22-07:00", DateTimeUtils.calendarToXSDDateString(cal));
}
-
+
@Test
public void testCalendarToXSDTimeString_1() {
Calendar cal = createCalendar(1984, Calendar.MARCH, 22, 14, 32, 1, 0, "GMT+01:00");
@@ -61,7 +61,7 @@ public class TestDateTimeUtils {
cal.setTimeZone(TimeZone.getTimeZone("MST"));
assertEquals("06:32:01-07:00", DateTimeUtils.calendarToXSDTimeString(cal));
}
-
+
@Test
public void testCalendarToXSDTimeString_2() {
Calendar cal = createCalendar(1984, Calendar.MARCH, 22, 14, 32, 1, 500, "GMT+01:00");
@@ -70,7 +70,7 @@ public class TestDateTimeUtils {
cal.setTimeZone(TimeZone.getTimeZone("MST"));
assertEquals("06:32:01.500-07:00", DateTimeUtils.calendarToXSDTimeString(cal));
}
-
+
private static Calendar createCalendar(int year, int month, int dayOfMonth, int hourOfDay,
int minute, int second, int milli, String tz) {
GregorianCalendar cal = new GregorianCalendar(TimeZone.getTimeZone(tz)) ;
@@ -78,4 +78,4 @@ public class TestDateTimeUtils {
cal.set(Calendar.MILLISECOND, milli) ;
return cal ;
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Factory.java b/jena-core/src/main/java/org/apache/jena/graph/Factory.java
index a96ebab..21692de 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Factory.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Factory.java
@@ -32,22 +32,22 @@ public class Factory
{
private Factory()
{ super(); }
-
+
/**
Answer a memory-based Graph.
*/
public static Graph createDefaultGraph()
{ return Factory.createGraphMem( ); }
-
+
public static Graph createGraphMem()
{ return new GraphMem(); }
public static Graph createGraphMemWithTransactionHandler( final TransactionHandler th )
{
- Graph g = new GraphMem()
+ Graph g = new GraphMem()
{
@Override
- public TransactionHandler getTransactionHandler()
+ public TransactionHandler getTransactionHandler()
{ return th; }
};
return g;
@@ -60,8 +60,8 @@ public class Factory
return NullIterator.instance() ;
}
} ;
-
- /** Immutable graph with no triples */
+
+ /** Immutable graph with no triples */
public static Graph empty() { return emptyGraph ; }
- }
\ No newline at end of file
+ }
diff --git a/jena-core/src/main/java/org/apache/jena/mem/HashedTripleBunch.java b/jena-core/src/main/java/org/apache/jena/mem/HashedTripleBunch.java
index 414c647..b534e63 100644
--- a/jena-core/src/main/java/org/apache/jena/mem/HashedTripleBunch.java
+++ b/jena-core/src/main/java/org/apache/jena/mem/HashedTripleBunch.java
@@ -24,11 +24,11 @@ import org.apache.jena.graph.Triple ;
import org.apache.jena.util.iterator.ExtendedIterator ;
public class HashedTripleBunch extends HashCommon<Triple> implements TripleBunch
- {
+ {
public HashedTripleBunch( TripleBunch b )
{
super( nextSize( (int) (b.size() / loadFactor) ) );
- for (Iterator<Triple> it = b.iterator(); it.hasNext();) add( it.next() );
+ for (Iterator<Triple> it = b.iterator(); it.hasNext();) add( it.next() );
changes = 0;
}
@@ -37,8 +37,8 @@ public class HashedTripleBunch extends HashCommon<Triple> implements TripleBunch
@Override
public boolean contains( Triple t )
- { return findSlot( t ) < 0; }
-
+ { return findSlot( t ) < 0; }
+
protected int findSlotBySameValueAs( Triple key )
{
int index = initialIndexFor( key );
@@ -50,26 +50,26 @@ public class HashedTripleBunch extends HashCommon<Triple> implements TripleBunch
if (--index < 0) index += capacity;
}
}
-
+
@Override
public boolean containsBySameValueAs( Triple t )
{ return findSlotBySameValueAs( t ) < 0; }
-
+
/**
- Answer the number of items currently in this TripleBunch.
+ Answer the number of items currently in this TripleBunch.
@see org.apache.jena.mem.TripleBunch#size()
*/
@Override
public int size()
{ return size; }
-
+
/**
Answer the current capacity of this HashedTripleBunch; for testing purposes
- only. [Note that the bunch is resized when it is more than half-occupied.]
+ only. [Note that the bunch is resized when it is more than half-occupied.]
*/
public int currentCapacity()
{ return capacity; }
-
+
@Override
public void add( Triple t )
{
@@ -77,7 +77,7 @@ public class HashedTripleBunch extends HashCommon<Triple> implements TripleBunch
changes += 1;
if (++size > threshold) grow();
}
-
+
protected void grow()
{
Object [] oldContents = keys;
@@ -90,19 +90,18 @@ public class HashedTripleBunch extends HashCommon<Triple> implements TripleBunch
if (t != null) newKeys[findSlot( t )] = t;
}
}
-
+
@Override public void remove( Triple t )
{
super.remove( t );
changes += 1;
}
-
+
@Override
public ExtendedIterator<Triple> iterator()
{ return iterator( NotifyEmpty.ignore ); }
-
+
@Override
public ExtendedIterator<Triple> iterator( final NotifyEmpty container )
{ return keyIterator( container ); }
-
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/main/java/org/apache/jena/sys/JenaSubsystemRegistryBasic.java b/jena-core/src/main/java/org/apache/jena/sys/JenaSubsystemRegistryBasic.java
index 28af4fe..35129a7 100644
--- a/jena-core/src/main/java/org/apache/jena/sys/JenaSubsystemRegistryBasic.java
+++ b/jena-core/src/main/java/org/apache/jena/sys/JenaSubsystemRegistryBasic.java
@@ -22,26 +22,26 @@ import java.util.ArrayList ;
import java.util.List ;
import java.util.ServiceLoader ;
-/** Implementation of {@link JenaSubsystemRegistry} for use in the simple
+/** Implementation of {@link JenaSubsystemRegistry} for use in the simple
* but common case of running Jena as a collection of jars
- * on the classpath.
+ * on the classpath.
* <p>
- * Uses {@link ServiceLoader} to find sub-systems.
+ * Uses {@link ServiceLoader} to find sub-systems.
*/
public class JenaSubsystemRegistryBasic implements JenaSubsystemRegistry {
-
+
private List<JenaSubsystemLifecycle> registry = new ArrayList<>() ;
private Object registryLock = new Object() ;
public JenaSubsystemRegistryBasic() {
}
-
+
@Override
public void load() {
synchronized (registryLock) {
- // Find subsystems asking for initialization.
- ServiceLoader<JenaSubsystemLifecycle> sl =
- // Use this->classloader form : better for OSGi
+ // Find subsystems asking for initialization.
+ ServiceLoader<JenaSubsystemLifecycle> sl =
+ // Use this->classloader form : better for OSGi
ServiceLoader.load(JenaSubsystemLifecycle.class, this.getClass().getClassLoader()) ;
sl.forEach(this::add) ;
}
@@ -82,11 +82,11 @@ public class JenaSubsystemRegistryBasic implements JenaSubsystemRegistry {
return registry.isEmpty();
}
}
-
+
@Override
public List<JenaSubsystemLifecycle> snapshot() {
synchronized (registryLock) {
return new ArrayList<>(registry) ;
}
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSelectorUse.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSelectorUse.java
index 6de93fd..4da51ae 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSelectorUse.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSelectorUse.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -320,5 +320,4 @@ public class TestSelectorUse extends AbstractModelTestBase
iter.close();
}
}
-
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/IResourceProducer.java b/jena-core/src/test/java/org/apache/jena/testing_framework/IResourceProducer.java
index 3c74fb2..1220ba9 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/IResourceProducer.java
+++ b/jena-core/src/test/java/org/apache/jena/testing_framework/IResourceProducer.java
@@ -25,4 +25,4 @@ public interface IResourceProducer<X extends Resource> extends INodeProducer<X>
* Returns true if the Resource implementation supports non URI values
*/
boolean supportsAnonymous();
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/file/AlreadyLocked.java b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/file/AlreadyLocked.java
index 4fcd92d..8b0ee5c 100644
--- a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/file/AlreadyLocked.java
+++ b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/file/AlreadyLocked.java
@@ -26,4 +26,4 @@ import org.apache.jena.dboe.DBOpEnvException;
*/
public class AlreadyLocked extends DBOpEnvException {
public AlreadyLocked(String msg) { super(msg); }
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/TS_Index.java b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/TS_Index.java
index 3667572..2095db0 100644
--- a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/TS_Index.java
+++ b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/TS_Index.java
@@ -27,4 +27,4 @@ import org.junit.runners.Suite;
} )
public class TS_Index
-{ }
\ No newline at end of file
+{ }
diff --git a/jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixEntry.java b/jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixEntry.java
index 7cecbd5..7bab96a 100644
--- a/jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixEntry.java
+++ b/jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixEntry.java
@@ -44,4 +44,4 @@ public class PrefixEntry {
public String toString() {
return "PrefixEntry["+prefix+": <"+uri+">]";
}
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/Transactional.java b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/Transactional.java
index 27e4d8d..2d5adce 100644
--- a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/Transactional.java
+++ b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/Transactional.java
@@ -22,4 +22,4 @@ public interface Transactional extends org.apache.jena.sparql.core.Transactional
{
// Placeholder in case we need to add methods specific for DBOE/TDB2
// or before methods migrate to sparql.core.Transactional
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransactionalMonitor.java b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransactionalMonitor.java
index 515ad4b..285d7f4 100644
--- a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransactionalMonitor.java
+++ b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransactionalMonitor.java
@@ -37,4 +37,4 @@ public interface TransactionalMonitor {
default void startEnd() {}
default void finishEnd() {}
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn/IteratorTxnTracker.java b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn/IteratorTxnTracker.java
index 19169f1..b582683 100644
--- a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn/IteratorTxnTracker.java
+++ b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn/IteratorTxnTracker.java
@@ -37,7 +37,7 @@ public class IteratorTxnTracker<T> extends IteratorWrapper<T> {
@Override public boolean hasNext() { check() ; return super.hasNext() ; }
@Override public T next() { check() ; return super.next() ; }
-
+
@Override public void remove() { check() ; super.remove() ; }
private void check() {
@@ -48,4 +48,4 @@ public class IteratorTxnTracker<T> extends IteratorWrapper<T> {
return ;
throw new TransactionException("Iterator used inside a different transaction");
}
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/MonitorOutput.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/MonitorOutput.java
index eb180c1..15641a6 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/MonitorOutput.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/MonitorOutput.java
@@ -22,4 +22,4 @@ package org.apache.jena.tdb2.loader.base;
@FunctionalInterface
public interface MonitorOutput {
public void print(String fmt, Object... args);
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/DataBlock.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/DataBlock.java
index adbe2a1..dc70835 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/DataBlock.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/DataBlock.java
@@ -34,4 +34,4 @@ public class DataBlock {
this.triples = triples;
this.quads = quads;
}
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/InputStage.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/InputStage.java
index 0a2506c..7d8996e 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/InputStage.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/InputStage.java
@@ -36,4 +36,4 @@ enum InputStage {
MULTI ,
PARSE_NODE ,
PARSE_NODE_INDEX
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/LoaderPlan.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/LoaderPlan.java
index a3de152..e335dcd 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/LoaderPlan.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/LoaderPlan.java
@@ -54,4 +54,4 @@ public class LoaderPlan {
public String[] primaryLoad4() { return loadGroup4; }
public String[][] secondaryIndex3() { return secondaryGroups3; }
public String[][] secondaryIndex4() { return secondaryGroups4; }
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/PrefixHandler.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/PrefixHandler.java
index d7df1f1..a89f349 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/PrefixHandler.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/PrefixHandler.java
@@ -22,4 +22,4 @@ import java.util.function.BiConsumer;
/** Name for an functional interface. */
@FunctionalInterface
-public interface PrefixHandler extends BiConsumer<String, String> {}
\ No newline at end of file
+public interface PrefixHandler extends BiConsumer<String, String> {}
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/IteratorCheckNotConcurrent.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/IteratorCheckNotConcurrent.java
index 9fc99b5..70917bd 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/IteratorCheckNotConcurrent.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/IteratorCheckNotConcurrent.java
@@ -90,4 +90,4 @@ class IteratorCheckNotConcurrent<T> implements Iterator<T>, Closeable
finished = true;
Iter.close(iter);
}
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/IteratorTxnTracker.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/IteratorTxnTracker.java
deleted file mode 100644
index fc58433..0000000
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/IteratorTxnTracker.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.tdb2.store;
-
-import java.util.Iterator;
-import java.util.Objects;
-
-import org.apache.jena.atlas.iterator.IteratorWrapper;
-import org.apache.jena.dboe.transaction.txn.Transaction;
-import org.apache.jena.dboe.transaction.txn.TransactionException;
-import org.apache.jena.dboe.transaction.txn.TransactionalSystem;
-import org.apache.jena.dboe.transaction.txn.TxnId;
-
-/** Wrapper to check that an iterator is used inside its originating transaction. */
-public class IteratorTxnTracker<T> extends IteratorWrapper<T> {
- private final TransactionalSystem txnSystem;
- private final TxnId txnId;
-
- public IteratorTxnTracker(Iterator<T> iterator, TransactionalSystem txnSystem, TxnId txnId) {
- super(iterator);
- this.txnSystem = Objects.requireNonNull(txnSystem, "TransactionalSystem");
- this.txnId = Objects.requireNonNull(txnId, "TxnId");
- }
-
- @Override public boolean hasNext() { check(); return super.hasNext() ; }
-
- @Override public T next() { check(); return super.next() ; }
-
- @Override public void remove() { check(); super.remove() ; }
-
- private void check() {
- Transaction txn = txnSystem.getThreadTransaction();
- if ( txn == null )
- throw new TransactionException("Iterator used outside its original transaction");
- if ( txn != null && txnId.equals(txn.getTxnId()) )
- return;
- throw new TransactionException("Iterator used inside a different transaction");
- }
-}
\ No newline at end of file
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdType.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdType.java
index 7e9b1b2..7b5977c 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdType.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdType.java
@@ -257,4 +257,4 @@ public enum NodeIdType {
//if (x == EXTENSION.value ) return EXTENSION;
return INVALID$;
}
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTableTRDF.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTableTRDF.java
index 7be2a3b..7809092 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTableTRDF.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTableTRDF.java
@@ -108,4 +108,4 @@ public class NodeTableTRDF extends NodeTableNative {
public Index getIndex() { return nodeHashToId; }
public BinaryDataFile getData() { return diskFile; }
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/AbstractTestStoreConnectionBasics.java b/jena-db/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/AbstractTestStoreConnectionBasics.java
index fab3e82..a266864 100644
--- a/jena-db/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/AbstractTestStoreConnectionBasics.java
+++ b/jena-db/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/AbstractTestStoreConnectionBasics.java
@@ -183,4 +183,4 @@ public abstract class AbstractTestStoreConnectionBasics
});
}
-}
\ No newline at end of file
+}
diff --git a/jena-db/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/TestVisibilityOfChanges.java b/jena-db/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/TestVisibilityOfChanges.java
index 0ac25c0..47275cb 100644
--- a/jena-db/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/TestVisibilityOfChanges.java
+++ b/jena-db/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/TestVisibilityOfChanges.java
@@ -90,4 +90,4 @@ public class TestVisibilityOfChanges {
fail();
}
}
-}
\ No newline at end of file
+}
diff --git a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilter.java b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilter.java
index 6929542..e7cf0ea 100644
--- a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilter.java
+++ b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilter.java
@@ -76,4 +76,4 @@ public abstract class GraphFilter<X> implements Predicate<Tuple<X>> {
private boolean perGraphTest(X g) {
return graphs.contains(g);
}
-}
\ No newline at end of file
+}
diff --git a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilterTDB1.java b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilterTDB1.java
index 70de136..7ff6d9b 100644
--- a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilterTDB1.java
+++ b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilterTDB1.java
@@ -64,4 +64,4 @@ class GraphFilterTDB1 extends GraphFilter<NodeId> {
});
return new GraphFilterTDB1(x, matchDefaultGraph);
}
-}
\ No newline at end of file
+}
diff --git a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilterTDB2.java b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilterTDB2.java
index bcfcb9f..6ecab6c 100644
--- a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilterTDB2.java
+++ b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilterTDB2.java
@@ -64,4 +64,4 @@ class GraphFilterTDB2 extends GraphFilter<NodeId> {
});
return new GraphFilterTDB2(x, matchDefaultGraph);
}
-}
\ No newline at end of file
+}
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/GSPTarget.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/GSPTarget.java
index 7368e6c..df30e50 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/GSPTarget.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/GSPTarget.java
@@ -102,4 +102,4 @@ final class GSPTarget {
return "default";
return name;
}
-}
\ No newline at end of file
+}
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/UploadDetailsWithName.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/UploadDetailsWithName.java
index 5c0d453..3d60f77 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/UploadDetailsWithName.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/UploadDetailsWithName.java
@@ -21,12 +21,12 @@ package org.apache.jena.fuseki.system;
import org.apache.jena.sparql.core.DatasetGraph;
public class UploadDetailsWithName {
- public final String graphName;
- public final DatasetGraph data;
- public final long count;
- public UploadDetailsWithName(String gn, DatasetGraph dsg, long parserCount) {
- this.graphName = gn;
- this.data = dsg;
- this.count = parserCount;
- }
- }
\ No newline at end of file
+ public final String graphName;
+ public final DatasetGraph data;
+ public final long count;
+ public UploadDetailsWithName(String gn, DatasetGraph dsg, long parserCount) {
+ this.graphName = gn;
+ this.data = dsg;
+ this.count = parserCount;
+ }
+}
diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java
index 4c2302d..f1c6ce7 100644
--- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java
+++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java
@@ -64,527 +64,527 @@ import org.apache.jena.tdb2.DatabaseMgr;
import org.slf4j.Logger;
public class FusekiMain extends CmdARQ {
- private static int defaultPort = 3030;
- private static int defaultHttpsPort = 3043;
-
- private static ArgDecl argMem = new ArgDecl(ArgDecl.NoValue, "mem");
- private static ArgDecl argUpdate = new ArgDecl(ArgDecl.NoValue, "update", "allowUpdate");
- private static ArgDecl argFile = new ArgDecl(ArgDecl.HasValue, "file");
-
- private static ArgDecl argTDB2mode = new ArgDecl(ArgDecl.NoValue, "tdb2");
- private static ArgDecl argMemTDB = new ArgDecl(ArgDecl.NoValue, "memtdb", "memTDB", "tdbmem");
- private static ArgDecl argTDB = new ArgDecl(ArgDecl.HasValue, "loc", "location", "tdb");
-
- // No SPARQL dataset or services
- private static ArgDecl argEmpty = new ArgDecl(ArgDecl.NoValue, "empty", "no-dataset");
- private static ArgDecl argGeneralQuerySvc = new ArgDecl(ArgDecl.HasValue, "general");
-
- private static ArgDecl argPort = new ArgDecl(ArgDecl.HasValue, "port");
- private static ArgDecl argLocalhost = new ArgDecl(ArgDecl.NoValue, "localhost", "local");
- private static ArgDecl argTimeout = new ArgDecl(ArgDecl.HasValue, "timeout");
- private static ArgDecl argConfig = new ArgDecl(ArgDecl.HasValue, "config", "conf");
- private static ArgDecl argGZip = new ArgDecl(ArgDecl.HasValue, "gzip");
- private static ArgDecl argBase = new ArgDecl(ArgDecl.HasValue, "base", "files");
-
- private static ArgDecl argCORS = new ArgDecl(ArgDecl.NoValue, "withCORS", "cors", "CORS");
- private static ArgDecl argWithPing = new ArgDecl(ArgDecl.NoValue, "withPing", "ping");
- private static ArgDecl argWithStats = new ArgDecl(ArgDecl.NoValue, "withStats", "stats");
-
- private static ArgDecl argAuth = new ArgDecl(ArgDecl.HasValue, "auth");
-
- private static ArgDecl argHttps = new ArgDecl(ArgDecl.HasValue, "https");
- private static ArgDecl argHttpsPort = new ArgDecl(ArgDecl.HasValue, "httpsPort", "httpsport", "sport");
-
- private static ArgDecl argPasswdFile = new ArgDecl(ArgDecl.HasValue, "passwd");
- private static ArgDecl argRealm = new ArgDecl(ArgDecl.HasValue, "realm");
-
- // Same as --empty --validators --general=/sparql, --files=ARG
-
- private static ArgDecl argSparqler = new ArgDecl(ArgDecl.HasValue, "sparqler");
-
- private static ArgDecl argValidators = new ArgDecl(ArgDecl.NoValue, "validators");
- // private static ModLocation modLocation = new ModLocation();
- private static ModDatasetAssembler modDataset = new ModDatasetAssembler();
-
- private final ServerConfig serverConfig = new ServerConfig();
- private boolean useTDB2;
-
- /** Build, but do not start, a server based on command line syntax. */
- public static FusekiServer build(String... argv) {
- FusekiMain inner = new FusekiMain(argv);
- inner.process();
- return inner.buildServer();
- }
-
- static void run(String... argv) {
- JenaSystem.init();
- new FusekiMain(argv).mainRun();
- }
-
- protected FusekiMain(String... argv) {
- super(argv);
-
- if ( false )
- // Consider ...
- TransactionManager.QueueBatchSize = TransactionManager.QueueBatchSize / 2;
-
- getUsage().startCategory("Fuseki Main");
- // Control the order!
- add(argMem, "--mem",
- "Create an in-memory, non-persistent dataset for the server");
- add(argFile, "--file=FILE",
- "Create an in-memory, non-persistent dataset for the server, initialised with the contents of the file");
- add(argTDB2mode, "--tdb2",
- "Use TDB2 for command line persistent datasets (dfault is TDB1)");
- add(argTDB, "--loc=DIR",
- "Use an existing TDB database (or create if does not exist)");
- add(argMemTDB, "--memTDB",
- "Create an in-memory, non-persistent dataset using TDB (testing only)");
+ private static int defaultPort = 3030;
+ private static int defaultHttpsPort = 3043;
+
+ private static ArgDecl argMem = new ArgDecl(ArgDecl.NoValue, "mem");
+ private static ArgDecl argUpdate = new ArgDecl(ArgDecl.NoValue, "update", "allowUpdate");
+ private static ArgDecl argFile = new ArgDecl(ArgDecl.HasValue, "file");
+
+ private static ArgDecl argTDB2mode = new ArgDecl(ArgDecl.NoValue, "tdb2");
+ private static ArgDecl argMemTDB = new ArgDecl(ArgDecl.NoValue, "memtdb", "memTDB", "tdbmem");
+ private static ArgDecl argTDB = new ArgDecl(ArgDecl.HasValue, "loc", "location", "tdb");
+
+ // No SPARQL dataset or services
+ private static ArgDecl argEmpty = new ArgDecl(ArgDecl.NoValue, "empty", "no-dataset");
+ private static ArgDecl argGeneralQuerySvc = new ArgDecl(ArgDecl.HasValue, "general");
+
+ private static ArgDecl argPort = new ArgDecl(ArgDecl.HasValue, "port");
+ private static ArgDecl argLocalhost = new ArgDecl(ArgDecl.NoValue, "localhost", "local");
+ private static ArgDecl argTimeout = new ArgDecl(ArgDecl.HasValue, "timeout");
+ private static ArgDecl argConfig = new ArgDecl(ArgDecl.HasValue, "config", "conf");
+ private static ArgDecl argGZip = new ArgDecl(ArgDecl.HasValue, "gzip");
+ private static ArgDecl argBase = new ArgDecl(ArgDecl.HasValue, "base", "files");
+
+ private static ArgDecl argCORS = new ArgDecl(ArgDecl.NoValue, "withCORS", "cors", "CORS");
+ private static ArgDecl argWithPing = new ArgDecl(ArgDecl.NoValue, "withPing", "ping");
+ private static ArgDecl argWithStats = new ArgDecl(ArgDecl.NoValue, "withStats", "stats");
+
+ private static ArgDecl argAuth = new ArgDecl(ArgDecl.HasValue, "auth");
+
+ private static ArgDecl argHttps = new ArgDecl(ArgDecl.HasValue, "https");
+ private static ArgDecl argHttpsPort = new ArgDecl(ArgDecl.HasValue, "httpsPort", "httpsport", "sport");
+
+ private static ArgDecl argPasswdFile = new ArgDecl(ArgDecl.HasValue, "passwd");
+ private static ArgDecl argRealm = new ArgDecl(ArgDecl.HasValue, "realm");
+
+ // Same as --empty --validators --general=/sparql, --files=ARG
+
+ private static ArgDecl argSparqler = new ArgDecl(ArgDecl.HasValue, "sparqler");
+
+ private static ArgDecl argValidators = new ArgDecl(ArgDecl.NoValue, "validators");
+ // private static ModLocation modLocation = new ModLocation();
+ private static ModDatasetAssembler modDataset = new ModDatasetAssembler();
+
+ private final ServerConfig serverConfig = new ServerConfig();
+ private boolean useTDB2;
+
+ /** Build, but do not start, a server based on command line syntax. */
+ public static FusekiServer build(String... argv) {
+ FusekiMain inner = new FusekiMain(argv);
+ inner.process();
+ return inner.buildServer();
+ }
+
+ static void run(String... argv) {
+ JenaSystem.init();
+ new FusekiMain(argv).mainRun();
+ }
+
+ protected FusekiMain(String... argv) {
+ super(argv);
+
+ if ( false )
+ // Consider ...
+ TransactionManager.QueueBatchSize = TransactionManager.QueueBatchSize / 2;
+
+ getUsage().startCategory("Fuseki Main");
+ // Control the order!
+ add(argMem, "--mem",
+ "Create an in-memory, non-persistent dataset for the server");
+ add(argFile, "--file=FILE",
+ "Create an in-memory, non-persistent dataset for the server, initialised with the contents of the file");
+ add(argTDB2mode, "--tdb2",
+ "Use TDB2 for command line persistent datasets (dfault is TDB1)");
+ add(argTDB, "--loc=DIR",
+ "Use an existing TDB database (or create if does not exist)");
+ add(argMemTDB, "--memTDB",
+ "Create an in-memory, non-persistent dataset using TDB (testing only)");
// add(argEmpty, "--empty",
// "Run with no datasets and services (validators only)");
- add(argConfig, "--config=",
- "Use a configuration file to determine the services");
- addModule(modDataset);
- add(argEmpty); // Hidden for now.
- add(argPort, "--port",
- "Listen on this port number");
- add(argLocalhost, "--localhost",
- "Listen only on the localhost interface");
- add(argTimeout, "--timeout=",
- "Global timeout applied to queries (value in ms) -- format is X[,Y] ");
- add(argUpdate, "--update",
- "Allow updates (via SPARQL Update and SPARQL HTTP Update)");
- add(argGZip, "--gzip=on|off",
- "Enable GZip compression (HTTP Accept-Encoding) if request header set");
- add(argBase, "--base=DIR",
- "Directory for static content");
- add(argSparqler, "--sparqler=DIR",
- "Run with SPARQLer services Directory for static content");
- add(argValidators, "--validators", "Install validators");
- add(argGeneralQuerySvc, "--general=PATH", "Add a general SPARQL endpoint (without a dataset) at /PATH");
-
- add(argAuth, "--auth=[basic|Digest]", "Run the server using basic or digest authentication (dft: digest).");
- add(argHttps, "--https=CONF", "https certificate access details. JSON file { \"cert\":FILE , \"passwd\"; SECRET } ");
- add(argHttpsPort, "--httpsPort=NUM", "https port (default port is 3043)");
-
- add(argPasswdFile, "--passwd=FILE", "Password file");
- add(argCORS, "--cors", "Enable CORS");
- // put in the configuration file
+ add(argConfig, "--config=",
+ "Use a configuration file to determine the services");
+ addModule(modDataset);
+ add(argEmpty); // Hidden for now.
+ add(argPort, "--port",
+ "Listen on this port number");
+ add(argLocalhost, "--localhost",
+ "Listen only on the localhost interface");
+ add(argTimeout, "--timeout=",
+ "Global timeout applied to queries (value in ms) -- format is X[,Y] ");
+ add(argUpdate, "--update",
+ "Allow updates (via SPARQL Update and SPARQL HTTP Update)");
+ add(argGZip, "--gzip=on|off",
+ "Enable GZip compression (HTTP Accept-Encoding) if request header set");
+ add(argBase, "--base=DIR",
+ "Directory for static content");
+ add(argSparqler, "--sparqler=DIR",
+ "Run with SPARQLer services Directory for static content");
+ add(argValidators, "--validators", "Install validators");
+ add(argGeneralQuerySvc, "--general=PATH", "Add a general SPARQL endpoint (without a dataset) at /PATH");
+
+ add(argAuth, "--auth=[basic|Digest]", "Run the server using basic or digest authentication (dft: digest).");
+ add(argHttps, "--https=CONF", "https certificate access details. JSON file { \"cert\":FILE , \"passwd\"; SECRET } ");
+ add(argHttpsPort, "--httpsPort=NUM", "https port (default port is 3043)");
+
+ add(argPasswdFile, "--passwd=FILE", "Password file");
+ add(argCORS, "--cors", "Enable CORS");
+ // put in the configuration file
// add(argRealm, "--realm=REALM", "Realm name");
- add(argWithPing, "--ping", "Enable /$/ping");
- add(argWithStats, "--stats", "Enable /$/stats");
-
- super.modVersion.addClass(Fuseki.class);
+ add(argWithPing, "--ping", "Enable /$/ping");
+ add(argWithStats, "--stats", "Enable /$/stats");
+
+ super.modVersion.addClass(Fuseki.class);
+ }
+
+ static String argUsage = "[--config=FILE] [--mem|--desc=AssemblerFile|--file=FILE] [--port PORT] /DatasetPathName";
+
+ @Override
+ protected String getSummary() {
+ return getCommandName() + " " + argUsage;
+ }
+
+ @Override
+ protected void processModulesAndArgs() {
+ serverConfig.verboseLogging = super.isVerbose();
+
+ boolean allowEmpty = contains(argEmpty) || contains(argSparqler);
+
+ // ---- Checking consistency
+ int numDefinitions = 0;
+
+ if ( contains(argMem) )
+ numDefinitions++;
+ if ( contains(argFile) )
+ numDefinitions++;
+ if ( contains(ModAssembler.assemblerDescDecl) )
+ numDefinitions++;
+ if ( contains(argTDB) )
+ numDefinitions++;
+ if ( contains(argMemTDB) )
+ numDefinitions++;
+ if ( contains(argConfig) )
+ numDefinitions++;
+
+ if ( numDefinitions == 0 && ! allowEmpty )
+ throw new CmdException("No dataset specified on the command line.");
+
+ if ( numDefinitions > 1 )
+ throw new CmdException("Multiple ways providing a dataset. Only one of --mem, --file, --loc or --conf");
+
+ if ( numDefinitions > 0 && allowEmpty )
+ throw new CmdException("Dataset provided but 'no dataset' flag given");
+
+ //---- check: Invalid: --conf + service name.
+ if ( contains(argConfig) ) {
+ if ( getPositional().size() != 0 )
+ throw new CmdException("Can't have both a configutation file and a service name");
+ } else if ( ! allowEmpty ) {
+ if ( getPositional().size() == 0 )
+ throw new CmdException("Missing service name");
+ if ( getPositional().size() > 1 )
+ throw new CmdException("Multiple dataset path names given");
+ serverConfig.datasetPath = DataAccessPoint.canonical(getPositionalArg(0));
}
- static String argUsage = "[--config=FILE] [--mem|--desc=AssemblerFile|--file=FILE] [--port PORT] /DatasetPathName";
+ serverConfig.datasetDescription = "<unset>";
- @Override
- protected String getSummary() {
- return getCommandName() + " " + argUsage;
- }
+ // ---- check: Invalid: --update + --conf
+ if ( contains(argUpdate) && contains(argConfig) )
+ throw new CmdException("--update and a configuration file does not make sense (control using the configuration file only)");
+ boolean allowUpdate = contains(argUpdate);
+ serverConfig.allowUpdate = allowUpdate;
- @Override
- protected void processModulesAndArgs() {
- serverConfig.verboseLogging = super.isVerbose();
-
- boolean allowEmpty = contains(argEmpty) || contains(argSparqler);
-
- // ---- Checking consistency
- int numDefinitions = 0;
-
- if ( contains(argMem) )
- numDefinitions++;
- if ( contains(argFile) )
- numDefinitions++;
- if ( contains(ModAssembler.assemblerDescDecl) )
- numDefinitions++;
- if ( contains(argTDB) )
- numDefinitions++;
- if ( contains(argMemTDB) )
- numDefinitions++;
- if ( contains(argConfig) )
- numDefinitions++;
-
- if ( numDefinitions == 0 && ! allowEmpty )
- throw new CmdException("No dataset specified on the command line.");
-
- if ( numDefinitions > 1 )
- throw new CmdException("Multiple ways providing a dataset. Only one of --mem, --file, --loc or --conf");
-
- if ( numDefinitions > 0 && allowEmpty )
- throw new CmdException("Dataset provided but 'no dataset' flag given");
-
- //---- check: Invalid: --conf + service name.
- if ( contains(argConfig) ) {
- if ( getPositional().size() != 0 )
- throw new CmdException("Can't have both a configutation file and a service name");
- } else if ( ! allowEmpty ) {
- if ( getPositional().size() == 0 )
- throw new CmdException("Missing service name");
- if ( getPositional().size() > 1 )
- throw new CmdException("Multiple dataset path names given");
- serverConfig.datasetPath = DataAccessPoint.canonical(getPositionalArg(0));
- }
+ // ---- Port
+ serverConfig.port = defaultPort;
- serverConfig.datasetDescription = "<unset>";
+ if ( contains(argPort) )
+ serverConfig.port = portNumber(argPort);
- // ---- check: Invalid: --update + --conf
- if ( contains(argUpdate) && contains(argConfig) )
- throw new CmdException("--update and a configuration file does not make sense (control using the configuration file only)");
- boolean allowUpdate = contains(argUpdate);
- serverConfig.allowUpdate = allowUpdate;
+ if ( contains(argLocalhost) )
+ serverConfig.loopback = true;
- // ---- Port
- serverConfig.port = defaultPort;
+ // ---- Dataset
+ // Only one of these is choose from the checking above.
- if ( contains(argPort) )
- serverConfig.port = portNumber(argPort);
+ // Which TDB to use to create a command line TDB database.
+ useTDB2 = contains(argTDB2mode);
+ String tag = useTDB2 ? "TDB2" : "TDB";
- if ( contains(argLocalhost) )
- serverConfig.loopback = true;
-
- // ---- Dataset
- // Only one of these is choose from the checking above.
-
- // Which TDB to use to create a command line TDB database.
- useTDB2 = contains(argTDB2mode);
- String tag = useTDB2 ? "TDB2" : "TDB";
-
- if ( allowEmpty ) {
- serverConfig.empty = true;
- serverConfig.datasetDescription = "No dataset";
- }
+ if ( allowEmpty ) {
+ serverConfig.empty = true;
+ serverConfig.datasetDescription = "No dataset";
+ }
- // Fuseki config file
- if ( contains(argConfig) ) {
- String file = getValue(argConfig);
- if ( file.startsWith("file:") )
- file = file.substring("file:".length());
-
- Path path = Paths.get(file);
- if ( ! Files.exists(path) )
- throw new CmdException("File not found: "+file);
- if ( Files.isDirectory(path) )
- throw new CmdException("Is a directory: "+file);
- serverConfig.datasetDescription = "Configuration: "+path.toAbsolutePath();
- serverConfig.serverConfig = getValue(argConfig);
- }
+ // Fuseki config file
+ if ( contains(argConfig) ) {
+ String file = getValue(argConfig);
+ if ( file.startsWith("file:") )
+ file = file.substring("file:".length());
+
+ Path path = Paths.get(file);
+ if ( ! Files.exists(path) )
+ throw new CmdException("File not found: "+file);
+ if ( Files.isDirectory(path) )
+ throw new CmdException("Is a directory: "+file);
+ serverConfig.datasetDescription = "Configuration: "+path.toAbsolutePath();
+ serverConfig.serverConfig = getValue(argConfig);
+ }
- // Ways to setup a dataset.
- if ( contains(argMem) ) {
- serverConfig.datasetDescription = "in-memory";
- // Only one setup should be called by the test above but to be safe
- // and in case of future changes, clear the configuration.
- serverConfig.dsg = DatasetGraphFactory.createTxnMem();
- // Always allow, else you can't do very much!
- serverConfig.allowUpdate = true;
- }
+ // Ways to setup a dataset.
+ if ( contains(argMem) ) {
+ serverConfig.datasetDescription = "in-memory";
+ // Only one setup should be called by the test above but to be safe
+ // and in case of future changes, clear the configuration.
+ serverConfig.dsg = DatasetGraphFactory.createTxnMem();
+ // Always allow, else you can't do very much!
+ serverConfig.allowUpdate = true;
+ }
- if ( contains(argFile) ) {
- String filename = getValue(argFile);
- String pathname = filename;
- if ( filename.startsWith("file:") )
- pathname = filename.substring("file:".length());
-
- serverConfig.datasetDescription = "file:"+filename;
- if ( !FileOps.exists(pathname) )
- throw new CmdException("File not found: " + filename);
- serverConfig.dsg = DatasetGraphFactory.createTxnMem();
-
- // INITIAL DATA.
- Lang language = RDFLanguages.filenameToLang(filename);
- if ( language == null )
- throw new CmdException("Can't guess language for file: " + filename);
- Txn.executeWrite(serverConfig.dsg, ()->RDFDataMgr.read(serverConfig.dsg, filename));
- }
+ if ( contains(argFile) ) {
+ String filename = getValue(argFile);
+ String pathname = filename;
+ if ( filename.startsWith("file:") )
+ pathname = filename.substring("file:".length());
+
+ serverConfig.datasetDescription = "file:"+filename;
+ if ( !FileOps.exists(pathname) )
+ throw new CmdException("File not found: " + filename);
+ serverConfig.dsg = DatasetGraphFactory.createTxnMem();
+
+ // INITIAL DATA.
+ Lang language = RDFLanguages.filenameToLang(filename);
+ if ( language == null )
+ throw new CmdException("Can't guess language for file: " + filename);
+ Txn.executeWrite(serverConfig.dsg, ()->RDFDataMgr.read(serverConfig.dsg, filename));
+ }
- if ( contains(argMemTDB) ) {
- serverConfig.datasetDescription = tag+" dataset in-memory";
- serverConfig.dsg =
- useTDB2
- ? DatabaseMgr.createDatasetGraph()
+ if ( contains(argMemTDB) ) {
+ serverConfig.datasetDescription = tag+" dataset in-memory";
+ serverConfig.dsg =
+ useTDB2
+ ? DatabaseMgr.createDatasetGraph()
: TDBFactory.createDatasetGraph();
serverConfig.allowUpdate = true;
- }
+ }
- if ( contains(argTDB) ) {
- String dir = getValue(argTDB);
- serverConfig.datasetDescription = tag+" dataset: "+dir;
- serverConfig.dsg =
- useTDB2
- ? DatabaseMgr.connectDatasetGraph(dir)
+ if ( contains(argTDB) ) {
+ String dir = getValue(argTDB);
+ serverConfig.datasetDescription = tag+" dataset: "+dir;
+ serverConfig.dsg =
+ useTDB2
+ ? DatabaseMgr.connectDatasetGraph(dir)
: TDBFactory.createDatasetGraph(dir);
- }
+ }
- if ( contains(ModAssembler.assemblerDescDecl) ) {
- serverConfig.datasetDescription = "Assembler: "+ getValue(ModAssembler.assemblerDescDecl);
- // Need to add service details.
- Dataset ds = modDataset.createDataset();
- serverConfig.dsg = ds.asDatasetGraph();
- }
+ if ( contains(ModAssembler.assemblerDescDecl) ) {
+ serverConfig.datasetDescription = "Assembler: "+ getValue(ModAssembler.assemblerDescDecl);
+ // Need to add service details.
+ Dataset ds = modDataset.createDataset();
+ serverConfig.dsg = ds.asDatasetGraph();
+ }
- // ---- Misc features.
- if ( contains(argTimeout) ) {
- String str = getValue(argTimeout);
- ARQ.getContext().set(ARQ.queryTimeout, str);
- }
+ // ---- Misc features.
+ if ( contains(argTimeout) ) {
+ String str = getValue(argTimeout);
+ ARQ.getContext().set(ARQ.queryTimeout, str);
+ }
- if ( contains(argSparqler) ) {
- String filebase = getValue(argSparqler);
- if ( ! FileOps.exists(filebase) )
- throw new CmdException("File area not found: "+filebase);
- serverConfig.contentDirectory = filebase;
- serverConfig.addGeneral = "/sparql";
- serverConfig.empty = true;
- serverConfig.validators = true;
- }
+ if ( contains(argSparqler) ) {
+ String filebase = getValue(argSparqler);
+ if ( ! FileOps.exists(filebase) )
+ throw new CmdException("File area not found: "+filebase);
+ serverConfig.contentDirectory = filebase;
+ serverConfig.addGeneral = "/sparql";
+ serverConfig.empty = true;
+ serverConfig.validators = true;
+ }
- if ( contains(argGeneralQuerySvc) ) {
- String z = getValue(argGeneralQuerySvc);
- if ( ! z.startsWith("/") )
- z = "/"+z;
- serverConfig.addGeneral = z;
- }
+ if ( contains(argGeneralQuerySvc) ) {
+ String z = getValue(argGeneralQuerySvc);
+ if ( ! z.startsWith("/") )
+ z = "/"+z;
+ serverConfig.addGeneral = z;
+ }
- if ( contains(argValidators) ) {
- serverConfig.validators = true;
- }
+ if ( contains(argValidators) ) {
+ serverConfig.validators = true;
+ }
- if ( contains(argBase) ) {
- // Static files.
- String filebase = getValue(argBase);
- if ( ! FileOps.exists(filebase) ) {
- throw new CmdException("File area not found: "+filebase);
- //FmtLog.warn(Fuseki.configLog, "File area not found: "+filebase);
- }
- serverConfig.contentDirectory = filebase;
+ if ( contains(argBase) ) {
+ // Static files.
+ String filebase = getValue(argBase);
+ if ( ! FileOps.exists(filebase) ) {
+ throw new CmdException("File area not found: "+filebase);
+ //FmtLog.warn(Fuseki.configLog, "File area not found: "+filebase);
}
+ serverConfig.contentDirectory = filebase;
+ }
- if ( contains(argPasswdFile) )
- serverConfig.passwdFile = getValue(argPasswdFile);
+ if ( contains(argPasswdFile) )
+ serverConfig.passwdFile = getValue(argPasswdFile);
- if ( contains(argRealm) )
- serverConfig.realm = getValue(argRealm);
+ if ( contains(argRealm) )
+ serverConfig.realm = getValue(argRealm);
- if ( contains(argHttpsPort) && ! contains(argHttps) )
- throw new CmdException("https port given but not certificate dtails via --"+argHttps.getKeyName());
+ if ( contains(argHttpsPort) && ! contains(argHttps) )
+ throw new CmdException("https port given but not certificate dtails via --"+argHttps.getKeyName());
- if ( contains(argHttps) ) {
- serverConfig.httpsPort = defaultHttpsPort;
- if ( contains(argHttpsPort) )
- serverConfig.httpsPort = portNumber(argHttpsPort);
- String httpsSetup = getValue(argHttps);
- // The details go in a separate file that can be secured.
- JsonObject httpsConf = JSON.read(httpsSetup);
- Path path = Paths.get(httpsSetup).toAbsolutePath();
- String keystore = httpsConf.get("keystore").getAsString().value();
- // Resolve relative to the https setup file.
- serverConfig.httpsKeystore = path.getParent().resolve(keystore).toString();
+ if ( contains(argHttps) ) {
+ serverConfig.httpsPort = defaultHttpsPort;
+ if ( contains(argHttpsPort) )
+ serverConfig.httpsPort = portNumber(argHttpsPort);
+ String httpsSetup = getValue(argHttps);
+ // The details go in a separate file that can be secured.
+ JsonObject httpsConf = JSON.read(httpsSetup);
+ Path path = Paths.get(httpsSetup).toAbsolutePath();
+ String keystore = httpsConf.get("keystore").getAsString().value();
+ // Resolve relative to the https setup file.
+ serverConfig.httpsKeystore = path.getParent().resolve(keystore).toString();
- serverConfig.httpsKeystorePasswd = httpsConf.get("passwd").getAsString().value();
- }
+ serverConfig.httpsKeystorePasswd = httpsConf.get("passwd").getAsString().value();
+ }
- if ( contains(argAuth) ) {
- String schemeStr = getValue(argAuth);
- serverConfig.authScheme = AuthScheme.scheme(schemeStr);
- }
+ if ( contains(argAuth) ) {
+ String schemeStr = getValue(argAuth);
+ serverConfig.authScheme = AuthScheme.scheme(schemeStr);
+ }
- serverConfig.withCORS = contains(argCORS);
- serverConfig.withPing = contains(argWithPing);
- serverConfig.withStats = contains(argWithStats);
+ serverConfig.withCORS = contains(argCORS);
+ serverConfig.withPing = contains(argWithPing);
+ serverConfig.withStats = contains(argWithStats);
// if ( contains(argGZip) ) {
// if ( !hasValueOfTrue(argGZip) && !hasValueOfFalse(argGZip) )
// throw new CmdException(argGZip.getNames().get(0) + ": Not understood: " + getValue(argGZip));
// jettyServerConfig.enableCompression = super.hasValueOfTrue(argGZip);
// }
+ }
+
+ private int portNumber(ArgDecl arg) {
+ String portStr = getValue(arg);
+ try {
+ int port = Integer.parseInt(portStr);
+ return port;
+ } catch (NumberFormatException ex) {
+ throw new CmdException(argPort.getKeyName() + " : bad port number: " + portStr);
}
- private int portNumber(ArgDecl arg) {
- String portStr = getValue(arg);
- try {
- int port = Integer.parseInt(portStr);
- return port;
- } catch (NumberFormatException ex) {
- throw new CmdException(argPort.getKeyName() + " : bad port number: " + portStr);
- }
-
- }
+ }
- @Override
- protected void exec() {
+ @Override
+ protected void exec() {
+ try {
+ FusekiServer server = buildServer(serverConfig);
+ info(server);
try {
- FusekiServer server = buildServer(serverConfig);
- info(server);
- try {
- server.start();
- } catch (FusekiException ex) {
- if ( ex.getCause() instanceof BindException ) {
- Fuseki.serverLog.error("Failed to start server: "+ex.getCause().getMessage()+ ": port="+serverConfig.port);
- System.exit(1);
- }
- throw ex;
- } catch (Exception ex) {
- throw new FusekiException("Failed to start server: " + ex.getMessage(), ex);
+ server.start();
+ } catch (FusekiException ex) {
+ if ( ex.getCause() instanceof BindException ) {
+ Fuseki.serverLog.error("Failed to start server: "+ex.getCause().getMessage()+ ": port="+serverConfig.port);
+ System.exit(1);
}
- server.join();
- System.exit(0);
- }
- catch (AssemblerException ex) {
- if ( ex.getCause() != null )
- System.err.println(ex.getCause().getMessage());
- else
- System.err.println(ex.getMessage());
+ throw ex;
+ } catch (Exception ex) {
+ throw new FusekiException("Failed to start server: " + ex.getMessage(), ex);
}
+ server.join();
+ System.exit(0);
}
-
- private FusekiServer buildServer() {
- return buildServer(serverConfig);
+ catch (AssemblerException ex) {
+ if ( ex.getCause() != null )
+ System.err.println(ex.getCause().getMessage());
+ else
+ System.err.println(ex.getMessage());
}
-
- // ServerConfig -> Setup the builder.
- private FusekiServer buildServer(ServerConfig serverConfig) {
- FusekiServer.Builder builder = builder();
- return buildServer(builder, serverConfig);
+ }
+
+ private FusekiServer buildServer() {
+ return buildServer(serverConfig);
+ }
+
+ // ServerConfig -> Setup the builder.
+ private FusekiServer buildServer(ServerConfig serverConfig) {
+ FusekiServer.Builder builder = builder();
+ return buildServer(builder, serverConfig);
+ }
+
+ protected FusekiServer.Builder builder() {
+ return FusekiServer.create();
+ }
+
+ private static FusekiServer buildServer(FusekiServer.Builder builder, ServerConfig serverConfig) {
+ builder.port(serverConfig.port);
+ builder.loopback(serverConfig.loopback);
+ builder.verbose(serverConfig.verboseLogging);
+
+ if ( serverConfig.addGeneral != null )
+ // Add SPARQL_QueryGeneral as a general servlet, not reached by the service router.
+ builder.addServlet(serverConfig.addGeneral, new SPARQL_QueryGeneral());
+
+ if ( serverConfig.validators ) {
+ // Validators.
+ builder.addServlet("/validate/query", new QueryValidator());
+ builder.addServlet("/validate/update", new UpdateValidator());
+ builder.addServlet("/validate/iri", new IRIValidator());
+ builder.addServlet("/validate/data", new DataValidator());
}
- protected FusekiServer.Builder builder() {
- return FusekiServer.create();
+ if ( ! serverConfig.empty ) {
+ if ( serverConfig.serverConfig != null )
+ // Config file.
+ builder.parseConfigFile(serverConfig.serverConfig);
+ else
+ // One dataset.
+ builder.add(serverConfig.datasetPath, serverConfig.dsg, serverConfig.allowUpdate);
}
- private static FusekiServer buildServer(FusekiServer.Builder builder, ServerConfig serverConfig) {
- builder.port(serverConfig.port);
- builder.loopback(serverConfig.loopback);
- builder.verbose(serverConfig.verboseLogging);
-
- if ( serverConfig.addGeneral != null )
- // Add SPARQL_QueryGeneral as a general servlet, not reached by the service router.
- builder.addServlet(serverConfig.addGeneral, new SPARQL_QueryGeneral());
-
- if ( serverConfig.validators ) {
- // Validators.
- builder.addServlet("/validate/query", new QueryValidator());
- builder.addServlet("/validate/update", new UpdateValidator());
- builder.addServlet("/validate/iri", new IRIValidator());
- builder.addServlet("/validate/data", new DataValidator());
- }
-
- if ( ! serverConfig.empty ) {
- if ( serverConfig.serverConfig != null )
- // Config file.
- builder.parseConfigFile(serverConfig.serverConfig);
- else
- // One dataset.
- builder.add(serverConfig.datasetPath, serverConfig.dsg, serverConfig.allowUpdate);
- }
-
- if ( serverConfig.contentDirectory != null )
- builder.staticFileBase(serverConfig.contentDirectory);
-
- if ( serverConfig.passwdFile != null )
- builder.passwordFile(serverConfig.passwdFile);
+ if ( serverConfig.contentDirectory != null )
+ builder.staticFileBase(serverConfig.contentDirectory);
- if ( serverConfig.realm != null )
- builder.realm(serverConfig.realm);
+ if ( serverConfig.passwdFile != null )
+ builder.passwordFile(serverConfig.passwdFile);
- if ( serverConfig.httpsKeystore != null )
- builder.https(serverConfig.httpsPort, serverConfig.httpsKeystore, serverConfig.httpsKeystorePasswd);
+ if ( serverConfig.realm != null )
+ builder.realm(serverConfig.realm);
- if ( serverConfig.authScheme != null )
- builder.auth(serverConfig.authScheme);
+ if ( serverConfig.httpsKeystore != null )
+ builder.https(serverConfig.httpsPort, serverConfig.httpsKeystore, serverConfig.httpsKeystorePasswd);
- if ( serverConfig.withCORS )
- builder.enableCors(true);
+ if ( serverConfig.authScheme != null )
+ builder.auth(serverConfig.authScheme);
- if ( serverConfig.withPing )
- builder.enablePing(true);
+ if ( serverConfig.withCORS )
+ builder.enableCors(true);
- if ( serverConfig.withStats )
- builder.enableStats(true);
+ if ( serverConfig.withPing )
+ builder.enablePing(true);
- return builder.build();
- }
-
- private void info(FusekiServer server) {
- if ( super.isQuiet() )
- return;
+ if ( serverConfig.withStats )
+ builder.enableStats(true);
- Logger log = Fuseki.serverLog;
+ return builder.build();
+ }
- String version = Fuseki.VERSION;
- String buildDate = Fuseki.BUILD_DATE;
+ private void info(FusekiServer server) {
+ if ( super.isQuiet() )
+ return;
- if ( version != null && version.equals("${project.version}") )
- version = null;
- if ( buildDate != null && buildDate.equals("${build.time.xsd}") )
- buildDate = DateTimeUtils.nowAsXSDDateTimeString();
+ Logger log = Fuseki.serverLog;
- String name = Fuseki.NAME;
- //name = name +" (basic server)";
+ String version = Fuseki.VERSION;
+ String buildDate = Fuseki.BUILD_DATE;
- if ( version != null ) {
- if ( Fuseki.developmentMode && buildDate != null )
- FmtLog.info(log, "%s %s %s", name, version, buildDate);
- else
- FmtLog.info(log, "%s %s", name, version);
- }
+ if ( version != null && version.equals("${project.version}") )
+ version = null;
+ if ( buildDate != null && buildDate.equals("${build.time.xsd}") )
+ buildDate = DateTimeUtils.nowAsXSDDateTimeString();
- // Dataset -> Endpoints
- Map<String, List<String>> mapDatasetEndpoints = description(DataAccessPointRegistry.get(server.getServletContext()));
-
- if ( serverConfig.empty ) {
- FmtLog.info(log, "No SPARQL datasets services");
- } else {
- if ( serverConfig.datasetPath == null && serverConfig.serverConfig == null )
- log.error("No dataset path nor server configuration file");
- }
+ String name = Fuseki.NAME;
+ //name = name +" (basic server)";
- if ( serverConfig.datasetPath != null ) {
- if ( mapDatasetEndpoints.size() != 1 )
- log.error("Expected only one dataset");
- List<String> endpoints = mapDatasetEndpoints.get(serverConfig.datasetPath);
- FmtLog.info(log, "Dataset Type = %s", serverConfig.datasetDescription);
- FmtLog.info(log, "Path = %s; Services = %s", serverConfig.datasetPath, endpoints);
- }
- if ( serverConfig.serverConfig != null ) {
- // May be many datasets and services.
- FmtLog.info(log, "Configuration file %s", serverConfig.serverConfig);
- mapDatasetEndpoints.forEach((path, endpoints)->{
- FmtLog.info(log, "Path = %s; Services = %s", path, endpoints);
- });
- }
+ if ( version != null ) {
+ if ( Fuseki.developmentMode && buildDate != null )
+ FmtLog.info(log, "%s %s %s", name, version, buildDate);
+ else
+ FmtLog.info(log, "%s %s", name, version);
+ }
- if ( serverConfig.contentDirectory != null )
- FmtLog.info(log, "Static files = %s", serverConfig.contentDirectory);
+ // Dataset -> Endpoints
+ Map<String, List<String>> mapDatasetEndpoints = description(DataAccessPointRegistry.get(server.getServletContext()));
- if ( super.isVerbose() )
- PlatformInfo.logDetailsVerbose(log);
- else if ( !super.isQuiet() )
- PlatformInfo.logDetails(log);
+ if ( serverConfig.empty ) {
+ FmtLog.info(log, "No SPARQL datasets services");
+ } else {
+ if ( serverConfig.datasetPath == null && serverConfig.serverConfig == null )
+ log.error("No dataset path nor server configuration file");
}
- private static Map<String, List<String>> description(DataAccessPointRegistry reg) {
- Map<String, List<String>> desc = new LinkedHashMap<>();
- reg.forEach((ds,dap)->{
- List<String> endpoints = new ArrayList<>();
- desc.put(ds, endpoints);
- DataService dSrv = dap.getDataService();
- dSrv.getOperations().forEach((op)->{
- dSrv.getEndpoints(op).forEach(ep-> {
- String x = ep.getName();
- x = "\""+x+"\"";
- String opName = ep.getOperation().getName();
- String str = x+"=>"+opName;
- endpoints.add(str);
- });
- });
+ if ( serverConfig.datasetPath != null ) {
+ if ( mapDatasetEndpoints.size() != 1 )
+ log.error("Expected only one dataset");
+ List<String> endpoints = mapDatasetEndpoints.get(serverConfig.datasetPath);
+ FmtLog.info(log, "Dataset Type = %s", serverConfig.datasetDescription);
+ FmtLog.info(log, "Path = %s; Services = %s", serverConfig.datasetPath, endpoints);
+ }
+ if ( serverConfig.serverConfig != null ) {
+ // May be many datasets and services.
+ FmtLog.info(log, "Configuration file %s", serverConfig.serverConfig);
+ mapDatasetEndpoints.forEach((path, endpoints)->{
+ FmtLog.info(log, "Path = %s; Services = %s", path, endpoints);
});
- return desc;
}
- @Override
- protected String getCommandName() {
- return "fuseki";
- }
- }
\ No newline at end of file
+ if ( serverConfig.contentDirectory != null )
+ FmtLog.info(log, "Static files = %s", serverConfig.contentDirectory);
+
+ if ( super.isVerbose() )
+ PlatformInfo.logDetailsVerbose(log);
+ else if ( !super.isQuiet() )
+ PlatformInfo.logDetails(log);
+ }
+
+ private static Map<String, List<String>> description(DataAccessPointRegistry reg) {
+ Map<String, List<String>> desc = new LinkedHashMap<>();
+ reg.forEach((ds,dap)->{
+ List<String> endpoints = new ArrayList<>();
+ desc.put(ds, endpoints);
+ DataService dSrv = dap.getDataService();
+ dSrv.getOperations().forEach((op)->{
+ dSrv.getEndpoints(op).forEach(ep-> {
+ String x = ep.getName();
+ x = "\""+x+"\"";
+ String opName = ep.getOperation().getName();
+ String str = x+"=>"+opName;
+ endpoints.add(str);
+ });
+ });
+ });
+ return desc;
+ }
+
+ @Override
+ protected String getCommandName() {
+ return "fuseki";
+ }
+}
diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/ServerConfig.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/ServerConfig.java
index 5cf11bb..067314f 100644
--- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/ServerConfig.java
+++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/ServerConfig.java
@@ -65,4 +65,4 @@ class ServerConfig {
public int httpsPort = -1;
public String httpsKeystore = null;
public String httpsKeystorePasswd = null;
-}
\ No newline at end of file
+}
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
index f29819e..ebaf507 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
@@ -104,7 +104,7 @@ public class FusekiCmd {
new FusekiCmdInner(argv).mainRun();
}
- private JettyServerConfig jettyServerConfig = new JettyServerConfig();
+ private JettyServerConfig jettyServerConfig = new JettyServerConfig();
{
jettyServerConfig.port = 3030;
jettyServerConfig.contextPath = "/";
@@ -372,6 +372,4 @@ public class FusekiCmd {
JettyFusekiWebapp.instance.start();
JettyFusekiWebapp.instance.join();
}
-
-
-}
\ No newline at end of file
+}
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TS_FusekiWebapp.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TS_FusekiWebapp.java
index 5ba5477..9b12e79 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TS_FusekiWebapp.java
+++ b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TS_FusekiWebapp.java
@@ -51,7 +51,7 @@ public class TS_FusekiWebapp extends ServerTest
{
public static final String FusekiTestHome = "target/FusekiHome";
public static final String FusekiTestBase = FusekiTestHome+"/run";
-
+
@BeforeClass public static void setupForFusekiServer() {
FileOps.ensureDir(FusekiTestHome);
FileOps.clearAll(FusekiTestHome);
@@ -79,4 +79,4 @@ public class TS_FusekiWebapp extends ServerTest
static public void afterSuiteClass() {
ServerCtl.ctlAfterTestSuite();
}
-}
\ No newline at end of file
+}
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java
index 25a259c..27a44d1 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java
+++ b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java
@@ -130,4 +130,4 @@ public class TestDatasetOps extends AbstractFusekiTest {
assertTrue(HttpSC.isClientError(ex.getStatusCode()));
}
}
-}
\ No newline at end of file
+}
diff --git a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/JenaConnectionException.java b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/JenaConnectionException.java
index 3bc6296..9a412f2 100644
--- a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/JenaConnectionException.java
+++ b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/JenaConnectionException.java
@@ -20,10 +20,10 @@ package org.apache.jena.rdfconnection;
import org.apache.jena.shared.JenaException ;
-/** Exceptions related to {@link RDFConnection} */
+/** Exceptions related to {@link RDFConnection} */
public class JenaConnectionException extends JenaException {
public JenaConnectionException() { super(); }
public JenaConnectionException(String message) { super(message); }
public JenaConnectionException(Throwable cause) { super(cause) ; }
public JenaConnectionException(String message, Throwable cause) { super(message, cause) ; }
-}
\ No newline at end of file
+}
diff --git a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/LibRDFConn.java b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/LibRDFConn.java
index 69d5b79..b4a9b42 100644
--- a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/LibRDFConn.java
+++ b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/LibRDFConn.java
@@ -21,24 +21,24 @@ package org.apache.jena.rdfconnection;
/** package-wide utilities etc */
/*package*/ class LibRDFConn {
private static String dftName = "default" ;
-
+
/*package*/ static boolean isDefault(String name) {
return name == null || name.equals(dftName) ;
}
-
+
private static String queryStringForGraph(String ch, String graphName) {
- return
- ch +
+ return
+ ch +
(LibRDFConn.isDefault(graphName)
? "default"
: "graph="+graphName) ;
}
-
+
/*package*/ static String urlForGraph(String graphStoreProtocolService, String graphName) {
// If query string
String ch = "?";
if ( graphStoreProtocolService.contains("?") )
- // Already has a query string, append with "&"
+ // Already has a query string, append with "&"
ch = "&";
return graphStoreProtocolService + queryStringForGraph(ch, graphName) ;
}
@@ -51,7 +51,7 @@ package org.apache.jena.rdfconnection;
if ( destination == null )
return srvEndpoint;
- // If the srvEndpoint looks like an absolute URL, use as given.
+ // If the srvEndpoint looks like an absolute URL, use as given.
if ( srvEndpoint.startsWith("http:/") || srvEndpoint.startsWith("https:/") )
return srvEndpoint;
String queryString = null;
@@ -66,7 +66,7 @@ package org.apache.jena.rdfconnection;
dest = dest.substring(0, dest.length()-1);
dest = dest+"/"+srvEndpoint;
if ( queryString != null )
- dest = dest+queryString;
+ dest = dest+queryString;
return dest;
}
-}
\ No newline at end of file
+}
diff --git a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionRemoteBuilder.java b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionRemoteBuilder.java
index 62624ed..a51d754 100644
--- a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionRemoteBuilder.java
+++ b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionRemoteBuilder.java
@@ -38,7 +38,7 @@ public class RDFConnectionRemoteBuilder {
protected HttpClient httpClient = null;
protected HttpContext httpContext = null;
protected String destination = null;
-
+
protected String sQuery = SameAsDestination;
protected String sUpdate = SameAsDestination;
protected String sGSP = SameAsDestination;
@@ -50,10 +50,10 @@ public class RDFConnectionRemoteBuilder {
// On-the-wire settings.
protected RDFFormat outputQuads = RDFFormat.NQUADS;
protected RDFFormat outputTriples = RDFFormat.NTRIPLES;
-
+
protected String acceptGraph = WebContent.defaultGraphAcceptHeader;
protected String acceptDataset = WebContent.defaultDatasetAcceptHeader;
-
+
protected String acceptSelectResult = QueryEngineHTTP.defaultSelectHeader();
protected String acceptAskResult = QueryEngineHTTP.defaultAskHeader();
// All-purpose head that works for any query type (but is quite long!)
@@ -62,10 +62,10 @@ public class RDFConnectionRemoteBuilder {
protected boolean parseCheckQueries = true;
protected boolean parseCheckUpdates = true;
- protected RDFConnectionRemoteBuilder() {
+ protected RDFConnectionRemoteBuilder() {
// Default settings are the member declarations.
}
-
+
protected RDFConnectionRemoteBuilder(RDFConnectionRemote base) {
Objects.requireNonNull(base);
txnLifecycle = base.txnLifecycle;
@@ -79,16 +79,16 @@ public class RDFConnectionRemoteBuilder {
sGSP = base.svcGraphStore;
outputQuads = base.outputQuads;
outputTriples = base.outputTriples;
-
+
acceptGraph = base.acceptGraph;
acceptDataset = base.acceptDataset;
-
+
acceptSelectResult = base.acceptSelectResult;
acceptAskResult = base.acceptAskResult;
parseCheckQueries = base.parseCheckQueries;
parseCheckUpdates = base.parseCheckUpdates;
}
-
+
/** URL of the remote SPARQL endpoint.
* For Fuseki, this is the URL of the dataset e.g. http:/localhost:3030/dataset
*/
@@ -97,7 +97,7 @@ public class RDFConnectionRemoteBuilder {
this.destination = destination;
return this;
}
-
+
/** Name of the SPARQL query service.
* <p>
* This can be a short name, relative to the destination URL,
@@ -105,13 +105,13 @@ public class RDFConnectionRemoteBuilder {
* <p>
* Use {@code ""} for "same as destination".
* <br/>
- * Use null for "none".
+ * Use null for "none".
*/
public RDFConnectionRemoteBuilder queryEndpoint(String sQuery) {
this.sQuery = sQuery;
return this;
}
-
+
/** Name of the SPARQL update service.
* <p>
* This can be a short name, relative to the destination URL,
@@ -119,7 +119,7 @@ public class RDFConnectionRemoteBuilder {
* <p>
* Use {@code ""} for "same as destination".
* <br/>
- * Use null for "none".
+ * Use null for "none".
*/
public RDFConnectionRemoteBuilder updateEndpoint(String sUpdate) {
this.sUpdate = sUpdate;
@@ -133,19 +133,19 @@ public class RDFConnectionRemoteBuilder {
* <p>
* Use {@code ""} for "same as destination".
* <br/>
- * Use null for "none".
+ * Use null for "none".
*/
public RDFConnectionRemoteBuilder gspEndpoint(String sGSP) {
this.sGSP = sGSP;
return this;
}
-
+
/** Set the transaction lifecycle. */
/*Future possibility*/
private RDFConnectionRemoteBuilder txnLifecycle(Transactional txnLifecycle) {
this.txnLifecycle = txnLifecycle;
return this;
-
+
}
/** Set the {@link HttpClient} fir the connection to tbe built */
@@ -161,7 +161,7 @@ public class RDFConnectionRemoteBuilder {
}
/** Set the output format for sending RDF Datasets to the remote server.
- * This is used for HTTP PUT and POST to a dataset.
+ * This is used for HTTP PUT and POST to a dataset.
* This must be a quads format.
*/
public RDFConnectionRemoteBuilder quadsFormat(RDFFormat fmtQuads) {
@@ -172,7 +172,7 @@ public class RDFConnectionRemoteBuilder {
}
/** Set the output format for sending RDF Datasets to the remote server.
- * This is used for HTTP PUT and POST to a dataset.
+ * This is used for HTTP PUT and POST to a dataset.
* This must be a quads format.
*/
public RDFConnectionRemoteBuilder quadsFormat(Lang langQuads) {
@@ -187,7 +187,7 @@ public class RDFConnectionRemoteBuilder {
}
/** Set the output format for sending RDF Datasets to the remote server.
- * This is used for HTTP PUT and POST to a dataset.
+ * This is used for HTTP PUT and POST to a dataset.
* This must be a quads format.
*/
public RDFConnectionRemoteBuilder quadsFormat(String langQuads) {
@@ -199,7 +199,7 @@ public class RDFConnectionRemoteBuilder {
return this;
}
- /** Set the output format for sending RDF graphs to the remote server.
+ /** Set the output format for sending RDF graphs to the remote server.
* This is used for the SPARQ Graph Store Protocol.
*/
public RDFConnectionRemoteBuilder triplesFormat(RDFFormat fmtTriples) {
@@ -208,8 +208,8 @@ public class RDFConnectionRemoteBuilder {
this.outputTriples = fmtTriples;
return this;
}
-
- /** Set the output format for sending RDF graphs to the remote server.
+
+ /** Set the output format for sending RDF graphs to the remote server.
* This is used for the SPARQ Graph Store Protocol.
*/
public RDFConnectionRemoteBuilder triplesFormat(Lang langTriples) {
@@ -223,7 +223,7 @@ public class RDFConnectionRemoteBuilder {
return this;
}
- /** Set the output format for sending RDF graphs to the remote server.
+ /** Set the output format for sending RDF graphs to the remote server.
* This is used for the SPARQ Graph Store Protocol.
*/
public RDFConnectionRemoteBuilder triplesFormat(String langTriples) {
@@ -234,48 +234,48 @@ public class RDFConnectionRemoteBuilder {
quadsFormat(lang);
return this;
}
-
- /** Set the HTTP {@code Accept:} header used to fetch RDF graph using the SPARQL Graph Store Protocol. */
+
+ /** Set the HTTP {@code Accept:} header used to fetch RDF graph using the SPARQL Graph Store Protocol. */
public RDFConnectionRemoteBuilder acceptHeaderGraph(String acceptGraph) {
this.acceptGraph = acceptGraph;
return this;
}
-
- /** Set the HTTP {@code Accept:} header used to fetch RDF datasets using HTTP GET operations. */
+
+ /** Set the HTTP {@code Accept:} header used to fetch RDF datasets using HTTP GET operations. */
public RDFConnectionRemoteBuilder acceptHeaderDataset(String acceptDataset) {
this.acceptDataset = acceptDataset;
return this;
}
- /** Set the HTTP {@code Accept:} header used to when making a SPARQL Protocol SELECT query. */
+ /** Set the HTTP {@code Accept:} header used to when making a SPARQL Protocol SELECT query. */
public RDFConnectionRemoteBuilder acceptHeaderSelectQuery(String acceptSelectHeader) {
this.acceptSelectResult = acceptSelectHeader;
return this;
}
- /** Set the HTTP {@code Accept:} header used to when making a SPARQL Protocol ASK query. */
+ /** Set the HTTP {@code Accept:} header used to when making a SPARQL Protocol ASK query. */
public RDFConnectionRemoteBuilder acceptHeaderAskQuery(String acceptAskHeader) {
this.acceptAskResult = acceptAskHeader;
return this;
}
- /** Set the HTTP {@code Accept:} header used to when making a
+ /** Set the HTTP {@code Accept:} header used to when making a
* SPARQL Protocol query if no query type specific setting available.
- */
+ */
public RDFConnectionRemoteBuilder acceptHeaderQuery(String acceptHeader) {
this.acceptSparqlResults = acceptHeader;
return this;
}
-
+
/**
- * Set the flag for whether to check SPARQL queries and SPARQL updates provided as a string.
+ * Set the flag for whether to check SPARQL queries and SPARQL updates provided as a string.
*/
public RDFConnectionRemoteBuilder parseCheckSPARQL(boolean parseCheck) {
this.parseCheckQueries = parseCheck;
this.parseCheckUpdates = parseCheck;
return this;
}
-
+
private Function<RDFConnectionRemoteBuilder, RDFConnection> creator = null;
/** Provide an alternative function to make the {@link RDFConnection} object.
* <p>
@@ -286,32 +286,32 @@ public class RDFConnectionRemoteBuilder {
return this;
}
- /** Build an {RDFConnection}. */
+ /** Build an {RDFConnection}. */
public RDFConnection build() {
requireNonNull(txnLifecycle);
-
+
Function<RDFConnectionRemoteBuilder, RDFConnection> maker = creator ;
-
+
if ( maker == null )
maker = (b)->b.buildConnection();
-
+
// Sort out service URLs.
// Delay until here. The builder may be setting destination and service endpoint
// names. We can't calculate the full URL until build() is called.
-
+
queryURL = LibRDFConn.formServiceURL(destination, sQuery);
updateURL = LibRDFConn.formServiceURL(destination, sUpdate);
gspURL = LibRDFConn.formServiceURL(destination, sGSP);
-
+
return maker.apply(this);
}
-
+
protected RDFConnectionRemote buildConnection() {
- return new RDFConnectionRemote(txnLifecycle, httpClient, httpContext,
+ return new RDFConnectionRemote(txnLifecycle, httpClient, httpContext,
destination, queryURL, updateURL, gspURL,
outputQuads, outputTriples,
acceptDataset, acceptGraph,
acceptSparqlResults, acceptSelectResult, acceptAskResult,
parseCheckQueries, parseCheckUpdates);
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/ValidationReport.java b/jena-shacl/src/main/java/org/apache/jena/shacl/ValidationReport.java
index 4921a97..96b5fc3 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/ValidationReport.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/ValidationReport.java
@@ -167,7 +167,7 @@ public class ValidationReport {
private PrefixMapping prefixes = new PrefixMappingImpl();
public Builder() { }
-
+
public void addPrefixes(PrefixMapping pmap) {
this.prefixes.setNsPrefixes(pmap);
}
@@ -211,10 +211,10 @@ public class ValidationReport {
public void addReportEntry(ReportEntry e) {
entries.add(e);
}
-
+
public ValidationReport build() {
return new ValidationReport(paths, entries, prefixes);
}
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/TargetType.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/TargetType.java
index 6b9e861..b4248ea 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/TargetType.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/TargetType.java
@@ -33,4 +33,4 @@ public enum TargetType {
TargetType(Node n) {
this.predicate = n;
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ConstraintTerm.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ConstraintTerm.java
index c5bf5f6..e02da87 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ConstraintTerm.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ConstraintTerm.java
@@ -28,7 +28,7 @@ import org.apache.jena.shacl.parser.Shape;
import org.apache.jena.shacl.validation.ReportItem;
import org.apache.jena.sparql.path.Path;
-/* Constraint that does not need access to the data other than the nodes supplied. e.g. sh:datatype. */
+/* Constraint that does not need access to the data other than the nodes supplied. e.g. sh:datatype. */
public abstract class ConstraintTerm implements Constraint {
public ConstraintTerm() {}
@@ -53,4 +53,4 @@ public abstract class ConstraintTerm implements Constraint {
}
public abstract ReportItem validate(ValidationContext vCxt, Node n) ;
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/DatatypeConstraint.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/DatatypeConstraint.java
index b1bf1d8..ba4ad1b 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/DatatypeConstraint.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/DatatypeConstraint.java
@@ -107,4 +107,4 @@ public class DatatypeConstraint extends ConstraintTerm {
DatatypeConstraint other = (DatatypeConstraint)obj;
return Objects.equals(datatype, other.datatype) && Objects.equals(dtURI, other.dtURI);
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/QualifiedValueShape.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/QualifiedValueShape.java
index f3d5d93..6b5f754 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/QualifiedValueShape.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/QualifiedValueShape.java
@@ -165,4 +165,4 @@ public class QualifiedValueShape implements Constraint {
(qMax<0) ? "_" : Integer.toString(qMax),
qDisjoint);
}
- }
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShAnd.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShAnd.java
index 6b9c66a..ff91bd3 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShAnd.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShAnd.java
@@ -60,4 +60,4 @@ public class ShAnd extends ConstraintOpN {
public String toString() {
return "And";
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShNode.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShNode.java
index 3a6d45d..f76b0f5 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShNode.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShNode.java
@@ -30,7 +30,7 @@ import org.apache.jena.shacl.vocabulary.SHACL;
/** sh:node */
public class ShNode extends ConstraintOp1 {
-
+
public ShNode(Shape other) {
super(other);
}
@@ -55,4 +55,4 @@ public class ShNode extends ConstraintOp1 {
public String toString() {
return "Node";
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShNot.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShNot.java
index 86cc327..6956d14 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShNot.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShNot.java
@@ -55,4 +55,4 @@ public class ShNot extends ConstraintOp1 {
public String toString() {
return "Not";
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShOr.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShOr.java
index 7d6259a..d4bf073 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShOr.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShOr.java
@@ -59,4 +59,4 @@ public class ShOr extends ConstraintOpN {
public String toString() {
return "Or";
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShXone.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShXone.java
index 86eb30d..187ac23 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShXone.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/ShXone.java
@@ -51,7 +51,7 @@ public class ShXone extends ConstraintOpN {
boolean innerConforms = vCxt2.generateReport().conforms();
if ( innerConforms ) {
c++;
- // Choice: count all vs break as soon as error deteched
+ // Choice: count all vs break as soon as error detected
// if ( c > 1 )
// break;
}
@@ -66,4 +66,4 @@ public class ShXone extends ConstraintOpN {
public String toString() {
return "Xone";
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlConstraint.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlConstraint.java
index 1061df6..45b67b3 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlConstraint.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlConstraint.java
@@ -68,4 +68,4 @@ public class SparqlConstraint implements Constraint {
String x = out.asString();
return "SPARQL["+x+"]";
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/exec/ValidationOp.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/exec/ValidationOp.java
index a575d3e..9013738 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/exec/ValidationOp.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/exec/ValidationOp.java
@@ -63,4 +63,4 @@ public class ValidationOp {
public Constraint getConstraint() {
return constraint;
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/lib/RDFDataException.java b/jena-shacl/src/main/java/org/apache/jena/shacl/lib/RDFDataException.java
index eb174fe..8dce82f 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/lib/RDFDataException.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/lib/RDFDataException.java
@@ -23,4 +23,4 @@ import org.apache.jena.shacl.ShaclException;
public class RDFDataException extends ShaclException {
public RDFDataException(String msg) { super(msg);}
public RDFDataException(String msg, Throwable th) { super(msg, th); }
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/parser/Constraints.java b/jena-shacl/src/main/java/org/apache/jena/shacl/parser/Constraints.java
index 6bb9962..0b397bb 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/parser/Constraints.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/parser/Constraints.java
@@ -170,7 +170,7 @@ public class Constraints {
if ( p.equals(SHACL.qualifiedValueShape) )
return parseQualifiedValueShape(g, s, p, o, parsed);
-
+
// sh:qualifiedValueShape parameters.
if ( p.equals(SHACL.QualifiedMinCountConstraintComponent) ||
p.equals(SHACL.QualifiedMaxCountConstraintComponent) ||
@@ -188,7 +188,7 @@ public class Constraints {
throw new ShaclParseException("Unexpected constraint: "+displayStr(p)+" on "+s);
if ( p.equals(SHACL.property) )
throw new ShaclParseException("Unexpected constraint: "+displayStr(p)+" on "+s);
-
+
return null;
}
@@ -244,7 +244,7 @@ public class Constraints {
//dispatch.put( SHACL.or, (g, s, p, o) -> notImplemented(p) );
//dispatch.put( SHACL.xone, (g, s, p, o) -> notImplemented(p) );
//dispatch.put( SHACL.node, (g, s, p, o) -> notImplemented(p) );
-
+
dispatch.put(SHACL.sparql, (g, s, p, o) -> SparqlConstraints.parseSparqlConstraint(g, s, p, o) );
}
@@ -284,4 +284,4 @@ public class Constraints {
return n.getLiteralLexicalForm();
}).collect(Collectors.toList());
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/parser/NodeShape.java b/jena-shacl/src/main/java/org/apache/jena/shacl/parser/NodeShape.java
index fa8a7ab..68d0ce1 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/parser/NodeShape.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/parser/NodeShape.java
@@ -49,6 +49,5 @@ public class NodeShape extends Shape {
if ( deactivated() )
x = x + " deactivated";
return x;
-
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/parser/PropertyShape.java b/jena-shacl/src/main/java/org/apache/jena/shacl/parser/PropertyShape.java
index e03da06..e7259c2 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/parser/PropertyShape.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/parser/PropertyShape.java
@@ -60,4 +60,4 @@ public class PropertyShape extends Shape {
x = x + " deactivated";
return x;
}
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/parser/Shape.java b/jena-shacl/src/main/java/org/apache/jena/shacl/parser/Shape.java
index 03fd149..886557c 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/parser/Shape.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/parser/Shape.java
@@ -126,5 +126,4 @@ public abstract class Shape {
out.decIndent();
}
}
-
-}
\ No newline at end of file
+}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/validation/ReportEntry.java b/jena-shacl/src/main/java/org/apache/jena/shacl/validation/ReportEntry.java
index 261b411..174127c 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/validation/ReportEntry.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/validation/ReportEntry.java
@@ -298,4 +298,4 @@ public class ReportEntry {
&& Objects.equals(triple, other.triple)
&& Objects.equals(value, other.value);
}
-}
\ No newline at end of file
+}
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransPromoteTDB.java b/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransPromoteTDB.java
index 2a03ef0..3b2f0ff 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransPromoteTDB.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TestTransPromoteTDB.java
@@ -47,4 +47,4 @@ public class TestTransPromoteTDB extends AbstractTestTransPromote {
protected Class<JenaTransactionException> getTransactionExceptionClass() {
return JenaTransactionException.class ;
}
-}
\ No newline at end of file
+}