This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit f11c85009a8b3c0b28eed063e7329a0ce9087870 Author: Andy Seaborne <[email protected]> AuthorDate: Sun May 11 17:54:57 2025 +0100 GH-3182: Put the internal API parser classes in their respective parser packages --- jena-arq/src/main/java/org/apache/jena/query/QueryFactory.java | 2 +- .../main/java/org/apache/jena/sparql/lang/SPARQLParserRegistry.java | 4 ++++ .../main/java/org/apache/jena/sparql/lang/UpdateParserRegistry.java | 3 +++ .../main/java/org/apache/jena/sparql/lang/{ => arq}/ParserARQ.java | 4 +++- .../java/org/apache/jena/sparql/lang/{ => arq}/ParserARQUpdate.java | 3 ++- .../org/apache/jena/sparql/lang/{ => sparql_10}/ParserSPARQL10.java | 4 ++-- .../org/apache/jena/sparql/lang/{ => sparql_11}/ParserSPARQL11.java | 4 ++-- .../apache/jena/sparql/lang/{ => sparql_11}/ParserSPARQL11Update.java | 4 ++-- .../org/apache/jena/sparql/lang/{ => sparql_12}/ParserSPARQL12.java | 3 ++- .../apache/jena/sparql/lang/{ => sparql_12}/ParserSPARQL12Update.java | 3 ++- 10 files changed, 23 insertions(+), 11 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/query/QueryFactory.java b/jena-arq/src/main/java/org/apache/jena/query/QueryFactory.java index 05e7bad332..ca69f70121 100644 --- a/jena-arq/src/main/java/org/apache/jena/query/QueryFactory.java +++ b/jena-arq/src/main/java/org/apache/jena/query/QueryFactory.java @@ -25,9 +25,9 @@ import org.apache.jena.irix.IRIs; import org.apache.jena.irix.IRIx; import org.apache.jena.riot.system.stream.StreamManager; import org.apache.jena.shared.NotFoundException; -import org.apache.jena.sparql.lang.ParserARQ; import org.apache.jena.sparql.lang.SPARQLParser; import org.apache.jena.sparql.lang.SPARQLParserRegistry; +import org.apache.jena.sparql.lang.arq.ParserARQ; import org.apache.jena.sparql.syntax.Element; import org.apache.jena.sparql.syntax.Template; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/SPARQLParserRegistry.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/SPARQLParserRegistry.java index b32c994020..0173401d52 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/SPARQLParserRegistry.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/SPARQLParserRegistry.java @@ -22,6 +22,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.jena.query.Syntax; +import org.apache.jena.sparql.lang.arq.ParserARQ; +import org.apache.jena.sparql.lang.sparql_10.ParserSPARQL10; +import org.apache.jena.sparql.lang.sparql_11.ParserSPARQL11; +import org.apache.jena.sparql.lang.sparql_12.ParserSPARQL12; public class SPARQLParserRegistry { diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/UpdateParserRegistry.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/UpdateParserRegistry.java index c96bf350b7..9e89d60dc7 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/UpdateParserRegistry.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/UpdateParserRegistry.java @@ -22,6 +22,9 @@ import java.util.HashMap; import java.util.Map; import org.apache.jena.query.Syntax; +import org.apache.jena.sparql.lang.arq.ParserARQUpdate; +import org.apache.jena.sparql.lang.sparql_11.ParserSPARQL11Update; +import org.apache.jena.sparql.lang.sparql_12.ParserSPARQL12Update; public class UpdateParserRegistry { diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQ.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQ.java similarity index 96% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQ.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQ.java index 197effbe88..89887bb3a5 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQ.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQ.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.sparql.lang; +package org.apache.jena.sparql.lang.arq; import java.io.Reader; import java.io.StringReader; @@ -27,7 +27,9 @@ import org.apache.jena.query.QueryException; import org.apache.jena.query.QueryParseException; import org.apache.jena.query.Syntax; import org.apache.jena.shared.JenaException; +import org.apache.jena.sparql.lang.SPARQLParser; import org.apache.jena.sparql.lang.arq.javacc.ARQParser; +import org.apache.jena.sparql.lang.sparql_11.ParserSPARQL11; import org.apache.jena.sparql.syntax.Element; import org.apache.jena.sparql.syntax.Template; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQUpdate.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQUpdate.java similarity index 96% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQUpdate.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQUpdate.java index 1f2a8ac979..e81eb6166d 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQUpdate.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQUpdate.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.sparql.lang; +package org.apache.jena.sparql.lang.arq; import java.io.Reader; @@ -25,6 +25,7 @@ import org.apache.jena.query.QueryException; import org.apache.jena.query.QueryParseException; import org.apache.jena.shared.JenaException; import org.apache.jena.sparql.core.Prologue; +import org.apache.jena.sparql.lang.UpdateParser; import org.apache.jena.sparql.lang.arq.javacc.ARQParser; import org.apache.jena.sparql.modify.UpdateSink; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL10.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParserSPARQL10.java similarity index 97% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL10.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParserSPARQL10.java index e0c7999b3e..7e3f2da58c 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL10.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParserSPARQL10.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.sparql.lang; +package org.apache.jena.sparql.lang.sparql_10; import java.io.Reader; import java.io.StringReader; @@ -27,7 +27,7 @@ import org.apache.jena.query.QueryException; import org.apache.jena.query.QueryParseException; import org.apache.jena.query.Syntax; import org.apache.jena.shared.JenaException; -import org.apache.jena.sparql.lang.sparql_10.SPARQLParser10; +import org.apache.jena.sparql.lang.SPARQLParser; import org.apache.jena.sparql.syntax.Element; import org.apache.jena.sparql.syntax.Template; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11.java similarity index 97% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11.java index fc0b8fea77..21b2ef1451 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.sparql.lang; +package org.apache.jena.sparql.lang.sparql_11; import java.io.Reader; import java.io.StringReader; @@ -27,7 +27,7 @@ import org.apache.jena.query.QueryException; import org.apache.jena.query.QueryParseException; import org.apache.jena.query.Syntax; import org.apache.jena.shared.JenaException; -import org.apache.jena.sparql.lang.sparql_11.SPARQLParser11; +import org.apache.jena.sparql.lang.SPARQLParser; import org.apache.jena.sparql.syntax.Element; import org.apache.jena.sparql.syntax.Template; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11Update.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11Update.java similarity index 96% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11Update.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11Update.java index e76e1503cf..a3e3ecf8d8 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11Update.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11Update.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.sparql.lang; +package org.apache.jena.sparql.lang.sparql_11; import java.io.Reader; @@ -25,7 +25,7 @@ import org.apache.jena.query.QueryException; import org.apache.jena.query.QueryParseException; import org.apache.jena.shared.JenaException; import org.apache.jena.sparql.core.Prologue; -import org.apache.jena.sparql.lang.sparql_11.SPARQLParser11; +import org.apache.jena.sparql.lang.UpdateParser; import org.apache.jena.sparql.modify.UpdateSink; import org.apache.jena.update.UpdateException; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12.java similarity index 97% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12.java index 1cabd774c4..aafaccf582 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.sparql.lang; +package org.apache.jena.sparql.lang.sparql_12; import java.io.Reader; import java.io.StringReader; @@ -27,6 +27,7 @@ import org.apache.jena.query.QueryException; import org.apache.jena.query.QueryParseException; import org.apache.jena.query.Syntax; import org.apache.jena.shared.JenaException; +import org.apache.jena.sparql.lang.SPARQLParser; import org.apache.jena.sparql.lang.sparql_12.javacc.SPARQLParser12; import org.apache.jena.sparql.syntax.Element; import org.apache.jena.sparql.syntax.Template; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12Update.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12Update.java similarity index 96% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12Update.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12Update.java index 249f266613..298a9f15ac 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12Update.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12Update.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.sparql.lang; +package org.apache.jena.sparql.lang.sparql_12; import java.io.Reader; @@ -25,6 +25,7 @@ import org.apache.jena.query.QueryException; import org.apache.jena.query.QueryParseException; import org.apache.jena.shared.JenaException; import org.apache.jena.sparql.core.Prologue; +import org.apache.jena.sparql.lang.UpdateParser; import org.apache.jena.sparql.lang.sparql_12.javacc.SPARQLParser12; import org.apache.jena.sparql.modify.UpdateSink; import org.apache.jena.update.UpdateException;
