X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2Frequest%2FNodeRequest.java;h=98bd0fb821dc0286238da7a310c85149247633a0;hp=1f12443390ccb044f66ec62a6f1e2055888bda60;hb=de86e08dadfd2733d23b3fe2817b27ae835d9f3b;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java
index 1f1244339..98bd0fb82 100644
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java
@@ -1,58 +1,76 @@
-package org.simantics.document.server.request;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.simantics.db.ReadGraph;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.request.VariableRead;
-import org.simantics.db.layer0.variable.Variable;
-import org.simantics.document.server.JSONObject;
-
-public class NodeRequest extends VariableRead<JSONObject> {
-    
-    public static String ERRORS = "Errors";
-
-	public NodeRequest(Variable node) {
-		super(node);
-	}
-
-	@SuppressWarnings("unchecked")
-    @Override
-	public JSONObject perform(ReadGraph graph) throws DatabaseException {
-		
-		long s = System.nanoTime();
-
-	    JSONObject staticContent = graph.syncRequest(new NodeRequestStatic(variable));
-	    Map<String,Object> dynamicContent = graph.syncRequest(new NodeRequestDynamic(variable));
-	    
-	    if(dynamicContent.isEmpty()) {
-	        return staticContent;
-	    }
-	    
-        JSONObject result = staticContent.clone();
-        result.add(dynamicContent);
-
-        if(dynamicContent.containsKey(ERRORS) || staticContent.getJSONField(ERRORS) != null) {
-            ArrayList<String> errorList = new ArrayList<String>();
-            
-            if(dynamicContent.containsKey(ERRORS))
-                errorList.addAll((List<String>)dynamicContent.get(ERRORS));
-            
-            if(staticContent.getJSONField(ERRORS) != null)
-                errorList.addAll((List<String>)staticContent.getJSONField(ERRORS));
-            
-            result.addJSONField(ERRORS, errorList);
-        }
-        
-        if(DocumentRequest.PROFILE) {
-        	long dura = System.nanoTime()-s;
-        	System.err.println("NodeRequest " + System.identityHashCode(this) + " " + variable.getURI(graph) + " in " + 1e-6*dura + "ms." + result);
-        }
-        
-	    return result;
-
-	}		
-
+package org.simantics.document.server.request;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.request.VariableRead;
+import org.simantics.db.layer0.variable.Variable;
+import org.simantics.document.server.DocumentServerUtils.AttributesRequest;
+import org.simantics.document.server.JSONObject;
+import org.simantics.utils.datastructures.Pair;
+
+public class NodeRequest extends VariableRead<JSONObject> {
+
+    public static final String ERRORS = "Errors";
+
+	public NodeRequest(Variable node) {
+		super(node);
+	}
+
+	@SuppressWarnings("unchecked")
+    @Override
+	public JSONObject perform(ReadGraph graph) throws DatabaseException {
+
+		long s = System.nanoTime();
+
+		Pair<JSONObject, Collection<Variable>> attribs = graph.syncRequest(new AttributesRequest(variable));
+
+	    JSONObject staticContent = attribs.first;
+	    if(attribs.second.isEmpty()) {
+
+	        if(DocumentRequest.PROFILE) {
+	        	long dura = System.nanoTime()-s;
+	            if(dura > DocumentRequest.PROFILE_THRESHOLD_NODEREQUEST * 1e3) {
+	            	System.err.println("NodeRequest " + System.identityHashCode(this) + " in " + 1e-6*dura + "ms. " + variable.getURI(graph));
+	            }
+	        }
+
+	    	return staticContent;
+	    }
+
+	    Map<String,Object> dynamicContent = graph.syncRequest(new NodeRequestDynamic(variable));
+	    if(dynamicContent.isEmpty()) {
+	        return staticContent;
+	    }
+
+        JSONObject result = staticContent.clone();
+        result.add(dynamicContent);
+
+        if(dynamicContent.containsKey(ERRORS) || staticContent.getJSONField(ERRORS) != null) {
+            ArrayList<String> errorList = new ArrayList<>();
+
+            if(dynamicContent.containsKey(ERRORS))
+                errorList.addAll((List<String>)dynamicContent.get(ERRORS));
+
+            if(staticContent.getJSONField(ERRORS) != null)
+                errorList.addAll((List<String>)staticContent.getJSONField(ERRORS));
+
+            result.addJSONField(ERRORS, errorList);
+        }
+
+        if(DocumentRequest.PROFILE) {
+            long dura = System.nanoTime()-s;
+            if(dura > DocumentRequest.PROFILE_THRESHOLD_NODEREQUEST * 1e3) {
+                System.err.println("NodeRequest " + System.identityHashCode(this) + " in " + 1e-6*dura + "ms. " + variable.getURI(graph));
+            }
+        }
+        
+        return result;
+
+    }
+
 }
\ No newline at end of file