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/ClearSlot.java   | 26 ++++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ClearSlot.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ClearSlot.java
index 772f62e..c6bb654 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ClearSlot.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ClearSlot.java
@@ -12,11 +12,14 @@
 package com.c2kernel.lifecycle.instance.predefined;
 
 
+import java.util.Arrays;
+
 import com.c2kernel.collection.Aggregation;
 import com.c2kernel.collection.AggregationMember;
 import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.common.ObjectNotFoundException;
 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;
@@ -44,40 +47,40 @@ public class ClearSlot extends PredefinedStep
      * 1 - slot number
      */
     @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;
         Aggregation agg;
 
-        Logger.msg(1, "ClearSlot::request() - Starting.");
-
         // extract parameters
+        String[] params = getDataList(requestData);
+        if (Logger.doLog(3)) Logger.msg(3, "ClearSlot: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));
+
         try {
-            String[] params = getDataList(requestData);
             collName = params[0];
             slotNo = Integer.parseInt(params[1]);
         } catch (Exception e) {
-            throw new InvalidDataException("Invalid parameters", "");
+            throw new InvalidDataException("ClearSlot: Invalid parameters "+Arrays.toString(params), "");
         }
 
         // load collection
         try {
-            agg = (Aggregation)Gateway.getStorage().get(itemSysKey, ClusterStorage.COLLECTION+"/"+collName, null);
+            agg = (Aggregation)Gateway.getStorage().get(item, ClusterStorage.COLLECTION+"/"+collName, null);
 		} catch (ObjectNotFoundException ex) {
-			throw new InvalidDataException("Collection '"+collName+"' not found in this Item", "");
+			throw new InvalidDataException("ClearSlot: 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("ClearSlot: Error loading collection '"+collName+"': "+ex.getMessage(), "");
 		}
 
         // find member and clear
         boolean stored = false;
         for (AggregationMember member : agg.getMembers().list) {
             if (member.getID() == slotNo) {
-                if (member.getSystemKey() > -1)
-                    throw new InvalidDataException("Member slot already empty", "");
+                if (member.getItemPath() != null)
+                    throw new InvalidDataException("ClearSlot: Member slot "+slotNo+" already empty", "");
                 member.clearItem();
                 stored = true;
                 break;
@@ -89,12 +92,11 @@ public class ClearSlot extends PredefinedStep
 
 
 		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", "");
         }
-        Logger.msg(1, "ClearSlot::request() - DONE.");
         return requestData;
     }
 }
-- 
cgit v1.2.3