From d43164830403245353080f5d6f838ed9f56d9a35 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 18 Nov 2013 09:48:03 +0100
Subject: 3.0-SNAPSHOT (Will be first open source version) New StateMachine
 desc IssueID #28

---
 .../instance/predefined/AddC2KObject.java          | 46 +++++++---------------
 1 file changed, 15 insertions(+), 31 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
index df0c62f..2f0cf95 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
@@ -11,12 +11,9 @@
 
 package com.c2kernel.lifecycle.instance.predefined;
 
-import com.c2kernel.common.AccessRightsException;
 import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.InvalidTransitionException;
 import com.c2kernel.entity.C2KLocalObject;
 import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.lookup.EntityPath;
 import com.c2kernel.process.Gateway;
 import com.c2kernel.utils.Logger;
 
@@ -37,38 +34,25 @@ public class AddC2KObject extends PredefinedStep
 
 	//requestdata is xmlstring
     @Override
-	public void request(  AgentPath agent, int transitionID, String requestData)
-        throws AccessRightsException,
-               InvalidTransitionException,
-               InvalidDataException
-    {
+	protected String runActivityLogic(AgentPath agent, int itemSysKey,
+			int transitionID, String requestData) throws InvalidDataException {
 
         Logger.msg(1, "AddC2KObject::request() - Starting.");
 
-        checkAccessRights(agent);
-        EntityPath entityPath = getItemEntityPath();
-
-        if (entityPath!=null)
+        try
         {
-            try
-            {
-
-                Logger.msg(5, "AddC2KObject::request() - data:" + getDataList(requestData)[0]);
 
-				C2KLocalObject obj = (C2KLocalObject)Gateway.getMarshaller().unmarshall(getDataList(requestData)[0]);
-				Gateway.getStorage().put(entityPath.getSysKey(), obj, null );
-				sendEventStoreOutcome(transitionID, requestData, agent);
-            }
-            catch( Exception ex )
-            {
-                Logger.error("AddC2KObject::request() - during unmarshall.");
-                Logger.error(ex);
-                throw new InvalidDataException(ex.toString(), "");
-            }
-
-            Logger.msg(1, "AddC2KObject::request() - DONE.");
+            Logger.msg(5, "AddC2KObject::request() - data:" + getDataList(requestData)[0]);
+			C2KLocalObject obj = (C2KLocalObject)Gateway.getMarshaller().unmarshall(getDataList(requestData)[0]);
+			Gateway.getStorage().put(itemSysKey, obj, null );
+	        Logger.msg(1, "AddC2KObject::request() - DONE.");
+			return requestData;
+        }
+        catch( Exception ex )
+        {
+            Logger.error("AddC2KObject::request() - during unmarshall.");
+            Logger.error(ex);
+            throw new InvalidDataException(ex.toString(), "");
         }
-        else
-            throw new InvalidDataException("EntityPath is null.", "");
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3