From 275d0bbf555c8917be82ce4cc21eb4cabb00f4c5 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 Oct 2014 17:30:41 +0200
Subject: Huge exception overhaul: Merged ClusterStorageException with
 PersistencyException. Replaced MembershipException with
 InvalidCollectionModification CORBA Exception. Made all predef steps throw
 more accurate exceptions when they go wrong, and let more exceptions bubble
 through from underneath.

---
 .../instance/predefined/server/RemoveRole.java     | 43 ++++++++--------------
 1 file changed, 16 insertions(+), 27 deletions(-)

(limited to 'src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveRole.java')

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveRole.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveRole.java
index a467ee0..7aeda55 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveRole.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveRole.java
@@ -22,10 +22,10 @@ package com.c2kernel.lifecycle.instance.predefined.server;
 
 import java.util.Arrays;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.CannotManage;
+import com.c2kernel.common.InvalidData;
 import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.common.ObjectNotFound;
 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
 import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.lookup.ItemPath;
@@ -44,33 +44,22 @@ public class RemoveRole extends PredefinedStep
 	//requestdata is xmlstring
     @Override
 	protected String runActivityLogic(AgentPath agent, ItemPath item,
-			int transitionID, String requestData) throws InvalidDataException {
+			int transitionID, String requestData) throws InvalidData, CannotManage, ObjectNotFound, ObjectCannotBeUpdated {
     	
-    	String[] params = getDataList(requestData);
-    	if (Logger.doLog(3)) Logger.msg(3, "AddC2KObject: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));
-    	LookupManager lookup;
-		try {
-			lookup = Gateway.getLookupManager();
-		} catch (CannotManageException e) {
-			throw new InvalidDataException(e.getMessage(), "");
-		}
-		
-       	RolePath thisRole; AgentPath[] agents;
-		try {
-			thisRole = lookup.getRolePath(params[0]);
-			agents = Gateway.getLookup().getAgents(thisRole);
-		} catch (ObjectNotFoundException e) {
-			throw new InvalidDataException("Role "+params[0]+" not found.", "");
-		}
+		String[] params = getDataList(requestData);
+        if (Logger.doLog(3)) Logger.msg(3, "RemoveRole: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));
+        if (params.length != 1) throw new InvalidData("RemoveRole: Invalid parameters "+Arrays.toString(params));
+        
+    	LookupManager lookup = Gateway.getLookupManager();
+
+    	RolePath thisRole; AgentPath[] agents;
+		thisRole = lookup.getRolePath(params[0]);
+		agents = Gateway.getLookup().getAgents(thisRole);
        	
        	if (agents.length > 0)
-       		throw new InvalidDataException("Cannot remove role. "+agents.length+" agents still hold it.", "");
-       	try {
-			lookup.delete(thisRole);
-		} catch (ObjectCannotBeUpdated e) {
-			Logger.error(e);
-			throw new InvalidDataException("Role "+params[0]+" could not be removed.", "");
-		}
+       		throw new ObjectCannotBeUpdated("Cannot remove role. "+agents.length+" agents still hold it.");
+
+		lookup.delete(thisRole);
 
         return requestData;
 
-- 
cgit v1.2.3