X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2Frequest%2FNodeRequest.java;h=71b66a76ba8ea32f9909e5785b0c89a279fd39d8;hb=fc2c84b45f73743c48cd525e85355362444d67a5;hp=1f12443390ccb044f66ec62a6f1e2055888bda60;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git 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..71b66a76b 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,58 @@ -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 { - - 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 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 errorList = new ArrayList(); - - if(dynamicContent.containsKey(ERRORS)) - errorList.addAll((List)dynamicContent.get(ERRORS)); - - if(staticContent.getJSONField(ERRORS) != null) - errorList.addAll((List)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.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 { + + 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 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 errorList = new ArrayList(); + + if(dynamicContent.containsKey(ERRORS)) + errorList.addAll((List)dynamicContent.get(ERRORS)); + + if(staticContent.getJSONField(ERRORS) != null) + errorList.addAll((List)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; + + } + } \ No newline at end of file