fixes in formatting

eclipse-rdf4j · Jul 13, 2019 · 766abfc · 766abfc
1 parent a4d382f
commit 766abfc
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 16 deletions.
diff --git a/queryalgebra-model/src/main/java/org/eclipse/rdf4j/query/algebra/MathExpr.java b/queryalgebra-model/src/main/java/org/eclipse/rdf4j/query/algebra/MathExpr.java
@@ -17,7 +17,10 @@ public class MathExpr extends BinaryValueOperator {
 	 *---------------*/
 
 	public enum MathOp {
-		PLUS("+"), MINUS("-"), MULTIPLY("*"), DIVIDE("/");
+		PLUS("+"),
+		MINUS("-"),
+		MULTIPLY("*"),
+		DIVIDE("/");
 
 		private String symbol;
 

diff --git a/queryparser/api/src/main/java/org/eclipse/rdf4j/query/parser/QueryPrologLexer.java b/queryparser/api/src/main/java/org/eclipse/rdf4j/query/parser/QueryPrologLexer.java
@@ -21,7 +21,15 @@
 public class QueryPrologLexer {
 
 	public static enum TokenType {
-		PREFIX_KEYWORD, PREFIX, BASE_KEYWORD, LBRACKET, RBRACKET, IRI, HASH, COMMENT, REST_OF_QUERY
+		PREFIX_KEYWORD,
+		PREFIX,
+		BASE_KEYWORD,
+		LBRACKET,
+		RBRACKET,
+		IRI,
+		HASH,
+		COMMENT,
+		REST_OF_QUERY
 	}
 
 	private static final Token HASH_TOKEN = new Token(TokenType.HASH, "#");

diff --git a/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/BinaryOperator.java b/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/BinaryOperator.java
@@ -12,7 +12,12 @@
  * The SPARQL binary operators
  */
 enum BinaryOperator implements SparqlOperator {
-	EQUALS("="), GREATER_THAN(">"), GREATER_THAN_EQUALS(">="), LESS_THAN("<"), LESS_THAN_EQUALS("<="), NOT_EQUALS("!=");
+	EQUALS("="),
+	GREATER_THAN(">"),
+	GREATER_THAN_EQUALS(">="),
+	LESS_THAN("<"),
+	LESS_THAN_EQUALS("<="),
+	NOT_EQUALS("!=");
 
 	private String operator;
 

diff --git a/...lbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/ConnectiveOperator.java b/...lbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/ConnectiveOperator.java
@@ -13,10 +13,14 @@
  */
 enum ConnectiveOperator implements SparqlOperator {
 	// Logical
-	AND("&&"), OR("||"),
+	AND("&&"),
+	OR("||"),
 
 	// Arithmetic
-	ADD("+"), DIVIDE("/"), MULTIPLY("*"), SUBTRACT("-");
+	ADD("+"),
+	DIVIDE("/"),
+	MULTIPLY("*"),
+	SUBTRACT("-");
 
 	private String operator;
 

diff --git a/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/SparqlAggregate.java b/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/SparqlAggregate.java
@@ -15,7 +15,13 @@
  */
 @SuppressWarnings("javadoc") // acceptable, as this won't be public for long
 public enum SparqlAggregate implements SparqlOperator {
-	AVG("AVG"), COUNT("COUNT"), GROUP_CONCAT("GROUP_CONCAT"), MAX("MAX"), MIN("MIN"), SAMPLE("SAMPLE"), SUM("SUM");
+	AVG("AVG"),
+	COUNT("COUNT"),
+	GROUP_CONCAT("GROUP_CONCAT"),
+	MAX("MAX"),
+	MIN("MIN"),
+	SAMPLE("SAMPLE"),
+	SUM("SUM");
 
 	private String function;
 

diff --git a/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/SparqlFunction.java b/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/SparqlFunction.java
@@ -15,15 +15,59 @@
  */
 @SuppressWarnings("javadoc") // acceptable, as this won't be public for long
 public enum SparqlFunction implements SparqlOperator {
-	ABS("ABS"), BNODE("BNODE"), BOUND("BOUND"), CEIL("CEIL"), COALESCE("COALESCE"), CONCAT("CONCAT"),
-	CONTAINS("CONTAINS"), DATATYPE("DATATYPE"), DAY("DAY"), ENCODE_FOR_URI("ENCODE_FOR_URI"), FLOOR("FLOOR"),
-	HOURS("HOURS"), IF("IF"), IRI("IRI"), IS_BLANK("isBLANK"), IS_IRI("isIRI"), IS_LITERAL("isLITERAL"),
-	IS_NUMERIC("isNUMERIC"), IS_URI("isURI"), LANG("LANG"), LANGMATCHES("LANGMATCHES"), LCASE("LCASE"), MD5("MD5"),
-	MINUTES("MINUTES"), MONTH("MONTH"), NOW("NOW"), RAND("RAND"), REGEX("REGEX"), REPLACE("REPLACE"), ROUND("ROUND"),
-	SAME_TERM("sameTerm"), SECONDS("SECONDS"), SHA1("SHA1"), SHA256("SHA256"), SHA384("SHA384"), SHA512("SHA512"),
-	STR("STR"), STRAFTER("STRAFTER"), STRBEFORE("STRBEFORE"), STRDT("STRDT"), STRENDS("STRENDS"), STRING("STR"),
-	STRLANG("STRLANG"), STRLEN("STRLEN"), STRSTARTS("STRSTARTS"), STRUUID("STRUUID"), SUBSTR("SUBSTR"),
-	TIMEZONE("TIMEZONE"), TZ("TZ"), UCASE("UCASE"), URI("URI"), UUID("UUID"), YEAR("YEAR");
+	ABS("ABS"),
+	BNODE("BNODE"),
+	BOUND("BOUND"),
+	CEIL("CEIL"),
+	COALESCE("COALESCE"),
+	CONCAT("CONCAT"),
+	CONTAINS("CONTAINS"),
+	DATATYPE("DATATYPE"),
+	DAY("DAY"),
+	ENCODE_FOR_URI("ENCODE_FOR_URI"),
+	FLOOR("FLOOR"),
+	HOURS("HOURS"),
+	IF("IF"),
+	IRI("IRI"),
+	IS_BLANK("isBLANK"),
+	IS_IRI("isIRI"),
+	IS_LITERAL("isLITERAL"),
+	IS_NUMERIC("isNUMERIC"),
+	IS_URI("isURI"),
+	LANG("LANG"),
+	LANGMATCHES("LANGMATCHES"),
+	LCASE("LCASE"),
+	MD5("MD5"),
+	MINUTES("MINUTES"),
+	MONTH("MONTH"),
+	NOW("NOW"),
+	RAND("RAND"),
+	REGEX("REGEX"),
+	REPLACE("REPLACE"),
+	ROUND("ROUND"),
+	SAME_TERM("sameTerm"),
+	SECONDS("SECONDS"),
+	SHA1("SHA1"),
+	SHA256("SHA256"),
+	SHA384("SHA384"),
+	SHA512("SHA512"),
+	STR("STR"),
+	STRAFTER("STRAFTER"),
+	STRBEFORE("STRBEFORE"),
+	STRDT("STRDT"),
+	STRENDS("STRENDS"),
+	STRING("STR"),
+	STRLANG("STRLANG"),
+	STRLEN("STRLEN"),
+	STRSTARTS("STRSTARTS"),
+	STRUUID("STRUUID"),
+	SUBSTR("SUBSTR"),
+	TIMEZONE("TIMEZONE"),
+	TZ("TZ"),
+	UCASE("UCASE"),
+	URI("URI"),
+	UUID("UUID"),
+	YEAR("YEAR");
 
 	private String function;
 

diff --git a/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/UnaryOperator.java b/sparqlbuilder/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/UnaryOperator.java
@@ -12,7 +12,9 @@
  * The SPARQL unary operators
  */
 enum UnaryOperator implements SparqlOperator {
-	NOT("!"), UNARY_PLUS("+"), UNARY_MINUS("-");
+	NOT("!"),
+	UNARY_PLUS("+"),
+	UNARY_MINUS("-");
 
 	private String operator;