From 604856b4d26f98d9402dda2e3b98cbe5db5a344d Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 9 Jun 2022 11:49:11 +0200 Subject: [PATCH] Improving code --- .../handler/resourceregistry/EServiceHandler.java | 10 ++-------- .../handler/resourceregistry/HostingNodeHandler.java | 9 ++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java index 78d509a..f2a99df 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java +++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java @@ -103,29 +103,23 @@ public class EServiceHandler extends ApplicationLifecycleHandler { Set startTokens = applicationContext.configuration().startTokens(); Set startContextsUUID = new HashSet<>(); - ContextCache contextCache = ContextCache.getInstance(); for (String token : startTokens) { - + UUID contextUUID = ContextUtility.getContextUUID(token); if (create) { ContextUtility.setContextFromToken(token); eServiceManager = new EServiceManager(applicationContext); eServiceManager.createEService(); -// applicationContext.properties() -// .add(new Property(Constants.ESERVICE_MANAGER_PROPERTY, eServiceManager)); create = false; } else { try { - UUID contextUUID = ContextUtility.getContextUUID(token); eServiceManager.addToContext(contextUUID); } catch (Exception e) { UUID uuid = UUID.fromString(applicationContext.id()); logger.error("Unable to add {} with UUID {} to current context ({})", EService.NAME, uuid, ContextUtility.getContextName(token), e); + throw e; } } - - String contextFullName = ContextUtility.getContextName(token); - UUID contextUUID = contextCache.getUUIDByFullName(contextFullName); startContextsUUID.add(contextUUID); } diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java index 3bc19ec..23acdfb 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java +++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java @@ -103,28 +103,23 @@ public class HostingNodeHandler extends ContainerHandler { List startTokens = containerContext.configuration().startTokens(); Set startContextsUUID = new HashSet<>(); - ContextCache contextCache = ContextCache.getInstance(); for (String token : startTokens) { + UUID contextUUID = ContextUtility.getContextUUID(token); if (create) { ContextUtility.setContextFromToken(token); hostingNodeManager = new HostingNodeManager(containerContext); hostingNodeManager.createHostingNode(); -// containerContext.properties() -// .add(new Property(Constants.HOSTING_NODE_MANAGER_PROPERTY, hostingNodeManager)); create = false; } else { try { - UUID contextUUID = ContextUtility.getContextUUID(token); hostingNodeManager.addToContext(contextUUID); } catch (Exception e) { UUID uuid = UUID.fromString(containerContext.id()); logger.error("Unable to add {} with UUID {} to current context ({})", HostingNode.NAME, uuid, ContextUtility.getContextName(token), e); + throw e; } } - - String contextFullName = ContextUtility.getContextName(token); - UUID contextUUID = contextCache.getUUIDByFullName(contextFullName); startContextsUUID.add(contextUUID); }