fix: Association IRI violation checks (RDFA-449)

backend/src/main/java/org/rdfarchitect/database/GraphIdentifier.java

@@ -17,12 +17,4 @@
 
 package org.rdfarchitect.database;
 
-import lombok.Data;
-
-@Data
-public class GraphIdentifier {
-
-    private final String datasetName;
-
-    private final String graphUri;
-}
+public record GraphIdentifier(String datasetName, String graphUri) {}

backend/src/main/java/org/rdfarchitect/database/inmemory/InMemoryDatabaseAdapter.java

@@ -60,14 +60,14 @@ public void createGraph(GraphIdentifier graphIdentifier, Graph graph) {
         database.create(graphIdentifier, graph);
         var currentPrefixMapping =
                 new PrefixMappingImpl()
-                        .setNsPrefixes(database.getPrefixMapping(graphIdentifier.getDatasetName()))
+                        .setNsPrefixes(database.getPrefixMapping(graphIdentifier.datasetName()))
                         .setNsPrefixes(graph.getPrefixMapping());
-        database.setPrefixMapping(graphIdentifier.getDatasetName(), currentPrefixMapping);
+        database.setPrefixMapping(graphIdentifier.datasetName(), currentPrefixMapping);
     }
 
     @Override
     public void createEmptyGraph(GraphIdentifier graphIdentifier) {
-        var datasetName = graphIdentifier.getDatasetName();
+        var datasetName = graphIdentifier.datasetName();
         var isNewDataset = !database.listDatasets().contains(datasetName);
         database.create(graphIdentifier, GraphFactory.createDefaultGraph());
         if (isNewDataset) {
@@ -77,7 +77,7 @@ public void createEmptyGraph(GraphIdentifier graphIdentifier) {
                             .setNsPrefixes(PrefixMapping.Standard)
                             .setNsPrefix(CIM_PREFIX, CIM.namespace)
                             .setNsPrefix(CIMS_PREFIX, CIMS.namespace);
-            database.setPrefixMapping(graphIdentifier.getDatasetName(), prefixMapping);
+            database.setPrefixMapping(graphIdentifier.datasetName(), prefixMapping);
         }
     }
 

backend/src/main/java/org/rdfarchitect/database/inmemory/SessionDataStoreImpl.java

@@ -91,8 +91,8 @@ public List<String> listDatasets() {
 
     @Override
     public GraphRewindableWithUUIDs begin(GraphIdentifier graphIdentifier, TxnType txnType) {
-        final String datasetName = graphIdentifier.getDatasetName();
-        final String graphUri = graphIdentifier.getGraphUri();
+        final String datasetName = graphIdentifier.datasetName();
+        final String graphUri = graphIdentifier.graphUri();
         lock.lock();
         try {
             createDataset(datasetName);
@@ -106,10 +106,10 @@ public GraphRewindableWithUUIDs begin(GraphIdentifier graphIdentifier, TxnType t
     public GraphWithContext getGraphWithContext(GraphIdentifier graphIdentifier) {
         lock.lock();
         try {
-            createDataset(graphIdentifier.getDatasetName());
+            createDataset(graphIdentifier.datasetName());
             return graphCollections
-                    .get(graphIdentifier.getDatasetName())
-                    .getGraphWithContext(graphIdentifier.getGraphUri());
+                    .get(graphIdentifier.datasetName())
+                    .getGraphWithContext(graphIdentifier.graphUri());
         } finally {
             lock.unlock();
         }
@@ -119,19 +119,19 @@ public GraphWithContext getGraphWithContext(GraphIdentifier graphIdentifier) {
     public void create(GraphIdentifier graphIdentifier, Graph newGraph) {
         lock.lock();
         try {
-            createDataset(graphIdentifier.getDatasetName());
+            createDataset(graphIdentifier.datasetName());
             graphCollections
-                    .get(graphIdentifier.getDatasetName())
-                    .create(graphIdentifier.getGraphUri(), newGraph);
+                    .get(graphIdentifier.datasetName())
+                    .create(graphIdentifier.graphUri(), newGraph);
         } finally {
             lock.unlock();
         }
     }
 
     @Override
     public void remove(GraphIdentifier graphIdentifier) {
-        final String datasetName = graphIdentifier.getDatasetName();
-        final String graphUri = graphIdentifier.getGraphUri();
+        final String datasetName = graphIdentifier.datasetName();
+        final String graphUri = graphIdentifier.graphUri();
         lock.lock();
         try {
             if (!graphCollections.containsKey(datasetName)) {
@@ -148,8 +148,8 @@ public void remove(GraphIdentifier graphIdentifier) {
 
     @Override
     public boolean containsGraph(GraphIdentifier graphIdentifier) {
-        final String datasetName = graphIdentifier.getDatasetName();
-        final String graphUri = graphIdentifier.getGraphUri();
+        final String datasetName = graphIdentifier.datasetName();
+        final String graphUri = graphIdentifier.graphUri();
         lock.lock();
         try {
             return graphCollections.containsKey(datasetName)
@@ -197,8 +197,8 @@ public void setPrefixMapping(String datasetName, PrefixMapping newPrefixes) {
     @Override
     public void writeToDatabase(
             DatabaseConnection databaseConnection, GraphIdentifier graphIdentifier) {
-        final String datasetName = graphIdentifier.getDatasetName();
-        final String graphUri = graphIdentifier.getGraphUri();
+        final String datasetName = graphIdentifier.datasetName();
+        final String graphUri = graphIdentifier.graphUri();
         lock.lock();
         GraphRewindableWithUUIDs graph = null;
         try {
@@ -327,8 +327,8 @@ private Graph fetchGraph(
 
     @Override
     public void undo(GraphIdentifier graphIdentifier) {
-        final String datasetName = graphIdentifier.getDatasetName();
-        final String graphUri = graphIdentifier.getGraphUri();
+        final String datasetName = graphIdentifier.datasetName();
+        final String graphUri = graphIdentifier.graphUri();
         lock.lock();
         try {
             assertThatDatasetExists(datasetName);
@@ -340,8 +340,8 @@ public void undo(GraphIdentifier graphIdentifier) {
 
     @Override
     public void redo(GraphIdentifier graphIdentifier) {
-        final String datasetName = graphIdentifier.getDatasetName();
-        final String graphUri = graphIdentifier.getGraphUri();
+        final String datasetName = graphIdentifier.datasetName();
+        final String graphUri = graphIdentifier.graphUri();
         lock.lock();
         try {
             assertThatDatasetExists(datasetName);
@@ -353,8 +353,8 @@ public void redo(GraphIdentifier graphIdentifier) {
 
     @Override
     public boolean canUndo(GraphIdentifier graphIdentifier) {
-        final String datasetName = graphIdentifier.getDatasetName();
-        final String graphUri = graphIdentifier.getGraphUri();
+        final String datasetName = graphIdentifier.datasetName();
+        final String graphUri = graphIdentifier.graphUri();
         lock.lock();
         try {
             assertThatDatasetExists(datasetName);
@@ -366,8 +366,8 @@ public boolean canUndo(GraphIdentifier graphIdentifier) {
 
     @Override
     public boolean canRedo(GraphIdentifier graphIdentifier) {
-        final String datasetName = graphIdentifier.getDatasetName();
-        final String graphUri = graphIdentifier.getGraphUri();
+        final String datasetName = graphIdentifier.datasetName();
+        final String graphUri = graphIdentifier.graphUri();
         lock.lock();
         try {
             assertThatDatasetExists(datasetName);
@@ -379,8 +379,8 @@ public boolean canRedo(GraphIdentifier graphIdentifier) {
 
     @Override
     public void restore(GraphIdentifier graphIdentifier, UUID versionId) {
-        final String datasetName = graphIdentifier.getDatasetName();
-        final String graphUri = graphIdentifier.getGraphUri();
+        final String datasetName = graphIdentifier.datasetName();
+        final String graphUri = graphIdentifier.graphUri();
         lock.lock();
         try {
             assertThatGraphExists(graphIdentifier);
@@ -443,8 +443,8 @@ private void assertThatDatasetExists(String datasetName) {
      * @throws DataAccessException if the dataset or graph does not exist.
      */
     private void assertThatGraphExists(GraphIdentifier graphIdentifier) {
-        final String datasetName = graphIdentifier.getDatasetName();
-        final String graphUri = graphIdentifier.getGraphUri();
+        final String datasetName = graphIdentifier.datasetName();
+        final String graphUri = graphIdentifier.graphUri();
         assertThatDatasetExists(datasetName);
         if (!graphCollections.get(datasetName).containsGraph(graphUri)) {
             throw new DataAccessException(

backend/src/main/java/org/rdfarchitect/database/snapshots/FusekiSnapshotAdapter.java

@@ -110,11 +110,11 @@ private void transferGraph(RDFConnection conn, GraphIdentifier graphIdentifier)
             var copiedGraph = GraphUtils.deepCopy(graph);
             copiedGraph
                     .getPrefixMapping()
-                    .setNsPrefixes(databasePort.getPrefixMapping(graphIdentifier.getDatasetName()));
+                    .setNsPrefixes(databasePort.getPrefixMapping(graphIdentifier.datasetName()));
 
             removeUUIDs(copiedGraph);
 
-            conn.put(graphIdentifier.getGraphUri(), ModelFactory.createModelForGraph(copiedGraph));
+            conn.put(graphIdentifier.graphUri(), ModelFactory.createModelForGraph(copiedGraph));
         } catch (Exception e) {
             throw new FusekiServerException(e.getMessage());
         } finally {

backend/src/main/java/org/rdfarchitect/models/cim/data/CIMObjectFactory.java

@@ -158,7 +158,7 @@ public static CIMAssociation createInverseCIMAssociation(
             QuerySolution associationQuerySolution) {
         var parser = new CIMQuerySolutionParser(associationQuerySolution);
         return CIMAssociation.builder()
-                .uuid(parser.getUUID(CIMQueryVars.UUID))
+                .uuid(parser.getUUID(CIMQueryVars.Inverse.UUID))
                 .uri(parser.getURI(CIMQueryVars.INVERSE_ROLE_NAME))
                 .label(parser.getLabel(CIMQueryVars.Inverse.LABEL))
                 .multiplicity(parser.getMultiplicity(CIMQueryVars.Inverse.MULTIPLICITY))

backend/src/main/java/org/rdfarchitect/models/cim/queries/select/CIMQueries.java

@@ -127,6 +127,7 @@ public SelectBuilder getAssociationPairsQuery(
                 .appendDomainQuery(REQUIRED)
                 .appendCommentQuery(OPTIONAL)
                 // inverse
+                .appendInverseUuidQuery(REQUIRED)
                 .appendInverseLabelQuery(REQUIRED)
                 .appendInverseMultiplicityQuery(REQUIRED)
                 .appendInverseAssociationUsedQuery(REQUIRED)

backend/src/main/java/org/rdfarchitect/models/cim/queries/select/CIMQueryBuilder.java

@@ -334,6 +334,17 @@ public CIMQueryBuilder appendPackageQuery(Mode mode) {
 
     // inverse
 
+    /**
+     * Appends query for the uuid of objects connected via "cims:inverseRoleName" as {@link
+     * CIMQueryVars Inverse.UUID}.
+     *
+     * @param mode Whether the result of this is mode.
+     * @return {@link CIMQueryBuilder this}
+     */
+    public CIMQueryBuilder appendInverseUuidQuery(Mode mode) {
+        return appendInverseSingleQuery(RDFA.uuid, CIMQueryVars.Inverse.UUID, mode);
+    }
+
     /**
      * Appends query for the label of objects connected via "cims:inverseRoleName" as {@link
      * CIMQueryVars Inverse.LABEL}.

backend/src/main/java/org/rdfarchitect/models/search/SearchResultObjectFactory.java

@@ -131,8 +131,8 @@ public static SearchResult createSearchResult(
         }
 
         return SearchResult.builder()
-                .datasetName(graphIdentifier.getDatasetName())
-                .graphUri(graphIdentifier.getGraphUri())
+                .datasetName(graphIdentifier.datasetName())
+                .graphUri(graphIdentifier.graphUri())
                 .uri(parser.getURI(CIMQueryVars.URI))
                 .uuid(parser.getUUID(CIMQueryVars.UUID))
                 .label(parser.getLabel(CIMQueryVars.LABEL))

backend/src/main/java/org/rdfarchitect/services/ChangeLogService.java

@@ -45,8 +45,8 @@ public class ChangeLogService implements ChangeLogUseCase {
     private GraphChangeLog getChangeLog(GraphIdentifier graphIdentifier) {
         return changeLogs
                 .getOrDefault(SessionContext.getSessionId(), Collections.emptyMap())
-                .getOrDefault(graphIdentifier.getDatasetName(), Collections.emptyMap())
-                .getOrDefault(graphIdentifier.getGraphUri(), new GraphChangeLog());
+                .getOrDefault(graphIdentifier.datasetName(), Collections.emptyMap())
+                .getOrDefault(graphIdentifier.graphUri(), new GraphChangeLog());
     }
 
     @Override
@@ -56,8 +56,8 @@ public void recordChange(GraphIdentifier graphIdentifier, ChangeLogEntry entry)
                         .computeIfAbsent(
                                 SessionContext.getSessionId(), _ -> new ConcurrentHashMap<>())
                         .computeIfAbsent(
-                                graphIdentifier.getDatasetName(), _ -> new ConcurrentHashMap<>())
-                        .computeIfAbsent(graphIdentifier.getGraphUri(), _ -> new GraphChangeLog());
+                                graphIdentifier.datasetName(), _ -> new ConcurrentHashMap<>())
+                        .computeIfAbsent(graphIdentifier.graphUri(), _ -> new GraphChangeLog());
         graphChangeLog.addEntry(entry);
     }