Improve JCR data model

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.jcr / src / main / java / org / argeo / slc / jcr / execution / JcrAgent.java

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java
index b75b04a08850cb5d9f6d2a0ed319987e1ccfeee3..69bdba76758bd04fc2819fb3047413f774e41bb8 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java
@@ -14,36 +14,48 @@ import org.argeo.slc.core.runtime.DefaultAgent;
 import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.jcr.SlcJcrConstants;
+import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.runtime.SlcAgent;
 import org.argeo.slc.runtime.SlcAgentFactory;
 
-/** SLC agent synchronizing with a JCR repository. */
-public class JcrAgent extends DefaultAgent implements SlcAgentFactory {
+/** SLC VM agent synchronizing with a JCR repository. */
+public class JcrAgent extends DefaultAgent implements SlcAgentFactory, SlcNames {
        private Session session;
 
+       /** only one agent per VM is currently supported */
+       private final String agentNodeName = "default";
+
        /*
         * LIFECYCLE
         */
        protected String initAgentUuid() {
                try {
                        Node vmAgentFactoryNode = JcrUtils.mkdirs(session,
-                                       SlcJcrConstants.VM_AGENT_FACTORY_PATH);
-                       vmAgentFactoryNode.addMixin(SlcTypes.SLC_AGENT_PROXY);
-                       if (!vmAgentFactoryNode.hasNodes()) {
+                                       SlcJcrConstants.VM_AGENT_FACTORY_PATH,
+                                       SlcTypes.SLC_AGENT_FACTORY);
+                       if (!vmAgentFactoryNode.hasNode(agentNodeName)) {
                                String uuid = UUID.randomUUID().toString();
-                               vmAgentFactoryNode.addNode(uuid);
+                               Node agentNode = vmAgentFactoryNode.addNode(agentNodeName,
+                                               SlcTypes.SLC_AGENT);
+                               agentNode.setProperty(SLC_UUID, uuid);
                        }
                        session.save();
-
-                       return vmAgentFactoryNode.getNodes().nextNode().getName();
+                       return vmAgentFactoryNode.getNode(agentNodeName)
+                                       .getProperty(SLC_UUID).getString();
                } catch (RepositoryException e) {
-                       throw new SlcException("Cannot find JCR agent UUID", e);
-               } finally {
                        JcrUtils.discardQuietly(session);
+                       throw new SlcException("Cannot find JCR agent UUID", e);
                }
        }
 
+       public void dispose() {
+
+       }
+
+       /*
+        * SLC AGENT
+        */
        @Override
        protected ProcessThread createProcessThread(
                        ExecutionModulesManager modulesManager, ExecutionProcess process) {
@@ -51,14 +63,13 @@ public class JcrAgent extends DefaultAgent implements SlcAgentFactory {
                                (JcrExecutionProcess) process);
        }
 
-       public void dispose() {
-
-       }
-
        /*
         * SLC AGENT FACTORY
         */
        public SlcAgent getAgent(String uuid) {
+               if (!uuid.equals(getAgentUuid()))
+                       throw new SlcException("Internal UUID " + getAgentUuid()
+                                       + " is different from argument UUID " + uuid);
                return this;
        }
 
@@ -67,10 +78,21 @@ public class JcrAgent extends DefaultAgent implements SlcAgentFactory {
        }
 
        /*
-        * BEAN METHODS
+        * UTILITIES
+        */
+       public String getNodePath() {
+               return SlcJcrConstants.VM_AGENT_FACTORY_PATH + '/' + getAgentNodeName();
+       }
+
+       /*
+        * BEAN
         */
        public void setSession(Session session) {
                this.session = session;
        }
 
+       public String getAgentNodeName() {
+               return agentNodeName;
+       }
+
 }