From a7cefce58cdb0f7f2d0868a1d5ee2f24f3890646 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 22 Sep 2014 16:01:18 +0200
Subject: ItemPath.fromUUIDString unnecessary as ItemPath(String) supports both
 plain UUIDs and an /entity prefix. Tightened that up and removed the
 fromUUIDString method for a simpler API. Also switched AgentPath(String) to a
 path argument for consistency. New AgentPaths should be created with
 AgentPath(new ItemPath(), String) instead.

---
 src/main/java/com/c2kernel/process/Bootstrap.java           | 4 ++--
 src/main/java/com/c2kernel/process/ItemHTTPBridge.java      | 2 +-
 src/main/java/com/c2kernel/process/module/ModuleImport.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/c2kernel/process')

diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java
index 1b9e027..eef118d 100644
--- a/src/main/java/com/c2kernel/process/Bootstrap.java
+++ b/src/main/java/com/c2kernel/process/Bootstrap.java
@@ -110,7 +110,7 @@ public class Bootstrap
             ItemPath itemPath = null;
             String[] itemParts = thisItem.split("/");
             if (itemParts.length == 3) { // includes UUID
-            	itemPath = ItemPath.fromUUIDString(itemParts[2]);
+            	itemPath = new ItemPath(itemParts[2]);
             }
             String itemType = itemParts[0];
             String itemName = itemParts[1];
@@ -298,7 +298,7 @@ public class Bootstrap
          Logger.msg("Bootstrap.checkAgent() - User '"+name+"' not found. Creating.");
 
          try {
-             AgentPath agentPath = new AgentPath(ItemPath.fromUUIDString(uuid), name);
+             AgentPath agentPath = new AgentPath(new ItemPath(uuid), name);
              agentPath.setPassword(pass);
              Gateway.getCorbaServer().createAgent(agentPath);
              lookup.add(agentPath);
diff --git a/src/main/java/com/c2kernel/process/ItemHTTPBridge.java b/src/main/java/com/c2kernel/process/ItemHTTPBridge.java
index 8e4329c..8db52f9 100644
--- a/src/main/java/com/c2kernel/process/ItemHTTPBridge.java
+++ b/src/main/java/com/c2kernel/process/ItemHTTPBridge.java
@@ -33,7 +33,7 @@ public class ItemHTTPBridge extends HTTPRequestHandler {
         String query = tok.nextToken();
         ItemPath itemPath;
         try {
-        	itemPath = ItemPath.fromUUIDString(path);
+        	itemPath = new ItemPath(path);
         } catch (InvalidItemPathException ex) {
         	DomainPath domPath = new DomainPath(path);
         	if (!domPath.exists())
diff --git a/src/main/java/com/c2kernel/process/module/ModuleImport.java b/src/main/java/com/c2kernel/process/module/ModuleImport.java
index 346488b..29ee2e2 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleImport.java
+++ b/src/main/java/com/c2kernel/process/module/ModuleImport.java
@@ -24,7 +24,7 @@ public abstract class ModuleImport {
 	
     public void setID( String uuid ) throws InvalidItemPathException 
     {
-    	if (uuid != null) itemPath = ItemPath.fromUUIDString(uuid);
+    	if (uuid != null) itemPath = new ItemPath(uuid);
     }
     
     public String getID() {
-- 
cgit v1.2.3