From da731d2bb81666b9c697d9099da632e7dfcdc0f7 Mon Sep 17 00:00:00 2001 From: Andrew Branson 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/agent/RemoveAgent.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java') diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java index 0630f6c..735a17d 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java @@ -6,7 +6,8 @@ import com.c2kernel.common.ObjectCannotBeUpdated; import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.lifecycle.instance.predefined.PredefinedStep; import com.c2kernel.lookup.AgentPath; -import com.c2kernel.lookup.InvalidItemPathException; +import com.c2kernel.lookup.InvalidAgentPathException; +import com.c2kernel.lookup.ItemPath; import com.c2kernel.lookup.RolePath; import com.c2kernel.persistency.ClusterStorageException; import com.c2kernel.process.Gateway; @@ -19,16 +20,16 @@ public class RemoveAgent extends PredefinedStep { } @Override - protected String runActivityLogic(AgentPath agent, int itemSysKey, + protected String runActivityLogic(AgentPath agent, ItemPath itemPath, int transitionID, String requestData) throws InvalidDataException { Logger.msg(1, "RemoveAgent::request() - Starting."); AgentPath targetAgent; try { - targetAgent = new AgentPath(itemSysKey); - } catch (InvalidItemPathException ex) { - throw new InvalidDataException("Could not resolve syskey "+itemSysKey+" as an Agent."); + targetAgent = new AgentPath(itemPath); + } catch (InvalidAgentPathException ex) { + throw new InvalidDataException("Could not resolve "+itemPath+" as an Agent."); } String agentName = targetAgent.getAgentName(); @@ -49,7 +50,7 @@ public class RemoveAgent extends PredefinedStep { //clear out all storages try { - Gateway.getStorage().removeCluster(targetAgent.getSysKey(), "", null); + Gateway.getStorage().removeCluster(targetAgent, "", null); } catch (ClusterStorageException e) { Logger.error(e); throw new InvalidDataException("Error deleting storage for "+agentName, ""); -- cgit v1.2.3