From 9c5d6e82b5ce733cf23e4317e3bafaa42c2221ba Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 1 Oct 2014 21:09:06 +0200
Subject: Collection version support, stored as a new final component of the
 Collection path. Null version implies "last".

---
 .../agent/CreateAgentFromDescription.java          | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'src/main/java/com/c2kernel/lifecycle/instance/predefined/agent')

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java
index 780c82e..26856e1 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java
@@ -39,8 +39,11 @@ public class CreateAgentFromDescription extends CreateItemFromDescription
 
 	/**
 	 * Params:
-	 * <ol><li>1: new Agent name</li>
-	 * <li>2...: Roles to assign to the agent. Must already exist.
+	 * <ol><li>New Agent name</li>
+	 * <li>Description version to use</li>
+	 * <li>Comma-delimited Role names to assign to the agent. Must already exist.</li>
+	 * <li>Initial properties to set in the new Agent</li>
+	 * </ol>
 	 * @see com.c2kernel.lifecycle.instance.predefined.item.CreateItemFromDescription#runActivityLogic(com.c2kernel.lookup.AgentPath, int, int, java.lang.String)
 	 */
 	@Override
@@ -49,19 +52,20 @@ public class CreateAgentFromDescription extends CreateItemFromDescription
 		
 		String[] input = getDataList(requestData);
 		String newName = input[0];
+		String descVer = input[1];
+		String roles = input[2];
 		PropertyArrayList initProps = 
-				input.length > 1?getInitProperties(input[1]):new PropertyArrayList();
+				input.length > 3 ? getInitProperties(input[3]):new PropertyArrayList();
 				
 		Logger.msg(1, "CreateAgentFromDescription::request() - Starting.");
 
         try {
         	
-        	if (input.length < 2)
-        		throw new InvalidDataException("Agent should have at least one Role defined on creation");
         	// check if given roles exist
-        	for(int i=1; i<input.length; i++) {
-            	RolePath thisRole = Gateway.getLookup().getRolePath(input[i]);
-            	if (!thisRole.exists()) throw new InvalidDataException("Role "+input[i]+" does not exist");
+        	String[] roleArr = roles.split(",");
+        	for(int i=0; i<roleArr.length; i++) {
+            	RolePath thisRole = Gateway.getLookup().getRolePath(roleArr[i]);
+            	if (!thisRole.exists()) throw new InvalidDataException("Role "+roleArr[i]+" does not exist");
             }
         	
             // check if the path is already taken
@@ -90,9 +94,9 @@ public class CreateAgentFromDescription extends CreateItemFromDescription
 
             newAgent.initialise(
                 agent.getSystemKey(),
-            	Gateway.getMarshaller().marshall(getNewProperties(itemPath, initProps, newName, agent)),
-            	Gateway.getMarshaller().marshall(getNewWorkflow(itemPath)),
-            	Gateway.getMarshaller().marshall(getNewCollections(itemPath))
+            	Gateway.getMarshaller().marshall(getNewProperties(itemPath, descVer, initProps, newName, agent)),
+            	Gateway.getMarshaller().marshall(getNewWorkflow(itemPath, descVer)),
+            	Gateway.getMarshaller().marshall(getNewCollections(itemPath, descVer))
             	);
             
             // add roles if given
-- 
cgit v1.2.3