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.

3 files changed, 8 insertions, 7 deletions

diff --git a/src/main/java/com/c2kernel/collection/AggregationMember.java b/src/main/java/com/c2kernel/collection/AggregationMember.java
index cb8c355..ba2524c 100644
--- a/src/main/java/com/c2kernel/collection/AggregationMember.java
+++ b/src/main/java/com/c2kernel/collection/AggregationMember.java
@@ -1,11 +1,11 @@
 package com.c2kernel.collection;

 

 import java.util.StringTokenizer;

-import java.util.UUID;

 

 import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.graph.model.GraphableVertex;

+import com.c2kernel.lookup.InvalidItemPathException;

 import com.c2kernel.lookup.ItemPath;

 import com.c2kernel.persistency.ClusterStorage;

 import com.c2kernel.process.Gateway;

@@ -143,8 +143,8 @@ public class AggregationMember extends GraphableVertex implements CollectionMemb
     }

 

 	@Override

-	public void setChildUUID(String uuid) throws MembershipException {

-		setItemPath(new ItemPath(UUID.fromString(uuid)));

+	public void setChildUUID(String uuid) throws MembershipException, InvalidItemPathException {

+		setItemPath(ItemPath.fromUUIDString(uuid));

 	}

 

 

diff --git a/src/main/java/com/c2kernel/collection/CollectionMember.java b/src/main/java/com/c2kernel/collection/CollectionMember.java
index 4fc7e3d..247ada5 100644
--- a/src/main/java/com/c2kernel/collection/CollectionMember.java
+++ b/src/main/java/com/c2kernel/collection/CollectionMember.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 

 import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.proxy.ItemProxy;

+import com.c2kernel.lookup.InvalidItemPathException;

 import com.c2kernel.lookup.ItemPath;

 import com.c2kernel.utils.CastorHashMap;

 

@@ -24,7 +25,7 @@ public interface CollectionMember extends Serializable {
 	public void setItemPath(ItemPath itemPath) throws MembershipException;

 	public ItemPath getItemPath();

 	

-	public void setChildUUID(String uuid) throws MembershipException;

+	public void setChildUUID(String uuid) throws MembershipException, InvalidItemPathException;

 	public String getChildUUID();

 

     public void assignItem(ItemPath itemPath) throws MembershipException;

diff --git a/src/main/java/com/c2kernel/collection/DependencyMember.java b/src/main/java/com/c2kernel/collection/DependencyMember.java
index b5a8b13..4dbb8f1 100644
--- a/src/main/java/com/c2kernel/collection/DependencyMember.java
+++ b/src/main/java/com/c2kernel/collection/DependencyMember.java
@@ -1,10 +1,10 @@
 package com.c2kernel.collection;

 

 import java.util.StringTokenizer;

-import java.util.UUID;

 

 import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.proxy.ItemProxy;

+import com.c2kernel.lookup.InvalidItemPathException;

 import com.c2kernel.lookup.ItemPath;

 import com.c2kernel.persistency.ClusterStorage;

 import com.c2kernel.process.Gateway;

@@ -142,8 +142,8 @@ public class DependencyMember implements CollectionMember
 

 

 	@Override

-	public void setChildUUID(String uuid) throws MembershipException {

-		mItemPath = new ItemPath(UUID.fromString(uuid));

+	public void setChildUUID(String uuid) throws MembershipException, InvalidItemPathException {

+		mItemPath = ItemPath.fromUUIDString(uuid);

 	}