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.

---
 .../instance/predefined/AssignItemToSlot.java      | 43 +++++++++++-----------
 1 file changed, 22 insertions(+), 21 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
index 78d4087..724e974 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
@@ -12,6 +12,9 @@
 package com.c2kernel.lifecycle.instance.predefined;
 
 
+import java.util.Arrays;
+import java.util.UUID;
+
 import com.c2kernel.collection.Aggregation;
 import com.c2kernel.collection.AggregationMember;
 import com.c2kernel.collection.MembershipException;
@@ -19,6 +22,7 @@ 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;
@@ -47,67 +51,64 @@ public class AssignItemToSlot extends PredefinedStep
      * 2 - target entity key
      */
     @Override
-	protected String runActivityLogic(AgentPath agent, int itemSysKey,
+	protected String runActivityLogic(AgentPath agent, ItemPath item,
 			int transitionID, String requestData) throws InvalidDataException {
     	
         String collName;
         int slotNo;
-        int sysKey;
+        ItemPath childItem;
         Aggregation agg;
 
-        Logger.msg(1, "AssignItemToSlot::request() - Starting.");
-
-
         // extract parameters
+        String[] params = getDataList(requestData);
+        if (Logger.doLog(3)) Logger.msg(3, "AssignItemToSlot: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));
+
         try {
-            String[] params = getDataList(requestData);
             collName = params[0];
             slotNo = Integer.parseInt(params[1]);
-            sysKey = Integer.parseInt(params[2]);
+            childItem = new ItemPath(UUID.fromString(params[2]));
         } catch (Exception e) {
-            throw new InvalidDataException("Invalid parameters", "");
+            throw new InvalidDataException("AssignItemToSlot: 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("AssignItemToSlot: 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("AssignItemToSlot: Error loading collection '\"+collName+\"': "+ex.getMessage(), "");
 		}
-    	if (!(collObj instanceof Aggregation)) throw new InvalidDataException("AssignItemToSlot operates on Aggregation collections only.", "");
+    	if (!(collObj instanceof Aggregation)) throw new InvalidDataException("AssignItemToSlot: AssignItemToSlot operates on Aggregation collections only.", "");
         agg = (Aggregation)collObj;
 
         // find member and assign entity
         boolean stored = false;
         for (AggregationMember member : agg.getMembers().list) {
             if (member.getID() == slotNo) {
-                if (member.getSystemKey() > -1)
-                    throw new InvalidDataException("Member slot not empty", "");
+                if (member.getItemPath() != null)
+                    throw new InvalidDataException("AssignItemToSlot: Member slot "+slotNo+" not empty", "");
                 try {
-                    member.assignItem(sysKey);
+                    member.assignItem(childItem);
                 } catch (MembershipException e) {
-                    throw new InvalidDataException("Entity "+sysKey+" does not fit in this slot", "");
+                    throw new InvalidDataException("AssignItemToSlot: Item "+childItem+" does not fit in slot "+slotNo, "");
                 }
                 stored = true;
                 break;
             }
         }
         if (!stored) {
-            throw new InvalidDataException("Member slot "+slotNo+" not found.", "");
+            throw new InvalidDataException("AssignItemToSlot: Member slot "+slotNo+" not found.", "");
         }
 
 
 		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", "");
+            unknownException(e);
         }
-        Logger.msg(1, "AssignItemToSlot::request() - DONE.");
         return requestData;
     }
 }
-- 
cgit v1.2.3