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. --- .../instance/predefined/ReplaceDomainWorkflow.java | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java') diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java index 2163d4c..74570a0 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java @@ -1,11 +1,14 @@ package com.c2kernel.lifecycle.instance.predefined; //Java +import java.util.Arrays; + import com.c2kernel.common.InvalidDataException; import com.c2kernel.graph.model.GraphPoint; import com.c2kernel.lifecycle.instance.CompositeActivity; import com.c2kernel.lifecycle.instance.Workflow; import com.c2kernel.lookup.AgentPath; +import com.c2kernel.lookup.ItemPath; import com.c2kernel.process.Gateway; import com.c2kernel.utils.Logger; @@ -18,33 +21,31 @@ public class ReplaceDomainWorkflow extends PredefinedStep } @Override - protected String runActivityLogic(AgentPath agent, int itemSysKey, + protected String runActivityLogic(AgentPath agent, ItemPath item, int transitionID, String requestData) throws InvalidDataException { + Workflow lifeCycle = getWf(); - - Logger.msg(1, "ReplaceDomainWorkflow::request() - Starting "); - + + String[] params = getDataList(requestData); + if (Logger.doLog(3)) Logger.msg(3, "AddC2KObject: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params)); + try { - Logger.msg(8, "ReplaceDomainWorkflow::request() - data:" + getDataList(requestData)[0]); lifeCycle.getChildGraphModel().removeVertex(lifeCycle.search("workflow/domain")); - CompositeActivity domain = (CompositeActivity) Gateway.getMarshaller().unmarshall(getDataList(requestData)[0]); + CompositeActivity domain = (CompositeActivity) Gateway.getMarshaller().unmarshall(params[0]); domain.setName("domain"); lifeCycle.initChild(domain, true, new GraphPoint(150, 100)); // if new workflow, activate it, otherwise refresh the jobs - if (!domain.active) lifeCycle.run(agent, itemSysKey); - else lifeCycle.refreshJobs(itemSysKey); + if (!domain.active) lifeCycle.run(agent, item); + else lifeCycle.refreshJobs(item); // store new wf - Gateway.getStorage().put(itemSysKey, lifeCycle, null); - Logger.msg(1, "ReplaceDomainWorkflow::request() - DONE."); + Gateway.getStorage().put(item, lifeCycle, null); return requestData; } catch (Exception ex) { - Logger.error("ReplaceDomainWorkflow::request() - during unmarshall."); - Logger.error(ex); - throw new InvalidDataException("ReplaceDomainWorkflow::request() - during unmarshall.", null); + throw unknownException(ex); } } } -- cgit v1.2.3