Skip to content

Commit ff27e3d

Browse files
afsafs
committed
Format white space
1 parent 4a473e3 commit ff27e3d

15 files changed

+302
-299
lines changed

‎jena-arq/src/main/java/org/apache/jena/sparql/lang/LabelToNodeMap.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818

1919
package org.apache.jena.sparql.lang;
2020

21-
import java.util.HashMap ;
22-
import java.util.Map ;
23-
import java.util.Set ;
21+
import java.util.HashMap;
22+
import java.util.Map;
23+
import java.util.Set;
2424

25-
import org.apache.jena.graph.Node ;
26-
import org.apache.jena.graph.NodeFactory ;
25+
import org.apache.jena.graph.Node;
26+
import org.apache.jena.graph.NodeFactory;
2727
import org.apache.jena.riot.lang.LabelToNode;
28-
import org.apache.jena.sparql.ARQConstants ;
29-
import org.apache.jena.sparql.core.VarAlloc ;
28+
import org.apache.jena.sparql.ARQConstants;
29+
import org.apache.jena.sparql.core.VarAlloc;
3030

3131

3232
/** Map from _:* form to bNodes or variables.
@@ -36,13 +36,13 @@
3636
public class LabelToNodeMap
3737
{
3838

39-
private Map<String, Node> bNodeLabels = new HashMap<>() ;
39+
private Map<String, Node> bNodeLabels = new HashMap<>();
4040

4141
// Variables or bNodes?
4242
// True means variables (query pattern)
4343
// False means blank node (construct template)
44-
boolean generateVars = false ;
45-
VarAlloc allocator = null ;
44+
boolean generateVars = false;
45+
VarAlloc allocator = null;
4646

4747
/**
4848
* Create blank nodes, with the same blank node returned for the same label.
@@ -52,7 +52,7 @@ public class LabelToNodeMap
5252
*/
5353
@Deprecated
5454
public static LabelToNodeMap createBNodeMap()
55-
{ return new LabelToNodeMap(false, null) ; }
55+
{ return new LabelToNodeMap(false, null); }
5656

5757
/**
5858
* Create variables (Var), starting from zero each time This means that parsing a
@@ -62,32 +62,32 @@ public static LabelToNodeMap createBNodeMap()
6262
* @return LabelToNodeMap
6363
*/
6464
public static LabelToNodeMap createVarMap()
65-
{ return new LabelToNodeMap(true, new VarAlloc(ARQConstants.allocParserAnonVars) ) ; }
65+
{ return new LabelToNodeMap(true, new VarAlloc(ARQConstants.allocParserAnonVars) ); }
6666

6767
private LabelToNodeMap(boolean genVars, VarAlloc allocator) {
68-
generateVars = genVars ;
69-
this.allocator = allocator ;
68+
generateVars = genVars;
69+
this.allocator = allocator;
7070
}
7171

72-
public Set<String> getLabels() { return bNodeLabels.keySet() ; }
72+
public Set<String> getLabels() { return bNodeLabels.keySet(); }
7373

7474
public Node asNode(String label) {
75-
Node n = bNodeLabels.get(label) ;
75+
Node n = bNodeLabels.get(label);
7676
if ( n != null )
77-
return n ;
78-
n = allocNode() ;
79-
bNodeLabels.put(label, n) ;
80-
return n ;
77+
return n;
78+
n = allocNode();
79+
bNodeLabels.put(label, n);
80+
return n;
8181
}
8282

8383
public Node allocNode() {
8484
if ( generateVars )
85-
return allocAnonVariable() ;
86-
return NodeFactory.createBlankNode() ;
85+
return allocAnonVariable();
86+
return NodeFactory.createBlankNode();
8787
}
8888

8989
private Node allocAnonVariable() {
90-
return allocator.allocVar() ;
90+
return allocator.allocVar();
9191
}
9292

