From 7974c042c9c89c63b6d5e455fcbfe24d6eaba30e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jun 2026 13:40:45 +0200 Subject: [PATCH 1/3] chore(deps): update all non-major dependencies (#11) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- cimxml/pom.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/cimxml/pom.xml b/cimxml/pom.xml index b4df37c..e3b7c5d 100644 --- a/cimxml/pom.xml +++ b/cimxml/pom.xml @@ -69,31 +69,31 @@ 21 - 5.5.0 + 5.6.0 - 4.2.2 - 1.3.3 - 7.1.1 + 4.3.0 + 1.4.0 + 7.2.0 - 2.20.0 - 3.18.0 + 2.22.0 + 3.20.0 - 2.0.17 - 2.25.1 + 2.0.18 + 2.26.0 4.13.2 - 5.19.0 + 5.23.0 4.3.0 - 3.14.0 - 3.5.3 - 3.3.1 - 3.11.3 + 3.15.0 + 3.5.6 + 3.4.0 + 3.12.0 3.2.8 0.10.0 From 277091010c55526d5485dfd9d3ba9d3a34e11a61 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jun 2026 14:00:45 +0200 Subject: [PATCH 2/3] chore(deps): update dependency org.apache.jena:jena-arq to v6 (#12) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jan-Hendrik Spahn --- cimxml/pom.xml | 2 +- .../opencgmes/cimxml/graph/FastDeltaGraph.java | 8 ++++---- .../parser/system/StreamCIMXMLToDatasetGraph.java | 15 ++++++++++----- .../opencgmes/cimxml/graph/TestCimProfile16.java | 6 +++--- .../opencgmes/cimxml/graph/TestCimProfile17.java | 6 +++--- .../opencgmes/cimxml/graph/TestCimProfile18.java | 4 ++-- .../parser/TestParserRDFXMLConformity.java | 8 ++++---- 7 files changed, 27 insertions(+), 22 deletions(-) diff --git a/cimxml/pom.xml b/cimxml/pom.xml index e3b7c5d..0f2c307 100644 --- a/cimxml/pom.xml +++ b/cimxml/pom.xml @@ -69,7 +69,7 @@ 21 - 5.6.0 + 6.1.0 4.3.0 diff --git a/cimxml/src/main/java/de/soptim/opencgmes/cimxml/graph/FastDeltaGraph.java b/cimxml/src/main/java/de/soptim/opencgmes/cimxml/graph/FastDeltaGraph.java index 376e2ce..38eda5b 100644 --- a/cimxml/src/main/java/de/soptim/opencgmes/cimxml/graph/FastDeltaGraph.java +++ b/cimxml/src/main/java/de/soptim/opencgmes/cimxml/graph/FastDeltaGraph.java @@ -23,8 +23,8 @@ import org.apache.jena.graph.Triple; import org.apache.jena.graph.compose.Delta; import org.apache.jena.graph.impl.GraphBase; -import org.apache.jena.mem2.GraphMem2Roaring; -import org.apache.jena.mem2.IndexingStrategy; +import org.apache.jena.mem.GraphMemRoaring; +import org.apache.jena.mem.IndexingStrategy; import org.apache.jena.util.iterator.ExtendedIterator; import java.util.Iterator; @@ -44,8 +44,8 @@ public FastDeltaGraph(Graph base) { if (base == null) throw new IllegalArgumentException("base graph must not be null"); this.base = base; - this.additions = new GraphMem2Roaring(IndexingStrategy.LAZY_PARALLEL); - this.deletions = new GraphMem2Roaring(IndexingStrategy.LAZY_PARALLEL); + this.additions = new GraphMemRoaring(IndexingStrategy.LAZY_PARALLEL); + this.deletions = new GraphMemRoaring(IndexingStrategy.LAZY_PARALLEL); } /** diff --git a/cimxml/src/main/java/de/soptim/opencgmes/cimxml/parser/system/StreamCIMXMLToDatasetGraph.java b/cimxml/src/main/java/de/soptim/opencgmes/cimxml/parser/system/StreamCIMXMLToDatasetGraph.java index 3850314..646a958 100644 --- a/cimxml/src/main/java/de/soptim/opencgmes/cimxml/parser/system/StreamCIMXMLToDatasetGraph.java +++ b/cimxml/src/main/java/de/soptim/opencgmes/cimxml/parser/system/StreamCIMXMLToDatasetGraph.java @@ -26,8 +26,8 @@ import org.apache.jena.graph.Graph; import org.apache.jena.graph.Node; import org.apache.jena.graph.Triple; -import org.apache.jena.mem2.GraphMem2Roaring; -import org.apache.jena.mem2.IndexingStrategy; +import org.apache.jena.mem.GraphMemRoaring; +import org.apache.jena.mem.IndexingStrategy; import org.apache.jena.sparql.core.Quad; /** @@ -49,7 +49,7 @@ public class StreamCIMXMLToDatasetGraph implements StreamCIMXML { public StreamCIMXMLToDatasetGraph() { // init default graph for body context currentContext = CimXmlDocumentContext.body; - currentGraph = new GraphMem2Roaring(IndexingStrategy.LAZY_PARALLEL); + currentGraph = new GraphMemRoaring(IndexingStrategy.LAZY_PARALLEL); linkedCIMDatasetGraph = new LinkedCimDatasetGraph(currentGraph); } @@ -77,7 +77,7 @@ private void setCurrentGraphAndCreateIfNecessary(Node graphName, IndexingStrateg if (linkedCIMDatasetGraph.containsGraph(graphName)) { currentGraph = linkedCIMDatasetGraph.getGraph(graphName); } else { - final var newGraph = new GraphMem2Roaring(indexingStrategy); + final var newGraph = new GraphMemRoaring(indexingStrategy); newGraph.getPrefixMapping().setNsPrefixes(currentGraph.getPrefixMapping()); currentGraph = newGraph; linkedCIMDatasetGraph.addGraph(graphName, currentGraph); @@ -104,6 +104,11 @@ public void base(String base) { // Nothing to do } + @Override + public void version(String version) { + // Nothing to do + } + @Override public void prefix(String prefix, String iri) { linkedCIMDatasetGraph.prefixes().add(prefix, iri); @@ -114,7 +119,7 @@ public void prefix(String prefix, String iri) { public void finish() { // Initialize indexes in parallel for all graphs that use LAZY_PARALLEL indexing strategy. linkedCIMDatasetGraph.getGraphs().parallelStream().forEach(graph -> { - if (graph instanceof GraphMem2Roaring roaring && !roaring.isIndexInitialized()) { + if (graph instanceof GraphMemRoaring roaring && !roaring.isIndexInitialized()) { roaring.initializeIndexParallel(); } }); diff --git a/cimxml/src/test/java/de/soptim/opencgmes/cimxml/graph/TestCimProfile16.java b/cimxml/src/test/java/de/soptim/opencgmes/cimxml/graph/TestCimProfile16.java index cfa3d3c..8b21e24 100644 --- a/cimxml/src/test/java/de/soptim/opencgmes/cimxml/graph/TestCimProfile16.java +++ b/cimxml/src/test/java/de/soptim/opencgmes/cimxml/graph/TestCimProfile16.java @@ -19,7 +19,7 @@ package de.soptim.opencgmes.cimxml.graph; import de.soptim.opencgmes.cimxml.CimVersion; -import org.apache.jena.mem2.GraphMem2Roaring; +import org.apache.jena.mem.GraphMemRoaring; import org.apache.jena.riot.RDFParser; import org.junit.Test; @@ -118,7 +118,7 @@ public void parseProfileOntologyHeader() { """; - var graph = new GraphMem2Roaring(); + var graph = new GraphMemRoaring(); RDFParser.create() .source(new StringReader(rdfxml)) @@ -164,7 +164,7 @@ public void parseProfileFileHeaderProfile() { """; - var graph = new GraphMem2Roaring(); + var graph = new GraphMemRoaring(); RDFParser.create() .source(new StringReader(rdfxml)) diff --git a/cimxml/src/test/java/de/soptim/opencgmes/cimxml/graph/TestCimProfile17.java b/cimxml/src/test/java/de/soptim/opencgmes/cimxml/graph/TestCimProfile17.java index 92175f8..8926998 100644 --- a/cimxml/src/test/java/de/soptim/opencgmes/cimxml/graph/TestCimProfile17.java +++ b/cimxml/src/test/java/de/soptim/opencgmes/cimxml/graph/TestCimProfile17.java @@ -19,7 +19,7 @@ package de.soptim.opencgmes.cimxml.graph; import de.soptim.opencgmes.cimxml.CimVersion; -import org.apache.jena.mem2.GraphMem2Roaring; +import org.apache.jena.mem.GraphMemRoaring; import org.apache.jena.riot.RDFParser; import org.junit.Test; @@ -56,7 +56,7 @@ public void parseProfileOntologyHeader() { """; - var graph = new GraphMem2Roaring(); + var graph = new GraphMemRoaring(); RDFParser.create() .source(new StringReader(rdfxml)) @@ -95,7 +95,7 @@ public void parseProfileFileHeaderProfile() { """; - var graph = new GraphMem2Roaring(); + var graph = new GraphMemRoaring(); RDFParser.create() .source(new StringReader(rdfxml)) diff --git a/cimxml/src/test/java/de/soptim/opencgmes/cimxml/graph/TestCimProfile18.java b/cimxml/src/test/java/de/soptim/opencgmes/cimxml/graph/TestCimProfile18.java index a77ea7a..0e25e98 100644 --- a/cimxml/src/test/java/de/soptim/opencgmes/cimxml/graph/TestCimProfile18.java +++ b/cimxml/src/test/java/de/soptim/opencgmes/cimxml/graph/TestCimProfile18.java @@ -19,7 +19,7 @@ package de.soptim.opencgmes.cimxml.graph; import de.soptim.opencgmes.cimxml.CimVersion; -import org.apache.jena.mem2.GraphMem2Roaring; +import org.apache.jena.mem.GraphMemRoaring; import org.apache.jena.riot.RDFParser; import org.junit.Test; @@ -47,7 +47,7 @@ public void parseProfileFileHeaderProfile() { """; - var graph = new GraphMem2Roaring(); + var graph = new GraphMemRoaring(); RDFParser.create() .source(new StringReader(rdfxml)) diff --git a/cimxml/src/test/java/de/soptim/opencgmes/parser/TestParserRDFXMLConformity.java b/cimxml/src/test/java/de/soptim/opencgmes/parser/TestParserRDFXMLConformity.java index 80711d1..abb16c0 100644 --- a/cimxml/src/test/java/de/soptim/opencgmes/parser/TestParserRDFXMLConformity.java +++ b/cimxml/src/test/java/de/soptim/opencgmes/parser/TestParserRDFXMLConformity.java @@ -21,8 +21,8 @@ import de.soptim.opencgmes.cimxml.parser.ReaderCIMXML_StAX_SR; import de.soptim.opencgmes.cimxml.parser.system.StreamCIMXMLToDatasetGraph; import org.apache.jena.graph.Graph; -import org.apache.jena.mem2.GraphMem2Roaring; -import org.apache.jena.mem2.IndexingStrategy; +import org.apache.jena.mem.GraphMemRoaring; +import org.apache.jena.mem.IndexingStrategy; import org.apache.jena.riot.RDFParser; import org.apache.jena.riot.system.PrefixMap; import org.apache.jena.shared.PrefixMapping; @@ -149,7 +149,7 @@ public void testW3cRdfXmlExample() throws Exception { public void parseAndCompare(Path rdfxml, Path nTriples) throws Exception { Objects.requireNonNull(rdfxml); - final var expectedGraph = new GraphMem2Roaring(IndexingStrategy.LAZY); + final var expectedGraph = new GraphMemRoaring(IndexingStrategy.LAZY); final var parser = new ReaderCIMXML_StAX_SR(); final var streamRDF = new StreamCIMXMLToDatasetGraph(); @@ -168,7 +168,7 @@ public void parseAndCompare(Path rdfxml, Path nTriples) throws Exception { assertPrefixMappingEquals(expectedGraph.getPrefixMapping(), streamRDF.getCIMDatasetGraph().prefixes()); if (nTriples != null) { - final var nTriplesGraph = new GraphMem2Roaring(IndexingStrategy.LAZY); + final var nTriplesGraph = new GraphMemRoaring(IndexingStrategy.LAZY); RDFParser.create() .source(nTriples) .lang(org.apache.jena.riot.Lang.NTRIPLES) From 33df58a43c2e28709adab21d9133ea849511343b Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Spahn Date: Fri, 12 Jun 2026 14:57:33 +0200 Subject: [PATCH 3/3] fix(parser): add empty checks for data type maps in CIMXML parsing --- .../opencgmes/cimxml/parser/ParserCIMXML_StAX_SR.java | 6 +++--- .../cimxml/parser/system/StreamCIMXMLToDatasetGraph.java | 0 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 cimxml/src/main/java/de/soptim/opencgmes/cimxml/parser/system/StreamCIMXMLToDatasetGraph.java diff --git a/cimxml/src/main/java/de/soptim/opencgmes/cimxml/parser/ParserCIMXML_StAX_SR.java b/cimxml/src/main/java/de/soptim/opencgmes/cimxml/parser/ParserCIMXML_StAX_SR.java index 329666d..e615471 100644 --- a/cimxml/src/main/java/de/soptim/opencgmes/cimxml/parser/ParserCIMXML_StAX_SR.java +++ b/cimxml/src/main/java/de/soptim/opencgmes/cimxml/parser/ParserCIMXML_StAX_SR.java @@ -524,8 +524,8 @@ else if ( qNameMatches(qName, dmDifferenceModel) ) { RDFXMLparseWarning("No CimProfileRegistry has been provided, so missing datatypes in CIMXML cannot be resolved.", location); } else { currentDataTypeMap = cimProfileRegistry.getHeaderPropertiesAndDatatypes(versionOfCIMXML); - if (currentDataTypeMap == null) { - RDFXMLparseWarning("No header profile has been registered for CIM version " + versionOfCIMXML, location); + if (currentDataTypeMap == null || currentDataTypeMap.isEmpty()) { + RDFXMLparseWarning("No header profile has been registered for CIMXML version " + versionOfCIMXML, location); } currentListOfPropertiesNotInProfile = new HashSet<>(); } @@ -578,7 +578,7 @@ private void initCimModelHeaderCurrentProfileAndCurrentDatatypeMap(Location loca } currentListOfPropertiesNotInProfile = new HashSet<>(); currentDataTypeMap = cimProfileRegistry.getPropertiesAndDatatypes(currentCimProfiles); - if (currentDataTypeMap == null) { + if (currentDataTypeMap == null || currentDataTypeMap.isEmpty()) { RDFXMLparseWarning("The profiles in the model header could not be found in the CimProfileRegistry. Profiles: " + currentCimProfiles.toString(), location); } } diff --git a/cimxml/src/main/java/de/soptim/opencgmes/cimxml/parser/system/StreamCIMXMLToDatasetGraph.java b/cimxml/src/main/java/de/soptim/opencgmes/cimxml/parser/system/StreamCIMXMLToDatasetGraph.java deleted file mode 100644 index e69de29..0000000