Small changes

integratedmodelling · Nov 12, 2024 · 0a9c7f4 · 0a9c7f4
1 parent 86bac47
commit 0a9c7f4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/klab.core.api/src/main/java/org/integratedmodelling/klab/api/data/KnowledgeGraph.java b/klab.core.api/src/main/java/org/integratedmodelling/klab/api/data/KnowledgeGraph.java
@@ -62,11 +62,13 @@ interface Operation extends Closeable {
          *                             or you'll get an exception.
          * @return
          */
-        long store(RuntimeAsset asset, Scope scope, Object... additionalProperties);
+        long store(RuntimeAsset asset, Object... additionalProperties);
 
         /**
          * Link the two passed assets.
          *
+         * FIXME remove scope when the other is gone
+         *
          * @param source
          * @param destination
          * @param additionalProperties any pair of properties we want overridden. Pass pairs and do it right
@@ -82,6 +84,7 @@ void link(RuntimeAsset source, RuntimeAsset destination,
          * {@link Observation#UNASSIGNED_ID} if the operation failed or was wrongly defined.
          *
          * @return a valid ID or {@link Observation#UNASSIGNED_ID}
+         * @deprecated just run each operation and rollback if unsuccessful
          */
         long run(ContextScope scope);
 
@@ -92,7 +95,7 @@ void link(RuntimeAsset source, RuntimeAsset destination,
          *
          * @param observation
          * @return
-         * @deprecated
+         * @deprecated use store
          */
         Operation add(RuntimeAsset observation);
 
@@ -103,7 +106,7 @@ void link(RuntimeAsset source, RuntimeAsset destination,
          *
          * @param source
          * @return
-         * @deprecated
+         * @deprecated shouldn't be necessary, use update on the main KG
          */
         Operation set(RuntimeAsset source, Object... properties);
 
@@ -120,7 +123,7 @@ void link(RuntimeAsset source, RuntimeAsset destination,
          * @param assetTo
          * @param linkData
          * @return
-         * @deprecated
+         * @deprecated use link above, remove this
          */
         Operation link(RuntimeAsset assetFrom, RuntimeAsset assetTo, DigitalTwin.Relationship relationship,
                        Object... linkData);
@@ -131,6 +134,7 @@ Operation link(RuntimeAsset assetFrom, RuntimeAsset assetTo, DigitalTwin.Relatio
          * @param asset
          * @param linkData
          * @return
+         * @deprecated
          */
         Operation rootLink(RuntimeAsset asset, Object... linkData);
 

diff --git a/...main/java/org/integratedmodelling/klab/services/runtime/neo4j/AbstractKnowledgeGraph.java b/...main/java/org/integratedmodelling/klab/services/runtime/neo4j/AbstractKnowledgeGraph.java
@@ -94,7 +94,7 @@ public Activity getActivity() {
         }
 
         @Override
-        public long store(RuntimeAsset asset, Scope scope, Object... additionalProperties) {
+        public long store(RuntimeAsset asset, Object... additionalProperties) {
             return 0;
         }
 
@@ -275,7 +275,7 @@ public Agent getAgent() {
         }
 
         @Override
-        public long store(RuntimeAsset asset, Scope scope, Object... additionalProperties) {
+        public long store(RuntimeAsset asset, Object... additionalProperties) {
             return 0;
         }