9393
public void clear() {

‎jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL10.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818

1919
package org.apache.jena.sparql.lang;
2020

21-
import java.io.Reader ;
22-
import java.io.StringReader ;
21+
import java.io.Reader;
22+
import java.io.StringReader;
2323

24-
import org.apache.jena.atlas.logging.Log ;
25-
import org.apache.jena.query.Query ;
26-
import org.apache.jena.query.QueryException ;
27-
import org.apache.jena.query.QueryParseException ;
28-
import org.apache.jena.query.Syntax ;
29-
import org.apache.jena.shared.JenaException ;
30-
import org.apache.jena.sparql.lang.sparql_10.SPARQLParser10 ;
31-
import org.apache.jena.sparql.syntax.Element ;
32-
import org.apache.jena.sparql.syntax.Template ;
24+
import org.apache.jena.atlas.logging.Log;
25+
import org.apache.jena.query.Query;
26+
import org.apache.jena.query.QueryException;
27+
import org.apache.jena.query.QueryParseException;
28+
import org.apache.jena.query.Syntax;
29+
import org.apache.jena.shared.JenaException;
30+
import org.apache.jena.sparql.lang.sparql_10.SPARQLParser10;
31+
import org.apache.jena.sparql.syntax.Element;
32+
import org.apache.jena.sparql.syntax.Template;
3333

3434
public class ParserSPARQL10 extends SPARQLParser
3535
{
36-
private interface Action { void exec(SPARQLParser10 parser) throws Exception ; }
36+
private interface Action { void exec(SPARQLParser10 parser) throws Exception; }
3737

3838
@Override
3939
protected Query parse$(final Query query, String queryString) {
@@ -67,8 +67,8 @@ public static Template parseTemplate(String string) {
6767

6868
// All throwable handling.
6969
private static void perform(Query query, String string, Action action) {
70-
Reader in = new StringReader(string) ;
71-
SPARQLParser10 parser = new SPARQLParser10(in) ;
70+
Reader in = new StringReader(string);
71+
SPARQLParser10 parser = new SPARQLParser10(in);
7272
try {
7373
query.setStrict(true);
7474
parser.setQuery(query);
@@ -92,7 +92,7 @@ private static void perform(Query query, String string, Action action) {
9292
throw new QueryParseException(err.getMessage(), err, -1, -1);
9393
} catch (Throwable th) {
9494
Log.warn(ParserSPARQL10.class, "Unexpected throwable: ", th);
95-
throw new QueryException(th.getMessage(), th) ;
95+
throw new QueryException(th.getMessage(), th);
9696
}
9797
}
9898
}

‎jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818

1919
package org.apache.jena.sparql.lang;
2020

21-
import java.io.Reader ;
22-
import java.io.StringReader ;
21+
import java.io.Reader;
22+
import java.io.StringReader;
2323

24-
import org.apache.jena.atlas.logging.Log ;
25-
import org.apache.jena.query.Query ;
26-
import org.apache.jena.query.QueryException ;
27-
import org.apache.jena.query.QueryParseException ;
28-
import org.apache.jena.query.Syntax ;
29-
import org.apache.jena.shared.JenaException ;
30-
import org.apache.jena.sparql.lang.sparql_11.SPARQLParser11 ;
31-
import org.apache.jena.sparql.syntax.Element ;
32-
import org.apache.jena.sparql.syntax.Template ;
24+
import org.apache.jena.atlas.logging.Log;
25+
import org.apache.jena.query.Query;
26+
import org.apache.jena.query.QueryException;
27+
import org.apache.jena.query.QueryParseException;
28+
import org.apache.jena.query.Syntax;
29+
import org.apache.jena.shared.JenaException;
30+
import org.apache.jena.sparql.lang.sparql_11.SPARQLParser11;
31+
import org.apache.jena.sparql.syntax.Element;
32+
import org.apache.jena.sparql.syntax.Template;
3333

3434
public class ParserSPARQL11 extends SPARQLParser
3535
{
36-
private interface Action { void exec(SPARQLParser11 parser) throws Exception ; }
36+
private interface Action { void exec(SPARQLParser11 parser) throws Exception; }
3737

3838
@Override
3939
protected Query parse$(final Query query, String queryString) {

‎jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11Update.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@
1818

1919
package org.apache.jena.sparql.lang;
2020

21-
import java.io.Reader ;
21+
import java.io.Reader;
2222

23-
import org.apache.jena.atlas.logging.Log ;
24-
import org.apache.jena.query.QueryException ;
25-
import org.apache.jena.query.QueryParseException ;
26-
import org.apache.jena.shared.JenaException ;
23+
import org.apache.jena.atlas.logging.Log;
24+
import org.apache.jena.query.QueryException;
25+
import org.apache.jena.query.QueryParseException;
26+
import org.apache.jena.shared.JenaException;
2727
import org.apache.jena.sparql.core.Prologue;
28-
import org.apache.jena.sparql.lang.sparql_11.SPARQLParser11 ;
29-
import org.apache.jena.sparql.modify.UpdateSink ;
30-
import org.apache.jena.update.UpdateException ;
28+
import org.apache.jena.sparql.lang.sparql_11.SPARQLParser11;
29+
import org.apache.jena.sparql.modify.UpdateSink;
30+
import org.apache.jena.update.UpdateException;
3131

3232
public class ParserSPARQL11Update extends UpdateParser
3333
{
3434
public ParserSPARQL11Update() {}
3535

3636
@Override
3737
protected void executeParse(UpdateSink sink, Prologue prologue, Reader r) {
38-
SPARQLParser11 parser = null ;
38+
SPARQLParser11 parser = null;
3939
try {
4040
parser = new SPARQLParser11(r);
4141
parser.setUpdate(prologue, sink);

‎jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818

1919
package org.apache.jena.sparql.lang;
2020

21-
import java.io.Reader ;
22-
import java.io.StringReader ;
21+
import java.io.Reader;
22+
import java.io.StringReader;
2323

24-
import org.apache.jena.atlas.logging.Log ;
25-
import org.apache.jena.query.Query ;
26-
import org.apache.jena.query.QueryException ;
27-
import org.apache.jena.query.QueryParseException ;
28-
import org.apache.jena.query.Syntax ;
29-
import org.apache.jena.shared.JenaException ;
30-
import org.apache.jena.sparql.lang.sparql_12.SPARQLParser12 ;
31-
import org.apache.jena.sparql.syntax.Element ;
32-
import org.apache.jena.sparql.syntax.Template ;
24+
import org.apache.jena.atlas.logging.Log;
25+
import org.apache.jena.query.Query;
26+
import org.apache.jena.query.QueryException;
27+
import org.apache.jena.query.QueryParseException;
28+
import org.apache.jena.query.Syntax;
29+
import org.apache.jena.shared.JenaException;
30+
import org.apache.jena.sparql.lang.sparql_12.SPARQLParser12;
31+
import org.apache.jena.sparql.syntax.Element;
32+
import org.apache.jena.sparql.syntax.Template;
3333

3434
public class ParserSPARQL12 extends SPARQLParser
3535
{
36-
private interface Action { void exec(SPARQLParser12 parser) throws Exception ; }
36+
private interface Action { void exec(SPARQLParser12 parser) throws Exception; }
3737

3838
@Override
3939
protected Query parse$(final Query query, String queryString) {

‎jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12Update.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@
1818

1919
package org.apache.jena.sparql.lang;
2020

21-
import java.io.Reader ;
21+
import java.io.Reader;
2222

23-
import org.apache.jena.atlas.logging.Log ;
24-
import org.apache.jena.query.QueryException ;
25-
import org.apache.jena.query.QueryParseException ;
26-
import org.apache.jena.shared.JenaException ;
23+
import org.apache.jena.atlas.logging.Log;
24+
import org.apache.jena.query.QueryException;
25+
import org.apache.jena.query.QueryParseException;
26+
import org.apache.jena.shared.JenaException;
2727
import org.apache.jena.sparql.core.Prologue;
28-
import org.apache.jena.sparql.lang.sparql_12.SPARQLParser12 ;
29-
import org.apache.jena.sparql.modify.UpdateSink ;
30-
import org.apache.jena.update.UpdateException ;
28+
import org.apache.jena.sparql.lang.sparql_12.SPARQLParser12;
29+
import org.apache.jena.sparql.modify.UpdateSink;
30+
import org.apache.jena.update.UpdateException;
3131

3232
public class ParserSPARQL12Update extends UpdateParser
3333
{
3434
public ParserSPARQL12Update() {}
3535

3636
@Override
3737
protected void executeParse(UpdateSink sink, Prologue prologue, Reader r) {
38-
SPARQLParser12 parser = null ;
38+
SPARQLParser12 parser = null;
3939
try {
4040
parser = new SPARQLParser12(r);
4141
parser.setUpdate(prologue, sink);

‎jena-arq/src/main/java/org/apache/jena/sparql/lang/QueryParserBase.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,18 @@
5959
/** Base class parsers, mainly SPARQL related */
6060
public class QueryParserBase {
6161

62-
protected final Node XSD_TRUE = NodeConst.nodeTrue ;
63-
protected final Node XSD_FALSE = NodeConst.nodeFalse ;
62+
protected final Node XSD_TRUE = NodeConst.nodeTrue;
63+
protected final Node XSD_FALSE = NodeConst.nodeFalse;
6464

65-
protected final Node nRDFtype = NodeConst.nodeRDFType ;
65+
protected final Node nRDFtype = NodeConst.nodeRDFType;
6666

67-
protected final Node nRDFnil = NodeConst.nodeNil ;
68-
protected final Node nRDFfirst = NodeConst.nodeFirst ;
69-
protected final Node nRDFrest = NodeConst.nodeRest ;
67+
protected final Node nRDFnil = NodeConst.nodeNil;
68+
protected final Node nRDFfirst = NodeConst.nodeFirst;
69+
protected final Node nRDFrest = NodeConst.nodeRest;
7070

71-
protected final Node nRDFsubject = RDF.Nodes.subject ;
72-
protected final Node nRDFpredicate = RDF.Nodes.predicate ;
73-
protected final Node nRDFobject = RDF.Nodes.object ;
71+
protected final Node nRDFsubject = RDF.Nodes.subject;
72+
protected final Node nRDFpredicate = RDF.Nodes.predicate;
73+
protected final Node nRDFobject = RDF.Nodes.object;
7474

7575
protected final Node nRDFreifies = RDF.Nodes.reifies;
7676

@@ -215,7 +215,7 @@ protected Node stripSign(Node node) {
215215
// Because of Java (Java strings have surrogate pairs) we only detect singleton surrogates.
216216
protected void checkString(String string, int line, int column) {
217217
// Checks for bare surrogate pairs.
218-
for ( int i = 0 ; i < string.length() ; i++ ) {
218+
for ( int i = 0; i < string.length(); i++ ) {
219219
// Not "codePointAt" which does surrogate processing.
220220
char ch = string.charAt(i);
221221

@@ -667,7 +667,7 @@ protected static String unescapePName(String s, int line, int column) {
667667
int len = s.length();
668668
StringBuilder sb = new StringBuilder();
669669

670-
for ( int i = 0 ; i < len ; i++ ) {
670+
for ( int i = 0; i < len; i++ ) {
671671
char ch = s.charAt(i);
672672
// Keep line and column numbers.
673673
switch (ch) {

‎jena-arq/src/main/java/org/apache/jena/sparql/lang/SPARQLParser.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
package org.apache.jena.sparql.lang;
2020

21-
import org.apache.jena.query.Query ;
22-
import org.apache.jena.query.QueryParseException ;
23-
import org.apache.jena.query.Syntax ;
21+
import org.apache.jena.query.Query;
22+
import org.apache.jena.query.QueryParseException;
23+
import org.apache.jena.query.Syntax;
2424

2525
/** This class provides the root of lower level access to all the parsers.
2626
* Each subclass hides the details of the per-language exception handlers and other
@@ -30,13 +30,13 @@
3030
public abstract class SPARQLParser
3131
{
3232
public final Query parse(Query query, String queryString) throws QueryParseException {
33-
Query parsedQuery = parse$(query, queryString) ;
34-
validateParsedQuery(parsedQuery) ;
33+
Query parsedQuery = parse$(query, queryString);
34+
validateParsedQuery(parsedQuery);
3535
parsedQuery.resetResultVars();
36-
return parsedQuery ;
36+
return parsedQuery;
3737
}
3838

39-
protected abstract Query parse$(Query query, String queryString) throws QueryParseException ;
39+
protected abstract Query parse$(Query query, String queryString) throws QueryParseException;
4040

4141
public static boolean canParse(Syntax syntaxURI) {
4242
return SPARQLParserRegistry.get().containsFactory(syntaxURI);

0 commit comments

Comments
 (0)