From 48bd133abc2dca0ac3e7f7811b303029ad582c72 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 19 Dec 2022 11:00:20 +0100 Subject: [PATCH] Removed log4j dependency --- .classpath | 3 +- .settings/org.eclipse.jdt.core.prefs | 2 +- .settings/org.eclipse.wst.common.component | 5 +-- pom.xml | 10 +---- .../server/RegistryClientRequester.java | 20 ++++++--- .../shared/resource/UtilityResource.java | 41 +++++++------------ 6 files changed, 36 insertions(+), 45 deletions(-) diff --git a/.classpath b/.classpath index 85ff586..21e69f1 100644 --- a/.classpath +++ b/.classpath @@ -32,9 +32,10 @@ + - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index d9c67f2..43c8195 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 6e55158..e94cdb8 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,6 +1,6 @@ - + @@ -11,8 +11,7 @@ - - + diff --git a/pom.xml b/pom.xml index fb11db6..7d9b7dc 100644 --- a/pom.xml +++ b/pom.xml @@ -254,21 +254,15 @@ commons-io compile - - - log4j - log4j - runtime - org.slf4j slf4j-log4j12 - runtime + test org.slf4j slf4j-api - runtime + provided com.allen-sauer.gwt.log diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/RegistryClientRequester.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/RegistryClientRequester.java index 000d55f..9fc2a79 100644 --- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/RegistryClientRequester.java +++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/RegistryClientRequester.java @@ -22,6 +22,8 @@ import org.gcube.portlets.admin.resourcemanagement.shared.resource.CacheList; import org.gcube.portlets.admin.resourcemanagement.shared.resource.UtilityResource; import org.gcube.resourcemanagement.support.client.views.ResourceTypeDecorator; import org.gcube.resourcemanagement.support.shared.types.datamodel.CompleteResourceProfile; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -30,6 +32,8 @@ import org.gcube.resourcemanagement.support.shared.types.datamodel.CompleteResou */ public class RegistryClientRequester { + private static Logger logger = LoggerFactory.getLogger(RegistryClientRequester.class); + private static ResourceRegistryClient resourceRegistryClient; private static KeycloakClient client = KeycloakClientFactory.newInstance(); @@ -87,13 +91,16 @@ public class RegistryClientRequester { ScopeProvider.instance.set(scope); AccessTokenProvider.instance.set(getTokenForContext(scope)); try { + logger.info("GetResourcesTree: [Scope: {}]",scope); + resourceRegistryClient = ResourceRegistryClientFactory.create(); List types = resourceRegistryClient.getType(Resource.class, true); - System.out.println("resource type returned "+types.size()); + logger.info("Resources Types: {}",types.size()); for (Type t : types) { - System.out.println("resource type found "+t.getName()+ " in "+scope); + logger.info("Resource Type: {} in {} ",t.getName(),scope); + String val = null; if (t.getName().equals("EService")) @@ -134,22 +141,23 @@ public class RegistryClientRequester { ScopeProvider.instance.set(scope); AccessTokenProvider.instance.set(getTokenForContext(scope)); try { - + logger.info("GetResourcesByTypeSubType: [Scope:{}, Type:{}]",scope, type); + resourceRegistryClient = ResourceRegistryClientFactory.create(); Listresource=new ArrayList(); switch (type) { case "RunningInstance": - System.out.println("---------------->RunningInstance "); + logger.info("---------------->RunningInstance "); resource=UtilityResource.createListEservice(resourceRegistryClient, type,subType); break; case "GenericResource": - System.out.println("---------------->GenericResource "); + logger.info("---------------->GenericResource "); //resource=UtilityResource.CreateListConfiguration(scope,type,subType); resource=UtilityResource.createListConfigurationQuery(resourceRegistryClient, type,subType); break; case "GHN": - System.out.println("---------------->GHN "); + logger.info("---------------->GHN "); resource=UtilityResource.createListHostingNode(resourceRegistryClient, type,subType); break; diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/shared/resource/UtilityResource.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/shared/resource/UtilityResource.java index 4fc8cd8..ddab628 100644 --- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/shared/resource/UtilityResource.java +++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/shared/resource/UtilityResource.java @@ -1,30 +1,17 @@ package org.gcube.portlets.admin.resourcemanagement.shared.resource; import java.io.StringWriter; -import java.net.URL; import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; import java.util.List; -import java.util.Map; -import java.util.Set; import javax.xml.bind.JAXBContext; import javax.xml.bind.Marshaller; -import org.gcube.common.authorization.library.provider.AccessTokenProvider; -import org.gcube.common.keycloak.KeycloakClient; -import org.gcube.common.keycloak.KeycloakClientFactory; -import org.gcube.common.keycloak.model.ModelUtils; -import org.gcube.common.keycloak.model.TokenResponse; -import org.gcube.common.keycloak.model.AccessToken.Access; import org.gcube.common.scope.api.ScopeProvider; -import org.gcube.common.scope.impl.ScopeBean; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClient; -import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientFactory; import org.gcube.informationsystem.utils.ElementMapper; import org.gcube.resourcemanagement.model.reference.entities.facets.AccessPointFacet; import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet; @@ -40,6 +27,8 @@ import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasVola import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; import org.json.JSONArray; import org.json.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @@ -51,7 +40,7 @@ import org.json.JSONObject; */ public class UtilityResource { - + private static Logger logger = LoggerFactory.getLogger(UtilityResource.class); public static ArrayList getSubResourcesTree(ResourceRegistryClient resourceRegistryClient, String entity, String scope) throws Exception{ ArrayList list = new ArrayList<>(); @@ -79,7 +68,7 @@ public class UtilityResource { case "Configuration": if(f instanceof SoftwareFacet){ - // System.out.println("------------Configuration--SoftwareFacet-- identified by GenericResource"); + // logger.info("------------Configuration--SoftwareFacet-- identified by GenericResource"); SoftwareFacet sf = (SoftwareFacet) f; if (!list.contains(sf.getGroup())){ list.add(sf.getGroup()); @@ -89,7 +78,7 @@ public class UtilityResource { case "EService": //GcoreEndPoint if(f instanceof SoftwareFacet){ - System.out.println("------------EService--SoftwareFacet-- identified by Gcore End point and Service End Point"); + logger.info("------------EService--SoftwareFacet-- identified by Gcore End point and Service End Point"); SoftwareFacet sf = (SoftwareFacet) f; if (!list.contains(sf.getGroup())) list.add(sf.getGroup()); @@ -139,22 +128,22 @@ public class UtilityResource { String query="SELECT DISTINCT("+field+") AS "+field+" " + "FROM (TRAVERSE outE('IsIdentifiedBy'),inV('"+identifiedFacet+"') FROM "+entity+")"; - System.out.println("------------query----------->"+query); + logger.info("------------query----------->"+query); String result=resourceRegistryClient.rawQuery(query, true); if (result!=null&&!result.isEmpty()) { - System.out.println("--------result-------->"+result); + logger.info("--------result-------->"+result); JSONArray jsonArray = new JSONArray(result); for(int i=0;i < jsonArray.length();i++){ list.add(jsonArray.getJSONObject(i).get(field).toString()); } } else { - System.out.println("--------result-------->Attention invalid result!"); + logger.info("--------result-------->Attention invalid result!"); } }catch (Exception e) { - e.printStackTrace(); + logger.error(e.getLocalizedMessage(),e); } return list; @@ -179,7 +168,7 @@ public class UtilityResource { query="SELECT header,name, description FROM (TRAVERSE outE('IsIdentifiedBy'),inV('SoftwareFacet') " + " FROM Configuration ) where group='"+subTypeC+"'"; } - System.out.println("------------query list configuration----------->"+query); + logger.info("------------query list configuration----------->"+query); JAXBContext context = JAXBContext.newInstance(GenericResourceObject.class); Marshaller m = context.createMarshaller(); @@ -198,7 +187,7 @@ public class UtilityResource { String result=resourceRegistryClient.rawQuery(query, true); try{ if (result!=null&&!result.isEmpty()) { - System.out.println("--------result-------->"+result); + logger.info("--------result-------->"+result); JSONArray jsonArray = new JSONArray(result); for(int i=0;i < jsonArray.length();i++){ @@ -207,7 +196,7 @@ public class UtilityResource { //id="b981efde-18ea-4867-98e7-5d024fcfc0cb"+i; JSONObject header=new JSONObject(jsonArray.getJSONObject(i).get("header").toString()); id=(String) header.get("uuid"); - System.out.println("------------id----------->"+id); + logger.info("------------id----------->"+id); try{ name=jsonArray.getJSONObject(i).getString("name"); @@ -231,10 +220,10 @@ public class UtilityResource { } } else { - System.out.println("--------result-------->Attention invalid result!"); + logger.info("--------result-------->Attention invalid result!"); } } catch (Exception e) { - e.printStackTrace(); + logger.error(e.getLocalizedMessage(),e); } return resource; @@ -435,7 +424,7 @@ public class UtilityResource { CacheList.resourceid.put(id, new ResourceObject(name, eh.toString())); List> consist = eh.getConsistsOf(); for (ConsistsOf c : consist) { - //System.out.println("------------ConsistsOf--ConsistsOf-- c"+c.toString()); + //logger.info("------------ConsistsOf--ConsistsOf-- c"+c.toString()); if(c instanceof ConsistsOf){ if (c.getTarget() instanceof SimplePropertyFacet){