Merge "Log an error if there are two resources with the same GUID."
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Thu, 11 Oct 2018 12:52:33 +0000 (12:52 +0000)
committerGerrit Code Review <gerrit2@simantics>
Thu, 11 Oct 2018 12:52:33 +0000 (12:52 +0000)
bundles/org.simantics.structural2/META-INF/MANIFEST.MF
bundles/org.simantics.structural2/src/org/simantics/structural2/StructuralRVIResolver.java

index ad3c50facba1a792dce116d2f575564a223e1b18..00ff7f7245c9be47bb6a3a7cf82e97a86e2d5011 100644 (file)
@@ -10,7 +10,8 @@ Require-Bundle: org.simantics.structural.ontology;bundle-version="1.0.0",
  org.simantics.issues.common;bundle-version="1.1.0",
  org.simantics.simulator.variable;bundle-version="1.0.0",
  org.simantics.scl.osgi;bundle-version="1.0.0",
- org.simantics;bundle-version="1.0.0"
+ org.simantics;bundle-version="1.0.0",
+ org.slf4j.api;bundle-version="1.7.25"
 Export-Package: org.simantics.structural2,
  org.simantics.structural2.modelingRules,
  org.simantics.structural2.procedural,
index 672edfca65c4bfc6995654fdd6b935e4cdb886e4..ec6b583617fcdd6c42af134845d829838944980a 100644 (file)
@@ -8,6 +8,7 @@ import org.simantics.databoard.binding.Binding;
 import org.simantics.datatypes.literal.GUID;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
+import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.adapter.Instances;
 import org.simantics.db.layer0.exception.MissingVariableException;
@@ -21,8 +22,11 @@ import org.simantics.db.layer0.variable.Variables;
 import org.simantics.layer0.Layer0;
 import org.simantics.simulation.ontology.SimulationResource;
 import org.simantics.structural.stubs.StructuralResource2;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class StructuralRVIResolver extends StandardRVIResolver {
+    private static final Logger LOGGER = LoggerFactory.getLogger(StructuralRVIResolver.class);
 
     protected boolean isRVIBase(ReadGraph graph, Variable variable) throws DatabaseException {
         if (Variables.isContext(graph, variable)) return true;
@@ -118,7 +122,21 @@ public class StructuralRVIResolver extends StandardRVIResolver {
                Instances instances = graph.adapt(Layer0.getInstance(graph).Entity, Instances.class);
                GUID guid = new GUID(part.mostSignificant, part.leastSignificant);
                Collection<Resource> queryResult = instances.find(graph, indexRoot, "GUID:"+guid.indexString());
-               if(queryResult.size() != 1) return null;
+               if(queryResult.size() != 1) {
+                   if(queryResult.size() > 1) {
+                       StringBuilder b = new StringBuilder();
+                       boolean first = true;
+                       for(Resource r : queryResult) {
+                           if(first)
+                               first = false;
+                           else
+                               b.append(", ");
+                           b.append(NameUtils.getURIOrSafeNameInternal(graph, r));
+                       }
+                       LOGGER.error("Found {} resources with the same GUID {}: {}.", queryResult.size(), guid, b);
+                   }
+                   return null;
+               }
                return getRVIPath(graph, variable, queryResult.iterator().next());
        }