From 8c6dac06240e3b931ea5e69b8ef5398c02be2bbd Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 17 Jun 2014 09:46:03 +0200 Subject: Separate property, workflow and collection instantiation into separate methods in the instantiation predefined steps so they can be used independently. --- .../agent/CreateAgentFromDescription.java | 102 +++------------------ 1 file changed, 13 insertions(+), 89 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java') diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java index 90b9d45..78ef5a9 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java @@ -11,31 +11,15 @@ package com.c2kernel.lifecycle.instance.predefined.agent; -import java.util.ArrayList; - -import com.c2kernel.collection.Collection; -import com.c2kernel.collection.CollectionArrayList; -import com.c2kernel.collection.CollectionDescription; -import com.c2kernel.collection.CollectionMember; import com.c2kernel.common.AccessRightsException; import com.c2kernel.common.InvalidDataException; import com.c2kernel.common.ObjectAlreadyExistsException; -import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.entity.CorbaServer; -import com.c2kernel.entity.TraceableEntity; -import com.c2kernel.lifecycle.CompositeActivityDef; -import com.c2kernel.lifecycle.instance.predefined.PredefinedStep; +import com.c2kernel.entity.agent.ActiveEntity; +import com.c2kernel.lifecycle.instance.predefined.item.CreateItemFromDescription; import com.c2kernel.lookup.AgentPath; import com.c2kernel.lookup.DomainPath; -import com.c2kernel.lookup.ItemPath; -import com.c2kernel.persistency.ClusterStorage; -import com.c2kernel.persistency.TransactionManager; import com.c2kernel.process.Gateway; -import com.c2kernel.property.Property; -import com.c2kernel.property.PropertyArrayList; -import com.c2kernel.property.PropertyDescriptionList; -import com.c2kernel.property.PropertyUtility; -import com.c2kernel.utils.LocalObjectLoader; import com.c2kernel.utils.Logger; /************************************************************************** @@ -43,7 +27,7 @@ import com.c2kernel.utils.Logger; * @author $Author: abranson $ $Date: 2005/10/13 08:13:58 $ * @version $Revision: 1.47 $ **************************************************************************/ -public class CreateAgentFromDescription extends PredefinedStep +public class CreateAgentFromDescription extends CreateItemFromDescription { public CreateAgentFromDescription() { @@ -58,82 +42,23 @@ public class CreateAgentFromDescription extends PredefinedStep String[] input = getDataList(requestData); String newName = input[0]; String domPath = input[1]; - CompositeActivityDef wfDef; String wfDefName = null; int wfDefVer = -1; if (input.length > 2) // override wf wfDefName = input[2]; - PropertyArrayList props = new PropertyArrayList(); - Logger.msg(1, "AddNewItem::request() - Starting."); - TransactionManager storage = Gateway.getStorage(); + Logger.msg(1, "CreateAgentFromDescription::request() - Starting."); try { // check if the path is already taken DomainPath context = new DomainPath(new DomainPath(domPath), newName); Logger.debug(8,"context "+context.getSysKey()+" "+context.getPath()+" "+context.getString()); if (context.getSysKey()!=-1) - throw new ObjectAlreadyExistsException("The item name " +newName+ " exists already.", ""); - - // get init objects - - // loop through collections, collecting instantiated descriptions and finding the default workflow def - CollectionArrayList colls = new CollectionArrayList(); - String[] collNames = storage.getClusterContents(itemSysKey, ClusterStorage.COLLECTION); - for (String collName : collNames) { - Collection thisCol = (Collection)storage.get(itemSysKey, ClusterStorage.COLLECTION+"/"+collName, null); - if (thisCol instanceof CollectionDescription) { - CollectionDescription thisDesc = (CollectionDescription)thisCol; - colls.put(thisDesc.newInstance()); - } - else if (thisCol.getName().equalsIgnoreCase("workflow") && wfDefName == null) { - ArrayList members = thisCol.getMembers().list; - // get the first member from the wf collection - CollectionMember wfMember = members.get(0); - wfDefName = wfMember.resolveItem().getName(); - Object wfVerObj = wfMember.getProperties().get("Version"); - try { - wfDefVer = Integer.parseInt(wfVerObj.toString()); - } catch (NumberFormatException ex) { - throw new InvalidDataException("Invalid workflow version number: "+wfVerObj.toString(), ""); - } - } - } - - // load workflow def - if (wfDefName == null) - throw new InvalidDataException("No workflow given or defined", ""); - if (wfDefVer == -1) - throw new InvalidDataException("No workflow def version given",""); - - try { - wfDef = (CompositeActivityDef)LocalObjectLoader.getActDef(wfDefName, wfDefVer); - } catch (ObjectNotFoundException ex) { - throw new InvalidDataException("Workflow def '"+wfDefName+"' item not found", ""); - } catch (ClassCastException ex) { - throw new InvalidDataException("Activity def '"+wfDefName+"' was not Composite", ""); - } - - - // copy properties -- intend to create from propdesc - PropertyDescriptionList pdList = PropertyUtility.getPropertyDescriptionOutcome(itemSysKey); - props = pdList.instanciate(); - // set Name prop or create if not present - boolean foundName = false; - for (Property prop : props.list) { - if (prop.getName().equals("Name")) { - foundName = true; - prop.setValue(newName); - } - } - if (!foundName) props.list.add(new Property("Name", newName, true)); - props.list.add( new Property("Creator", agent.getAgentName(), false)); - - /* ITEM CREATION */ + throw new ObjectAlreadyExistsException("The agent name " +newName+ " exists already.", ""); // generate new entity key Logger.msg(6, "CreateItemFromDescription - Requesting new sysKey"); - ItemPath entityPath = Gateway.getNextKeyManager().generateNextEntityKey(); + AgentPath newAgentPath = Gateway.getNextKeyManager().generateNextAgentKey(); // resolve the item factory Logger.msg(6, "CreateItemFromDescription - Resolving item factory"); @@ -142,30 +67,29 @@ public class CreateAgentFromDescription extends PredefinedStep Logger.msg(3, "CreateItemFromDescription - Creating Item"); CorbaServer factory = Gateway.getCorbaServer(); if (factory == null) throw new AccessRightsException("This process cannot create new Items", ""); - TraceableEntity newItem = (TraceableEntity)factory.createEntity(entityPath); - Gateway.getLookup().add(entityPath); + ActiveEntity newAgent = (ActiveEntity)factory.createEntity(newAgentPath); + Gateway.getLookup().add(newAgentPath); // initialise it with its properties and workflow Logger.msg(3, "CreateItemFromDescription - Initializing Item"); - newItem.initialise( + newAgent.initialise( agent.getSysKey(), - Gateway.getMarshaller().marshall(props), - Gateway.getMarshaller().marshall(wfDef.instantiate()), - Gateway.getMarshaller().marshall(colls) + Gateway.getMarshaller().marshall(getNewProperties(itemSysKey, newName, agent)), + Gateway.getMarshaller().marshall(getNewWorkflow(itemSysKey, wfDefName, wfDefVer)), + Gateway.getMarshaller().marshall(getNewCollections(itemSysKey)) ); // add its domain path Logger.msg(3, "CreateItemFromDescription - Creating "+context); - context.setEntity(entityPath); + context.setEntity(newAgentPath); Gateway.getLookup().add(context); return requestData; } catch (Exception e) { Logger.error(e); throw new InvalidDataException(e.getMessage(), ""); } - } } -- cgit v1.2.3