From 482b98e869d07802310e249d09d784c63f9a86b6 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 19 Sep 2014 15:40:50 +0200 Subject: Introduced static method ItemPath.fromUUIDString and made the UUID constructor protected to better handle ItemPath and AgentPath construction with String UUIDs, throwing the right exceptions. --- src/main/java/com/c2kernel/lifecycle/instance/Workflow.java | 6 +++--- .../lifecycle/instance/predefined/AddMemberToCollection.java | 3 +-- .../java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java | 3 +-- .../c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java | 3 +-- .../lifecycle/instance/predefined/RemoveSlotFromCollection.java | 3 +-- .../com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java | 4 +--- 6 files changed, 8 insertions(+), 14 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle') diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java b/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java index 33c80a4..304c604 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java @@ -1,6 +1,5 @@ package com.c2kernel.lifecycle.instance; import java.util.ArrayList; -import java.util.UUID; import com.c2kernel.common.AccessRightsException; import com.c2kernel.common.InvalidDataException; @@ -16,6 +15,7 @@ import com.c2kernel.graph.model.TypeNameAndConstructionInfo; import com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer; import com.c2kernel.lookup.AgentPath; import com.c2kernel.lookup.InvalidAgentPathException; +import com.c2kernel.lookup.InvalidItemPathException; import com.c2kernel.lookup.ItemPath; import com.c2kernel.persistency.ClusterStorage; import com.c2kernel.utils.Language; @@ -199,9 +199,9 @@ public class Workflow extends CompositeActivity implements C2KLocalObject this.itemPath = itemPath; } - public void setItemUUID( String uuid ) + public void setItemUUID( String uuid ) throws InvalidItemPathException { - setItemPath(new ItemPath(UUID.fromString(uuid))); + setItemPath(ItemPath.fromUUIDString(uuid)); } public String getItemUUID() { diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java index 889ee80..76b6adf 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java @@ -13,7 +13,6 @@ package com.c2kernel.lifecycle.instance.predefined; import java.util.Arrays; -import java.util.UUID; import com.c2kernel.collection.Dependency; import com.c2kernel.collection.MembershipException; @@ -65,7 +64,7 @@ public class AddMemberToCollection extends PredefinedStep if (Logger.doLog(3)) Logger.msg(3, "AddMemberToCollection: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params)); try { collName = params[0]; - newChild = new ItemPath(UUID.fromString(params[1])); + newChild = ItemPath.fromUUIDString(params[1]); if (params.length > 2) props = (CastorHashMap)Gateway.getMarshaller().unmarshall(params[2]); diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java index 257c644..58b1263 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java @@ -13,7 +13,6 @@ package com.c2kernel.lifecycle.instance.predefined; import java.util.Arrays; -import java.util.UUID; import com.c2kernel.collection.Aggregation; import com.c2kernel.common.InvalidDataException; @@ -67,7 +66,7 @@ public class AddNewSlot extends PredefinedStep try { collName = params[0]; - if (params.length > 1 && params[1].length() > 0) descKey = new ItemPath(UUID.fromString(params[1])); + if (params.length > 1 && params[1].length() > 0) descKey = ItemPath.fromUUIDString(params[1]); } catch (Exception e) { throw new InvalidDataException("AddNewSlot: Invalid parameters "+Arrays.toString(params), ""); } diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java index 724e974..20ad473 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java @@ -13,7 +13,6 @@ package com.c2kernel.lifecycle.instance.predefined; import java.util.Arrays; -import java.util.UUID; import com.c2kernel.collection.Aggregation; import com.c2kernel.collection.AggregationMember; @@ -66,7 +65,7 @@ public class AssignItemToSlot extends PredefinedStep try { collName = params[0]; slotNo = Integer.parseInt(params[1]); - childItem = new ItemPath(UUID.fromString(params[2])); + childItem = ItemPath.fromUUIDString(params[2]); } catch (Exception e) { throw new InvalidDataException("AssignItemToSlot: Invalid parameters "+Arrays.toString(params), ""); } diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java index 7caad61..26bf104 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java @@ -13,7 +13,6 @@ package com.c2kernel.lifecycle.instance.predefined; import java.util.Arrays; -import java.util.UUID; import com.c2kernel.collection.Collection; import com.c2kernel.collection.CollectionMember; @@ -65,7 +64,7 @@ public class RemoveSlotFromCollection extends PredefinedStep try { collName = params[0]; if (params.length>1 && params[1].length()>0) slotNo = Integer.parseInt(params[1]); - if (params.length>2 && params[2].length()>0) currentChild = new ItemPath(UUID.fromString(params[2])); + if (params.length>2 && params[2].length()>0) currentChild = ItemPath.fromUUIDString(params[2]); } catch (Exception e) { throw new InvalidDataException("RemoveSlotFromCollection: Invalid parameters "+Arrays.toString(params), ""); } diff --git a/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java b/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java index 2250a82..26b2faa 100644 --- a/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java +++ b/src/main/java/com/c2kernel/lifecycle/routingHelpers/ViewpointDataHelper.java @@ -1,7 +1,5 @@ package com.c2kernel.lifecycle.routingHelpers; -import java.util.UUID; - import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.entity.proxy.ItemProxy; import com.c2kernel.lookup.ItemPath; @@ -48,7 +46,7 @@ public class ViewpointDataHelper ItemPath sourcePath; try { - sourcePath = new ItemPath(UUID.fromString(entityPath)); + sourcePath = ItemPath.fromUUIDString(entityPath); } catch (Exception e) { sourcePath = new ItemPath(entityPath); } -- cgit v1.2.3