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 f45e4147b8fa6c20e83efeda44e51471e9385004 Author: Andy Seaborne <[email protected]> AuthorDate: Fri Nov 14 21:04:52 2025 +0000 Remove deprecated classes, methods and constants (jena-rdfconnection) --- .../apache/jena/rdfconnection/RDFConnection.java | 3 - .../jena/rdfconnection/RDFConnectionFactory.java | 240 ---------------- .../jena/rdfconnection/RDFConnectionLocal.java | 317 --------------------- .../rdfconnection/RDFDatasetAccessConnection.java | 21 +- .../jena/rdfconnection/RDFDatasetConnection.java | 73 +++-- .../jena/rdfconnection/SparqlQueryConnection.java | 1 - .../jena/rdfconnection/SparqlUpdateConnection.java | 1 - 7 files changed, 46 insertions(+), 610 deletions(-) diff --git a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnection.java b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnection.java index 12d5eb4d0c..105ca161a5 100644 --- a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnection.java +++ b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnection.java @@ -64,8 +64,6 @@ import org.apache.jena.update.UpdateRequest; * Not all implementations may implement all operations. * See the implementation notes for details. * - * @see RDFConnectionFactory - * @see RDFConnectionLocal * @see RDFConnectionRemote * @see RDFConnectionRemoteBuilder * @see SparqlQueryConnection @@ -84,7 +82,6 @@ public interface RDFConnection extends * * @param dataset * @return RDFConnection - * @see RDFConnectionLocal */ public static RDFConnection connect(Dataset dataset) { return adapt(RDFLinkDatasetBuilder.newBuilder().dataset(dataset.asDatasetGraph()).build()); diff --git a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionFactory.java b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionFactory.java deleted file mode 100644 index 87820a89c0..0000000000 --- a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionFactory.java +++ /dev/null @@ -1,240 +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.rdfconnection; - -import static org.apache.jena.rdfconnection.LibRDFConn.adapt; - -import org.apache.jena.query.Dataset; -import org.apache.jena.rdflink.RDFLinkDatasetBuilder; -import org.apache.jena.sys.JenaSystem; - -/** - * Factory for RDF connections, both local and remote. - * <p> - * Applications should use {@code RDFConnection#connect(Dataset)} or {@code RDFConnection#connect(URL)} - * for most cases and {@link RDFConnectionRemote#service} for detailed setup of an HTTP connection - * to remote SPARQL endpoints. - * </p> - * <p> - * For complex remote (HTTP) connections, see - * {@link RDFConnectionRemote#newBuilder} for detailed control. - * This class provides only some common cases. - * </p> - * @deprecated See individual static methods for replacements. - */ -@Deprecated(forRemoval = true) -public class RDFConnectionFactory { - static { JenaSystem.init(); } - - /** - * Create a connection to a remote location by URL. - * This is the URL for the dataset. - * This call assumes all SPARQL operations (query, update GSP) are available at the given endpoint. - * <a href="http://jena.apache.org/documentation/fuseki2";>Fuseki</a> - * supports this arrangement. - * <p> - * Use {@link RDFConnectionRemote#service} for to set different names for different operations. - * - * @param destination - * @return RDFConnection - * @deprecated Use {@link RDFConnection#connect} - */ - @Deprecated - public static RDFConnection connect(String destination) { - return RDFConnectionRemote.service(destination).build(); - } - - /** Create a connection specifying the URLs of the service. - * <p> - * A common setup used by Fuseki is: - * <ul> - * <li>SPARQL Query endpoint : "sparql" - * <li>SPARQL Update endpoint : "update" - * <li>SPARQL Graph Store Protocol : "data" - * </ul> - * These are the default names in <a href="http://jena.apache.org/documentation/fuseki2";>Fuseki</a> - * Other names can be specified using {@link #connect(String, String, String, String)} - * - * @deprecated Use {@link RDFConnectionRemote#service} and set the endpoints. - * <pre> - * RDFConnectionRemote.newBuilder() - * .queryEndpoint(queryServiceEndpoint) - * .updateEndpoint(updateServiceEndpoint) - * .gspEndpoint(graphStoreProtocolEndpoint) - * .build(); - * </pre> - * - * @param queryServiceEndpoint - * @param updateServiceEndpoint - * @param graphStoreProtocolEndpoint - * @return RDFConnection - */ - @Deprecated - public static RDFConnection connect(String queryServiceEndpoint, - String updateServiceEndpoint, - String graphStoreProtocolEndpoint) { - return RDFConnectionRemote.newBuilder() - .queryEndpoint(queryServiceEndpoint) - .updateEndpoint(updateServiceEndpoint) - .gspEndpoint(graphStoreProtocolEndpoint) - .build(); - } - - /** Create a connection to a remote location by URL. - * This is the URL for the dataset. - * Each service is then specified by a URL which is relative to the {@code datasetURL}. - * - * @deprecated Use {@link RDFConnectionRemote#service} and set the endpoints. - * - * <pre> - * RDFConnectionRemote.service(datasetURL) - * .queryEndpoint(queryServiceEndpoint) - * .updateEndpoint(updateServiceEndpoint) - * .gspEndpoint(graphStoreProtocolEndpoint) - * .build(); - * </pre> - * - * @param datasetURL - * @param queryServiceEndpoint - * @param updateServiceEndpoint - * @param graphStoreProtocolEndpoint - * @return RDFConnection - */ - @Deprecated - public static RDFConnection connect(String datasetURL, - String queryServiceEndpoint, - String updateServiceEndpoint, - String graphStoreProtocolEndpoint) { - return RDFConnectionRemote.newBuilder() - .destination(datasetURL) - .queryEndpoint(queryServiceEndpoint) - .updateEndpoint(updateServiceEndpoint) - .gspEndpoint(graphStoreProtocolEndpoint) - .build(); - } - - /** Make a remote RDFConnection to the URL, with user and password for the client access using basic auth. - * Use with care – basic auth over plain HTTP reveals the password on the network. - * @param URL - * @param user - * @param password - * @return RDFConnection - * - * @deprecated Use {@link RDFConnection#connectPW}. - */ - @Deprecated - public static RDFConnection connectPW(String URL, String user, String password) { - return RDFConnection.connectPW(URL, user, password); - } - - /** - * Connect to a local (same JVM) dataset. - * The default isolation is {@code NONE}. - * See {@link #connect(Dataset, Isolation)} to select an isolation mode. - * - * @deprecated Use {@link RDFConnection#connect(Dataset)}. - * - * @param dataset - * @return RDFConnection - * @see RDFConnectionLocal - */ - @Deprecated - public static RDFConnection connect(Dataset dataset) { - return RDFConnection.connect(dataset); - } - - /** - * Connect to a local (same JVM) dataset. - * <p> - * Multiple levels of {@link Isolation} are provided, The default {@code COPY} level makes a local - * {@link RDFConnection} behave like a remote connection. - * See <a href="https://jena.apache.org/documentation/rdfconnection/";>the documentation for more details.</a> - * <ul> - * <li>{@code COPY} – {@code Model}s and {@code Dataset}s are copied. - * This is most like a remote connection. - * <li>{@code READONLY} – Read-only wrappers are added but changes to - * the underlying model or dataset will be seen. - * <li>{@code NONE} (default) – Changes to the returned {@code Model}s or {@code Dataset}s act on the original object. - * </ul> - * - * @param dataset - * @param isolation - * @return RDFConnection - * - * @deprecated Use {@link RDFConnection#connect(Dataset, Isolation)}. - */ - @Deprecated - public static RDFConnection connect(Dataset dataset, Isolation isolation) { - return adapt(RDFLinkDatasetBuilder.newBuilder().dataset(dataset.asDatasetGraph()).isolation(isolation).build()); - } - - /** Create a connection to a remote Fuseki server by URL. - * This is the URL for the dataset. - * <p> - * A {@link RDFConnectionFuseki} is an {@link RDFConnection} that: - * <ul> - * <li>provides round-trip of blank nodes between this application and the server - * <li>uses the more efficient <a href="http://jena.apache.org/documentation/io/rdf-binary.html";>RDF Thrift binary</a> format. - * </ul> - * - * This factory call assumes the names of services as: - * <ul> - * <li>SPARQL Query endpoint : "sparql" - * <li>SPARQL Update endpoint : "update" - * <li>SPARQL Graph Store Protocol : "data" - * </ul> - * These are the default names in <a href="http://jena.apache.org/documentation/fuseki2";>Fuseki</a> - * Other names can be specified using {@link #connectFuseki(String, String, String, String)}. - * - * @param destination - * @return RDFConnectionFuseki - * - * @deprecated Use {@link RDFConnectionFuseki#service}. - */ - @Deprecated - public static RDFConnectionFuseki connectFuseki(String destination) { - return (RDFConnectionFuseki)RDFConnectionFuseki.create().destination(destination).build(); - } - - /** Create a connection to a remote Fuseki server by URL. - * This is the URL for the dataset. - * - * Each service is then specified by a URL which is relative to the {@code datasetURL}. - * - * @param datasetURL - * @param queryServiceEndpoint - * @param updateServiceEndpoint - * @param graphStoreProtocolEndpoint - * @return RDFConnectionFuseki - * - * @deprecated Use {@link RDFConnectionFuseki#service}. - */ - @Deprecated - public static RDFConnectionFuseki connectFuseki(String datasetURL, - String queryServiceEndpoint, - String updateServiceEndpoint, - String graphStoreProtocolEndpoint) { - return (RDFConnectionFuseki)RDFConnectionFuseki.create() - .destination(datasetURL) - .queryEndpoint(queryServiceEndpoint) - .updateEndpoint(updateServiceEndpoint) - .gspEndpoint(graphStoreProtocolEndpoint) - .build(); - } -} diff --git a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionLocal.java b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionLocal.java deleted file mode 100644 index 0ad9613f53..0000000000 --- a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionLocal.java +++ /dev/null @@ -1,317 +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.rdfconnection; - -import java.util.Objects; - -import org.apache.jena.atlas.lib.InternalErrorException; -import org.apache.jena.graph.Graph; -import org.apache.jena.query.*; -import org.apache.jena.rdf.model.Model; -import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.riot.Lang; -import org.apache.jena.riot.RDFDataMgr; -import org.apache.jena.riot.RDFLanguages; -import org.apache.jena.sparql.ARQException; -import org.apache.jena.sparql.core.DatasetGraph; -import org.apache.jena.sparql.core.DatasetGraphFactory; -import org.apache.jena.sparql.core.DatasetGraphReadOnly; -import org.apache.jena.sparql.graph.GraphReadOnly; -import org.apache.jena.system.Txn; -import org.apache.jena.update.UpdateExecution; -import org.apache.jena.update.UpdateExecutionBuilder; -import org.apache.jena.update.UpdateExecutionFactory; -import org.apache.jena.update.UpdateRequest; - -/** - * Implement of {@link RDFConnection} over a {@link Dataset} in the same JVM. - * <p> - * Multiple levels of {@link Isolation} are provided. The default {@code COPY} level makes a local - * {@link RDFConnection} that behaves like a remote connection. This should be the normal use in - * testing. - * <ul> - * <li>{@code COPY} – {@code Model}s and {@code Dataset}s are copied. - * This is most like a remote connection. - * <li>{@code READONLY} – Read-only wrappers are added but changes to - * the underlying model or dataset will be seen. - * <li>{@code NONE} (default) – Changes to the returned {@code Model}s or {@code Dataset}s act on the original object. - * </ul> - * @deprecated Use {@link RDFConnection#connect(Dataset)}. - */ -@Deprecated(forRemoval = true) -public class RDFConnectionLocal implements RDFConnection { - private ThreadLocal<Boolean> transactionActive = ThreadLocal.withInitial(()->false); - - private Dataset dataset; - private final Isolation isolation; - - public RDFConnectionLocal(Dataset dataset) { - this(dataset, Isolation.NONE); - } - - public RDFConnectionLocal(Dataset dataset, Isolation isolation) { - this.dataset = dataset; - this.isolation = isolation; - } - - @Override - public QueryExecution query(Query query) { - checkOpen(); - // There is no point doing this in a transaction because the QueryExecution is passed out. - return QueryExecutionFactory.create(query, dataset); - } - - @Override - public QueryExecutionBuilder newQuery() { - return QueryExecution.create().dataset(dataset); - } - - @Override - public void update(UpdateRequest update) { - checkOpen(); - Txn.executeWrite(dataset, ()->UpdateExecutionFactory.create(update, dataset).execute() ); - } - - @Override - public UpdateExecutionBuilder newUpdate() { - return UpdateExecution.create().dataset(dataset); - } - - @Override - public void load(String graph, String file) { - checkOpen(); - doPutPost(graph, file, false); - } - - @Override - public void load(String file) { - checkOpen(); - doPutPost(null, file, false); - } - - @Override - public void load(String graphName, Model model) { - checkOpen(); - Txn.executeWrite(dataset, ()-> { - Model modelDst = modelFor(graphName); - modelDst.add(model); - }); - } - - @Override - public void load(Model model) { - load(null, model); - } - - @Override - public Model fetch(String graph) { - return Txn.calculateRead(dataset, ()-> { - Model model = modelFor(graph); - return isolate(model); - }); - } - - @Override - public Model fetch() { - checkOpen(); - return fetch(null); - } - - @Override - public void put(String file) { - checkOpen(); - doPutPost(null, file, true); - } - - @Override - public void put(String graph, String file) { - checkOpen(); - doPutPost(graph, file, true); - } - - @Override - public void put(Model model) { - put(null, model); - } - - @Override - public void put(String graphName, Model model) { - checkOpen(); - Txn.executeWrite(dataset, ()-> { - Model modelDst = modelFor(graphName); - modelDst.removeAll(); - modelDst.add(model); - }); - } - - @Override - public void delete(String graph) { - checkOpen(); - Txn.executeWrite(dataset,() ->{ - if ( LibRDFConn.isDefault(graph) ) - dataset.getDefaultModel().removeAll(); - else - dataset.removeNamedModel(graph); - }); - } - - @Override - public void delete() { - checkOpen(); - delete(null); - } - - private void doPutPost(String graph, String file, boolean replace) { - Objects.requireNonNull(file); - Lang lang = RDFLanguages.filenameToLang(file); - - Txn.executeWrite(dataset,() ->{ - if ( RDFLanguages.isTriples(lang) ) { - Model model = LibRDFConn.isDefault(graph) ? dataset.getDefaultModel() : dataset.getNamedModel(graph); - if ( replace ) - model.removeAll(); - RDFDataMgr.read(model, file); - } - else if ( RDFLanguages.isQuads(lang) ) { - if ( replace ) - dataset.asDatasetGraph().clear(); - // Try to POST to the dataset. - RDFDataMgr.read(dataset, file); - } - else - throw new ARQException("Not an RDF format: "+file+" (lang="+lang+")"); - }); - } - - /** - * Called to isolate a model from its storage. - * Must be inside a transaction. - */ - private Model isolate(Model model) { - switch(isolation) { - case COPY: { - // Copy - the model is completely isolated from the original. - Model m2 = ModelFactory.createDefaultModel(); - m2.add(model); - return m2; - } - case READONLY : { - Graph g = new GraphReadOnly(model.getGraph()); - return ModelFactory.createModelForGraph(g); - } - case NONE : - return model; - } - throw new InternalErrorException(); - } - - /** - * Called to isolate a dataset from it's storage. - * Must be inside a transaction. - */ - private Dataset isolate(Dataset dataset) { - switch(isolation) { - case COPY: { - DatasetGraph dsg2 = DatasetGraphFactory.create(); - dataset.asDatasetGraph().find().forEachRemaining(q -> dsg2.add(q) ); - return DatasetFactory.wrap(dsg2); - } - case READONLY : { - DatasetGraph dsg = new DatasetGraphReadOnly(dataset.asDatasetGraph()); - return DatasetFactory.wrap(dsg); - } - case NONE : - return dataset; - } - throw new InternalErrorException(); - } - - private Model modelFor(String graph) { - if ( LibRDFConn.isDefault(graph) ) - return dataset.getDefaultModel(); - return dataset.getNamedModel(graph); - } - - @Override - public Dataset fetchDataset() { - checkOpen(); - return Txn.calculateRead(dataset,() -> isolate(dataset)); - } - - @Override - public void loadDataset(String file) { - checkOpen(); - Txn.executeWrite(dataset,() ->{ - RDFDataMgr.read(dataset, file); - }); - } - - @Override - public void loadDataset(Dataset srcDataset) { - checkOpen(); - srcDataset.executeRead(()->{ - dataset.executeWrite(()->{ - srcDataset.asDatasetGraph().find().forEachRemaining((q)->this.dataset.asDatasetGraph().add(q)); - }); - }); - } - - @Override - public void putDataset(String file) { - checkOpen(); - Txn.executeWrite(dataset,() ->{ - dataset.asDatasetGraph().clear(); - RDFDataMgr.read(dataset, file); - }); - } - - @Override - public void putDataset(Dataset dataset) { - Txn.executeWrite(dataset,() ->{ - this.dataset = isolate(dataset); - }); - } - - @Override - public void close() { - dataset = null; - } - - @Override - public boolean isClosed() { - return dataset == null; - } - - private void checkOpen() { - if ( dataset == null ) - throw new ARQException("closed"); - } - - @Override public void begin() { dataset.begin(); } - @Override public void begin(TxnType txnType) { dataset.begin(txnType); } - @Override public void begin(ReadWrite mode) { dataset.begin(mode); } - @Override public boolean promote(Promote promote) { return dataset.promote(promote); } - @Override public void commit() { dataset.commit(); } - @Override public void abort() { dataset.abort(); } - @Override public boolean isInTransaction() { return dataset.isInTransaction(); } - @Override public void end() { dataset.end(); } - @Override public ReadWrite transactionMode() { return dataset.transactionMode(); } - @Override public TxnType transactionType() { return dataset.transactionType(); } -} - diff --git a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFDatasetAccessConnection.java b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFDatasetAccessConnection.java index a6ba626fed..10e4eb233f 100644 --- a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFDatasetAccessConnection.java +++ b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFDatasetAccessConnection.java @@ -28,30 +28,29 @@ import org.apache.jena.sparql.core.Transactional; * * @see RDFDatasetConnection * @see RDFConnection - * @see RDFConnectionFactory - */ + */ public interface RDFDatasetAccessConnection extends Transactional, AutoCloseable { /** Fetch a named graph. - * This is SPARQL Graph Store Protocol HTTP GET or equivalent. - * + * This is SPARQL Graph Store Protocol HTTP GET or equivalent. + * * @param graphName URI string for the graph name (null or "default" for the default graph) * @return Model */ public Model fetch(String graphName); - + /** Fetch the default graph. - * This is SPARQL Graph Store Protocol HTTP GET or equivalent. + * This is SPARQL Graph Store Protocol HTTP GET or equivalent. * @return Model */ public Model fetch(); - - /** Fetch the contents of the dataset */ + + /** Fetch the contents of the dataset */ public Dataset fetchDataset(); - + /** Test whether this connection is closed or not */ public boolean isClosed(); - - /** Close this connection. Use with try-resource. */ + + /** Close this connection. Use with try-resource. */ @Override public void close(); } diff --git a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFDatasetConnection.java b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFDatasetConnection.java index 7be5dc1e9c..0f746c2ac1 100644 --- a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFDatasetConnection.java +++ b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFDatasetConnection.java @@ -24,91 +24,90 @@ import org.apache.jena.sparql.core.Transactional; /** * SPARQL Graph Store Protocol and whole dataset access. - * This adds the write operations. The read operations are defined by {@link RDFDatasetAccessConnection}. - * + * This adds the write operations. The read operations are defined by {@link RDFDatasetAccessConnection}. + * * @see RDFDatasetAccessConnection * @see RDFConnection - * @see RDFConnectionFactory - */ + */ public interface RDFDatasetConnection extends RDFDatasetAccessConnection, Transactional, AutoCloseable { /** Load (add, append) RDF into a named graph in a dataset. - * This is SPARQL Graph Store Protocol HTTP POST or equivalent. - * + * This is SPARQL Graph Store Protocol HTTP POST or equivalent. + * * @param graphName Graph name (null or "default" for the default graph) * @param file File of the data. */ public void load(String graphName, String file); - + /** Load (add, append) RDF into the default graph of a dataset. - * This is SPARQL Graph Store Protocol HTTP POST or equivalent. - * + * This is SPARQL Graph Store Protocol HTTP POST or equivalent. + * * @param file File of the data. */ public void load(String file); /** Load (add, append) RDF into a named graph in a dataset. - * This is SPARQL Graph Store Protocol HTTP POST or equivalent. - * + * This is SPARQL Graph Store Protocol HTTP POST or equivalent. + * * @param graphName Graph name (null or "default" for the default graph) * @param model Data. */ public void load(String graphName, Model model); - + /** Load (add, append) RDF into the default graph of a dataset. - * This is SPARQL Graph Store Protocol HTTP POST or equivalent. - * + * This is SPARQL Graph Store Protocol HTTP POST or equivalent. + * * @param model Data. */ public void load(Model model); /** Set the contents of a named graph of a dataset. - * Any existing data is lost. - * This is SPARQL Graph Store Protocol HTTP PUT or equivalent. + * Any existing data is lost. + * This is SPARQL Graph Store Protocol HTTP PUT or equivalent. * * @param graphName Graph name (null or "default" for the default graph) * @param file File of the data. */ public void put(String graphName, String file); - + /** Set the contents of the default graph of a dataset. - * Any existing data is lost. - * This is SPARQL Graph Store Protocol HTTP PUT or equivalent. - * + * Any existing data is lost. + * This is SPARQL Graph Store Protocol HTTP PUT or equivalent. + * * @param file File of the data. */ public void put(String file); - + /** Set the contents of a named graph of a dataset. - * Any existing data is lost. - * This is SPARQL Graph Store Protocol HTTP PUT or equivalent. + * Any existing data is lost. + * This is SPARQL Graph Store Protocol HTTP PUT or equivalent. * * @param graphName Graph name (null or "default" for the default graph) * @param model Data. */ public void put(String graphName, Model model); - + /** Set the contents of the default graph of a dataset. - * Any existing data is lost. - * This is SPARQL Graph Store Protocol HTTP PUT or equivalent. - * + * Any existing data is lost. + * This is SPARQL Graph Store Protocol HTTP PUT or equivalent. + * * @param model Data. */ public void put( Model model); - + /** * Delete a graph from the dataset. * Null or "default" means the default graph, which is cleared, not removed. - * + * * @param graphName */ public void delete(String graphName); /** * Remove all data from the default graph. - */ + */ public void delete(); - + /* Load (add, append) RDF triple or quad data into a dataset. Triples wil go into the default graph. * This is not a SPARQL Graph Store Protocol operation. * It is an HTTP POST equivalent to the dataset. @@ -127,7 +126,7 @@ public interface RDFDatasetConnection extends RDFDatasetAccessConnection, Transa * It is an HTTP PUT equivalent to the dataset. */ public void putDataset(String file); - + /* Set RDF triple or quad data as the dataset contents. * Triples will go into the default graph, quads in named graphs. * This is not a SPARQL Graph Store Protocol operation. @@ -137,14 +136,14 @@ public interface RDFDatasetConnection extends RDFDatasetAccessConnection, Transa // /** Clear the dataset - remove all named graphs, clear the default graph. */ // public void clearDataset(); - - + + /** Test whether this connection is closed or not */ @Override public boolean isClosed(); - - /** Close this connection. Use with try-resource. */ - @Override + + /** Close this connection. Use with try-resource. */ + @Override public void close(); } diff --git a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/SparqlQueryConnection.java b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/SparqlQueryConnection.java index 9f0afc5b18..410529882f 100644 --- a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/SparqlQueryConnection.java +++ b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/SparqlQueryConnection.java @@ -27,7 +27,6 @@ import org.apache.jena.sparql.core.Transactional; /** SPARQL Query Operations on a connection. * * @see RDFConnection - * @see RDFConnectionFactory */ public interface SparqlQueryConnection extends Transactional, AutoCloseable { diff --git a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/SparqlUpdateConnection.java b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/SparqlUpdateConnection.java index 990e19e272..e9cd14abe7 100644 --- a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/SparqlUpdateConnection.java +++ b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/SparqlUpdateConnection.java @@ -26,7 +26,6 @@ import org.apache.jena.update.UpdateRequest; /** SPARQL Update Operations on a connection. * * @see RDFConnection - * @see RDFConnectionFactory */ public interface SparqlUpdateConnection extends Transactional, AutoCloseable {
