refs 5156: Accounting Manager - Shows tabs according to the configuration set in generic resource

Task-Url: https://support.d4science.org/issues/5156

Fixed resources' visibility problem between VO and VRE 


git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager@131817 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerMenu.java

@@ -1,11 +1,9 @@
 package org.gcube.portlets.admin.accountingmanager.client.menu;
 
-import java.util.ArrayList;
-
 import org.gcube.portlets.admin.accountingmanager.client.event.AccountingMenuEvent;
 import org.gcube.portlets.admin.accountingmanager.client.resource.AccountingManagerResources;
 import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType;
-import org.gcube.portlets.admin.accountingmanager.shared.tabs.EnableTabData;
+import org.gcube.portlets.admin.accountingmanager.shared.tabs.EnableTab;
 import org.gcube.portlets.admin.accountingmanager.shared.tabs.EnableTabs;
 
 import com.allen_sauer.gwt.log.client.Log;
@@ -45,7 +43,7 @@ public class AccountingManagerMenu extends TabPanel {
 	}
 
 	private void addTabs() {
-		for (EnableTabData enable : enableTabs.getTabs()) {
+		for (EnableTab enable : enableTabs.getTabs()) {
 			if (enable.getAccountingType() != null) {
 				switch (enable.getAccountingType()) {
 				case JOB:

src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/BuildEnableTabs.java

@@ -1,21 +1,19 @@
 package org.gcube.portlets.admin.accountingmanager.server.is;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import org.gcube.portlets.admin.accountingmanager.shared.Constants;
 import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType;
 import org.gcube.portlets.admin.accountingmanager.shared.exception.ServiceException;
-import org.gcube.portlets.admin.accountingmanager.shared.tabs.EnableTabData;
+import org.gcube.portlets.admin.accountingmanager.shared.tabs.EnableTab;
 import org.gcube.portlets.admin.accountingmanager.shared.tabs.EnableTabs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * 
- * @author Giancarlo Panichi
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * @author Giancarlo Panichi email: <a
+ *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
  *
  */
 public class BuildEnableTabs {
@@ -24,18 +22,20 @@ public class BuildEnableTabs {
 			.getLogger(BuildEnableTabs.class);
 
 	public static EnableTabs build(String scope) throws ServiceException {
-		ArrayList<EnableTabData> enableTabDataList = new ArrayList<>();
-
+		ArrayList<EnableTab> enableTabList = new ArrayList<>();
+ 
 		if (Constants.DEBUG_MODE) {
-			EnableTabData enableTabData=new EnableTabData(AccountingType.SERVICE,null);
-			enableTabDataList.add(enableTabData);
+			EnableTab enableTabData = new EnableTab(
+					AccountingType.SERVICE, null);
+			enableTabList.add(enableTabData);
 		} else {
-			List<EnableTab> enableTabList = InformationSystemUtils
+			EnableTabsJAXB enableTabsJAXB = InformationSystemUtils
 					.retrieveEnableTab(scope);
-			logger.debug("Enable Tab List: " + enableTabList);
-			if (enableTabList != null && !enableTabList.isEmpty()) {
+			logger.debug("Enable Tabs: " + enableTabsJAXB);
+			if (enableTabsJAXB != null && enableTabsJAXB.getEnableTabs() != null
+					&& !enableTabsJAXB.getEnableTabs().isEmpty()) {
 				AccountingType type;
-				for (EnableTab enableTab : enableTabList) {
+				for (EnableTabJAXB enableTab : enableTabsJAXB.getEnableTabs()) {
 					type = AccountingType
 							.getTypeFromString(enableTab.getName());
 					if (type != null) {
@@ -43,11 +43,11 @@ public class BuildEnableTabs {
 								&& !enableTab.getRoles().isEmpty()) {
 							ArrayList<String> enableRoles = new ArrayList<>();
 							enableRoles.addAll(enableTab.getRoles());
-							enableTabDataList.add(new EnableTabData(type,
+							enableTabList.add(new EnableTab(type,
 									enableRoles));
 						} else {
-							enableTabDataList
-									.add(new EnableTabData(type, null));
+							enableTabList
+									.add(new EnableTab(type, null));
 						}
 					}
 				}
@@ -59,8 +59,8 @@ public class BuildEnableTabs {
 			}
 		}
 
-		EnableTabs enableTabs = new EnableTabs(enableTabDataList);
-		logger.debug("EnableTabs: "+enableTabs);
+		EnableTabs enableTabs = new EnableTabs(enableTabList);
+		logger.debug("EnableTabsData: " + enableTabs);
 		return enableTabs;
 	}
 

src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/EnableTabJAXB.java

@@ -10,19 +10,19 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 /**
  * 
- * @author Giancarlo Panichi
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * @author Giancarlo Panichi email: <a
+ *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
  *
  */
 
 @XmlRootElement(name = "enabletab")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class EnableTab {
+public class EnableTabJAXB {
 	@XmlElement
 	private String name;
 
-	@XmlElementWrapper(name = "roles", required=false)
-	@XmlElement(name = "role", required=false)
+	@XmlElementWrapper(name = "roles", required = false)
+	@XmlElement(name = "role", required = false)
 	private List<String> roles;
 
 	public List<String> getRoles() {
@@ -43,10 +43,7 @@ public class EnableTab {
 
 	@Override
 	public String toString() {
-		return "EnableTab [name=" + name + ", roles=" + roles + "]";
+		return "EnableTabJAXB [name=" + name + ", roles=" + roles + "]";
 	}
-	
-	
-	
 
 }

src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/EnableTabsJAXB.java

@@ -0,0 +1,39 @@
+package org.gcube.portlets.admin.accountingmanager.server.is;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * 
+ * @author Giancarlo Panichi email: <a
+ *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
+ */
+
+@XmlRootElement(name = "enabletabs")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class EnableTabsJAXB {
+
+	@XmlElement(name = "enabletab")
+	private List<EnableTabJAXB> enableTabs = null;
+
+	public List<EnableTabJAXB> getEnableTabs() {
+		return enableTabs;
+	}
+
+	public void setEnableTabs(List<EnableTabJAXB> enableTabs) {
+		this.enableTabs = enableTabs;
+	}
+
+	@Override
+	public String toString() {
+		return "EnableTabsJAXB [enableTabs=" + enableTabs + "]";
+	}
+
+	
+
+}

src/main/java/org/gcube/portlets/admin/accountingmanager/server/is/InformationSystemUtils.java

@@ -1,22 +1,23 @@
 package org.gcube.portlets.admin.accountingmanager.server.is;
 
-import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.gcube.common.resources.gcore.GenericResource;
+import org.gcube.common.resources.gcore.ScopeGroup;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.portlets.admin.accountingmanager.shared.exception.ServiceException;
 import org.gcube.resources.discovery.client.api.DiscoveryClient;
+import org.gcube.resources.discovery.client.impl.JAXBParser;
 import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
 import org.gcube.resources.discovery.icclient.ICFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * 
- * @author Giancarlo Panichi
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * @author Giancarlo Panichi email: <a
+ *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
  *
  */
 public class InformationSystemUtils {
@@ -24,33 +25,78 @@ public class InformationSystemUtils {
 	public static final String ACCOUNTING_NAME = "AccountingManager";
 	public static final String ACCOUNTING_CATEGORY = "ApplicationProfile";
 
-	
 	private static Logger logger = LoggerFactory
 			.getLogger(InformationSystemUtils.class);
 
-	public static List<EnableTab> retrieveEnableTab(String scope) throws ServiceException {
+	public static EnableTabsJAXB retrieveEnableTab(String scope)
+			throws ServiceException {
 		try {
 
 			if (scope == null || scope.length() == 0)
-				return new ArrayList<EnableTab>();
+				return null;
 
 			ScopeProvider.instance.set(scope);
 
 			SimpleQuery query = ICFactory.queryFor(GenericResource.class);
 			query.addCondition(
-					"$resource/Profile/SecondaryType/text() eq '" + ACCOUNTING_CATEGORY + "'")
+					"$resource/Profile/SecondaryType/text() eq '"
+							+ ACCOUNTING_CATEGORY + "'")
 					.addCondition(
-							"$resource/Profile/Name/text() eq '" + ACCOUNTING_NAME + "'")
-					.setResult("$resource/Profile/Body/enabletab");
-			DiscoveryClient<EnableTab> client = ICFactory.clientFor(EnableTab.class);
-			List<EnableTab> accountingEnableTabs= client.submit(query);
-			
-			logger.debug("Response: "+accountingEnableTabs);
-			
-			return accountingEnableTabs;
+							"$resource/Profile/Name/text() eq '"
+									+ ACCOUNTING_NAME + "'")
+					.setResult("$resource");
 
+			DiscoveryClient<GenericResource> client = ICFactory
+					.clientFor(GenericResource.class);
+			List<GenericResource> accountingResources = client.submit(query);
+			logger.debug("Resources: " + accountingResources);
+
+			EnableTabsJAXB enableTabs = null;
+
+			for (GenericResource genericResource : accountingResources) {
+				if (genericResource.scopes() != null) {
+					ScopeGroup<String> scopes = genericResource.scopes();
+					Iterator<String> iterator = scopes.iterator();
+					String scopeFound = null;
+					boolean found = false;
+					while (iterator.hasNext() && !found) {
+						scopeFound = iterator.next();
+						if (scopeFound.compareTo(scope) == 0) {
+							found = true;
+						}
+					}
+					if (found) {
+						try {
+							JAXBParser<EnableTabsJAXB> parser = new JAXBParser<EnableTabsJAXB>(
+									EnableTabsJAXB.class);
+							logger.debug("Body: "
+									+ genericResource.profile().bodyAsString());
+							enableTabs = (EnableTabsJAXB) parser
+									.parse(genericResource.profile()
+											.bodyAsString());
+							logger.debug("Enable: " + enableTabs);
+						} catch (Throwable e) {
+							String error = "Error in discovery Accounting Manager enabled tab in scope "+ scope+". "
+									+ "Resource parsing failed!";
+							logger.error(error);
+							logger.error("Error {resource="+ genericResource + ", error="
+									+ e.getLocalizedMessage() + "}");
+							e.printStackTrace();
+							throw new ServiceException(error, e);
+						}
+						break;
+
+					}
+
+				}
+			}
+
+			return enableTabs;
+
+		} catch (ServiceException e) {
+			throw e;
 		} catch (Throwable e) {
-			String error="Error in discovery Accounting Manager enabled tab in scope: "
+			String error = "Error in discovery Accounting Manager enabled tab in scope: "
 					+ scope;
 			logger.error(error);
 			logger.error("Error: " + e.getLocalizedMessage());

src/main/java/org/gcube/portlets/admin/accountingmanager/shared/tabs/EnableTab.java

@@ -11,18 +11,18 @@ import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType;
  *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
  *
  */
-public class EnableTabData implements Serializable {
+public class EnableTab implements Serializable {
 
 	private static final long serialVersionUID = -6236674776252330224L;
 
 	private AccountingType accountingType;
 	private ArrayList<String> enableRoles;
 
-	public EnableTabData() {
+	public EnableTab() {
 		super();
 	}
 
-	public EnableTabData(AccountingType accountingType,
+	public EnableTab(AccountingType accountingType,
 			ArrayList<String> enableRoles) {
 		super();
 		this.accountingType = accountingType;
@@ -47,8 +47,8 @@ public class EnableTabData implements Serializable {
 
 	@Override
 	public String toString() {
-		return "EnableTabData [accountingType=" + accountingType
-				+ ", enableRoles=" + enableRoles + "]";
+		return "EnableTab [accountingType=" + accountingType + ", enableRoles="
+				+ enableRoles + "]";
 	}
 
 }

src/main/java/org/gcube/portlets/admin/accountingmanager/shared/tabs/EnableTabs.java

@@ -13,22 +13,22 @@ public class EnableTabs implements Serializable {
 
 	private static final long serialVersionUID = 6831995927636728501L;
 
-	private ArrayList<EnableTabData> tabs;
+	private ArrayList<EnableTab> tabs;
 
 	public EnableTabs() {
 		super();
 	}
 
-	public EnableTabs(ArrayList<EnableTabData> tabs) {
+	public EnableTabs(ArrayList<EnableTab> tabs) {
 		super();
 		this.tabs = tabs;
 	}
 
-	public ArrayList<EnableTabData> getTabs() {
+	public ArrayList<EnableTab> getTabs() {
 		return tabs;
 	}
 
-	public void setTabs(ArrayList<EnableTabData> tabs) {
+	public void setTabs(ArrayList<EnableTab> tabs) {
 		this.tabs = tabs;
 	}
 

src/test/java/org/gcube/portlets/admin/accountingmanager/TestAccountingMananger.java

@@ -3,18 +3,14 @@
  */
 package org.gcube.portlets.admin.accountingmanager;
 
-import java.util.List;
-
 import junit.framework.TestCase;
 
-import org.gcube.portlets.admin.accountingmanager.server.is.EnableTab;
+import org.gcube.portlets.admin.accountingmanager.server.is.EnableTabsJAXB;
 import org.gcube.portlets.admin.accountingmanager.server.is.InformationSystemUtils;
 import org.gcube.portlets.admin.accountingmanager.shared.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-
 /**
  * 
  * @author "Giancarlo Panichi" <a
@@ -26,19 +22,20 @@ public class TestAccountingMananger extends TestCase {
 	private static Logger logger = LoggerFactory
 			.getLogger(TestAccountingMananger.class);
 
+
 	public void testAccountingManagerResource() {
 		if (Constants.TEST_ENABLE) {
 			logger.debug("Test Enabled");
-			
+
 			try {
-				logger.debug("Scope: "+Constants.DEFAULT_SCOPE);
-				List<EnableTab> enableTab=InformationSystemUtils
+				logger.debug("Scope: " + Constants.DEFAULT_SCOPE);
+				EnableTabsJAXB enableTabs = InformationSystemUtils
 						.retrieveEnableTab(Constants.DEFAULT_SCOPE);
-				logger.debug("Enable Tab: "+enableTab);
+				logger.debug("EnableTabs: " + enableTabs);
 				assertTrue(true);
-				
+
 			} catch (Exception e) {
-				assertTrue("Error searching the resource!",false);
+				assertTrue("Error searching the resource!", false);
 				e.printStackTrace();
 			}
 
@@ -47,4 +44,7 @@ public class TestAccountingMananger extends TestCase {
 			assertTrue(true);
 		}
 	}
+
+	
+
 }