From da731d2bb81666b9c697d9099da632e7dfcdc0f7 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 9 Sep 2014 12:13:21 +0200
Subject: Replaced int sysKey Item identifier with UUID, which is now portable.
 ItemPath objects are now used to identify Items throughout the kernel,
 replacing ints and Integers.

---
 .../lifecycle/instance/predefined/AddNewSlot.java  | 35 ++++++++++++----------
 1 file changed, 19 insertions(+), 16 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java
index e38f71d..257c644 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java
@@ -12,11 +12,15 @@
 package com.c2kernel.lifecycle.instance.predefined;
 
 
+import java.util.Arrays;
+import java.util.UUID;
+
 import com.c2kernel.collection.Aggregation;
 import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.entity.C2KLocalObject;
 import com.c2kernel.lookup.AgentPath;
+import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.persistency.ClusterStorageException;
 import com.c2kernel.process.Gateway;
@@ -50,46 +54,46 @@ public class AddNewSlot extends PredefinedStep
      * 1 - Item Description key (optional) 
      */
     @Override
-	protected String runActivityLogic(AgentPath agent, int itemSysKey,
+	protected String runActivityLogic(AgentPath agent, ItemPath item,
 			int transitionID, String requestData) throws InvalidDataException {
     	
         String collName;
-        int descKey=-1;
+        ItemPath descKey = null;
         Aggregation agg;
 
-        Logger.msg(1, "AddNewSlot::request() - Starting.");
-
         // extract parameters
+        String[] params = getDataList(requestData);
+        if (Logger.doLog(3)) Logger.msg(3, "AddNewSlot: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));
+
         try {
-            String[] params = getDataList(requestData);
             collName = params[0];
-            if (params.length > 1) descKey = Integer.parseInt(params[1]);
+            if (params.length > 1  && params[1].length() > 0) descKey = new ItemPath(UUID.fromString(params[1]));
         } catch (Exception e) {
-            throw new InvalidDataException("Invalid parameters", "");
+            throw new InvalidDataException("AddNewSlot: Invalid parameters "+Arrays.toString(params), "");
         }
 
         // load collection
     	C2KLocalObject collObj;
 		try {
-			collObj = Gateway.getStorage().get(itemSysKey, ClusterStorage.COLLECTION+"/"+collName, null);
+			collObj = Gateway.getStorage().get(item, ClusterStorage.COLLECTION+"/"+collName, null);
 		} catch (ObjectNotFoundException ex) {
-			throw new InvalidDataException("Collection '"+collName+"' not found in this Item", "");
+			throw new InvalidDataException("AddNewSlot: Collection '"+collName+"' not found in this Item", "");
 		} catch (ClusterStorageException ex) {
 			Logger.error(ex);
-			throw new InvalidDataException("Error loading collection '\"+collName+\"': "+ex.getMessage(), "");
+			throw new InvalidDataException("AddNewSlot: Error loading collection '\"+collName+\"': "+ex.getMessage(), "");
 		}
-    	if (!(collObj instanceof Aggregation)) throw new InvalidDataException("AddNewSlot operates on Aggregation collections only.", "");
+    	if (!(collObj instanceof Aggregation)) throw new InvalidDataException("AddNewSlot: AddNewSlot operates on Aggregation collections only.", "");
         agg = (Aggregation)collObj;
 
         // get props
         CastorHashMap props = new CastorHashMap();
         StringBuffer classProps = new StringBuffer();
-        if (descKey > -1) {
+        if (descKey != null) {
         	PropertyDescriptionList propList;
 			try {
 				propList = PropertyUtility.getPropertyDescriptionOutcome(descKey);
 			} catch (ObjectNotFoundException e) {
-				throw new InvalidDataException("Item "+descKey+" does not contain a PropertyDescription outcome to define a slot", "");
+				throw new InvalidDataException("AddNewSlot: Item "+descKey+" does not contain a PropertyDescription outcome to define a slot", "");
 			}
             for (PropertyDescription pd : propList.list) {
 				props.put(pd.getName(), pd.getDefaultValue());
@@ -101,13 +105,12 @@ public class AddNewSlot extends PredefinedStep
         agg.addSlot(props, classProps.toString());
 
 		try {
-            Gateway.getStorage().put(itemSysKey, agg, null);
+            Gateway.getStorage().put(item, agg, null);
         } catch (ClusterStorageException e) {
             Logger.error(e);
-            throw new InvalidDataException("Error storing collection", "");
+            throw new InvalidDataException("AddNewSlot: Error storing collection", "");
         }
 
-        Logger.msg(1, "AddNewSlot::request() - DONE.");
         return requestData;
     }
 }
-- 
cgit v1.2.3