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 d26e4959bd1a50512dae44f538fff1233038fa47 Author: Andy Seaborne <[email protected]> AuthorDate: Thu Jan 15 20:40:41 2026 +0000 Rename to DataLoader.streamRDF() from .stream() --- .../src/main/java/org/apache/jena/tdb2/loader/DataLoader.java | 6 +++++- .../src/main/java/org/apache/jena/tdb2/loader/LoaderFactory.java | 8 ++++---- .../main/java/org/apache/jena/tdb2/loader/base/LoaderBase.java | 4 ++-- .../main/java/org/apache/jena/tdb2/loader/basic/LoaderBasic.java | 2 +- .../main/java/org/apache/jena/tdb2/loader/main/LoaderMain.java | 2 +- .../org/apache/jena/tdb2/loader/sequential/LoaderSequential.java | 2 +- .../test/java/org/apache/jena/tdb2/loader/AbstractTestLoader.java | 2 +- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/DataLoader.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/DataLoader.java index 251c63c48e..e5d3ab2cc2 100644 --- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/DataLoader.java +++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/DataLoader.java @@ -128,8 +128,12 @@ public interface DataLoader { */ default public void load(String ... filenames) { load(Arrays.asList(filenames)); } + /** @deprecated Use {@link #streamRDF()}. */ + @Deprecated + public default StreamRDF stream() { return streamRDF(); } + /** Send data to the loader by {@link StreamRDF} */ - public StreamRDF stream(); + public StreamRDF streamRDF(); /** Return count of triples sent to the loader and added. This is not a count of unique triples. */ public long countTriples(); diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/LoaderFactory.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/LoaderFactory.java index 48d79b80e6..b3ba91513a 100644 --- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/LoaderFactory.java +++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/LoaderFactory.java @@ -69,7 +69,7 @@ public class LoaderFactory { * other quad data is discarded. * <p> * For other behaviours, use {@link #basicLoader(DatasetGraph, MonitorOutput)} - * and wrap the {@link StreamRDF} from {@link DataLoader#stream()}) with the required + * and wrap the {@link StreamRDF} from {@link DataLoader#streamRDF()}) with the required * transformation. * * @see #basicLoader(DatasetGraph, MonitorOutput) @@ -107,7 +107,7 @@ public class LoaderFactory { * other quad data is discarded. * <p> * For other behaviours, use {@link #basicLoader(DatasetGraph, MonitorOutput)} - * and wrap the {@link StreamRDF} from {@link DataLoader#stream()}) with the required + * and wrap the {@link StreamRDF} from {@link DataLoader#streamRDF()}) with the required * transformation. * * @see #sequentialLoader(DatasetGraph, MonitorOutput) @@ -148,7 +148,7 @@ public class LoaderFactory { * other quad data is discarded. * <p> * For other behaviours, use {@link #phasedLoader(DatasetGraph, MonitorOutput)} - * and wrap the {@link StreamRDF} from {@link DataLoader#stream()}) with the required + * and wrap the {@link StreamRDF} from {@link DataLoader#streamRDF()}) with the required * transformation. * * @see #phasedLoader(DatasetGraph, MonitorOutput) @@ -188,7 +188,7 @@ public class LoaderFactory { * other quad data is discarded. * <p> * For other behaviours, use {@link #parallelLoader(DatasetGraph, MonitorOutput)} - * and wrap the {@link StreamRDF} from {@link DataLoader#stream()}) with the required + * and wrap the {@link StreamRDF} from {@link DataLoader#streamRDF()}) with the required * transformation. * * @see #parallelLoader(DatasetGraph, MonitorOutput) diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/LoaderBase.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/LoaderBase.java index 2faada9987..aeea1c6ab8 100644 --- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/LoaderBase.java +++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/LoaderBase.java @@ -126,7 +126,7 @@ public abstract class LoaderBase implements DataLoader { ProgressMonitor monitor = createProgressMonitor(output); monitor.startMessage("Start: "+label); monitor.start(); - LoaderOps.inputStream(stream(), input, syntax, monitor); + LoaderOps.inputStream(streamRDF(), input, syntax, monitor); monitor.finish(); monitor.finishMessage("Finished: "+label); } @@ -139,7 +139,7 @@ public abstract class LoaderBase implements DataLoader { protected void loadOne(String filename, ProgressMonitor monitor) { String label = LoaderOps.label(filename); monitor.setLabel(label); - LoaderOps.inputFile(stream(), filename, monitor); + LoaderOps.inputFile(streamRDF(), filename, monitor); } protected void outputSummary(long totalElapsed) { diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/basic/LoaderBasic.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/basic/LoaderBasic.java index 7163849ea6..138a6e5033 100644 --- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/basic/LoaderBasic.java +++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/basic/LoaderBasic.java @@ -53,7 +53,7 @@ public class LoaderBasic extends LoaderBase { } @Override - public StreamRDF stream() { + public StreamRDF streamRDF() { return dest; } diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/LoaderMain.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/LoaderMain.java index 2d2d40b9c8..3718d50d44 100644 --- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/LoaderMain.java +++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/LoaderMain.java @@ -231,7 +231,7 @@ public class LoaderMain extends LoaderBase implements DataLoader { } @Override - public StreamRDF stream() { + public StreamRDF streamRDF() { return stream; } diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/sequential/LoaderSequential.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/sequential/LoaderSequential.java index 423ab76417..0fe0a9399c 100644 --- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/sequential/LoaderSequential.java +++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/sequential/LoaderSequential.java @@ -107,7 +107,7 @@ public class LoaderSequential extends LoaderBase { } @Override - public StreamRDF stream() { + public StreamRDF streamRDF() { return stream; } diff --git a/jena-tdb2/src/test/java/org/apache/jena/tdb2/loader/AbstractTestLoader.java b/jena-tdb2/src/test/java/org/apache/jena/tdb2/loader/AbstractTestLoader.java index 1c08f503d1..3e555cefa9 100644 --- a/jena-tdb2/src/test/java/org/apache/jena/tdb2/loader/AbstractTestLoader.java +++ b/jena-tdb2/src/test/java/org/apache/jena/tdb2/loader/AbstractTestLoader.java @@ -131,7 +131,7 @@ public abstract class AbstractTestLoader { DatasetGraph dsg = fresh(); DataLoader loader = maker.apply(dsg, null); loader.startBulk(); - RDFParser.source(DIR + "data-1.nq").parse(loader.stream()); + RDFParser.source(DIR + "data-1.nq").parse(loader.streamRDF()); loader.finishBulk(); Txn.executeRead(dsg, ()->{ assertTrue(dsg.getDefaultGraph().isEmpty());
