gCubeSystem
/
resource-registry-handlers
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added support for context names included in header among UUIDs #22090

This commit is contained in:
Luca Frosini 2021-10-28 11:21:14 +02:00
parent d683b703c5
commit 9fd1f7db7b
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -5,7 +5,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [v2.1.0-SNAPSHOT] ## [v2.1.0-SNAPSHOT]
- Aligned model with the model defined in Luca Frosini PhD dissertation [#20367] - Aligned model with the model defined in Luca Frosini PhD dissertation [#20367]
- Added support for context names included in header among UUIDs [#22090]
## [v2.0.0] ## [v2.0.0]

2
src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java
View File

@ -123,7 +123,7 @@ public class EServiceHandler extends ApplicationLifecycleHandler {
} }
} }
Set<UUID> resourceContextsUUID = eServiceManager.getContextsUUID(); Set<UUID> resourceContextsUUID = eServiceManager.getContextsUUID().keySet();
removeResourceFromOldContexts(startContextsUUID, resourceContextsUUID); removeResourceFromOldContexts(startContextsUUID, resourceContextsUUID);
} catch (Throwable e) { } catch (Throwable e) {

2
src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java
View File

@ -126,7 +126,7 @@ public class HostingNodeHandler extends ContainerHandler {
} }
} }
Set<UUID> resourceContextsUUID = hostingNodeManager.getContextsUUID(); Set<UUID> resourceContextsUUID = hostingNodeManager.getContextsUUID().keySet();
removeResourceFromOldContexts(startContextsUUID, resourceContextsUUID); removeResourceFromOldContexts(startContextsUUID, resourceContextsUUID);
} catch (Throwable e) { } catch (Throwable e) {

4
src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java
View File

@ -3,7 +3,7 @@ package org.gcube.smartgears.handler.resourceregistry.resourcemanager;
import java.net.URI; import java.net.URI;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import javax.servlet.ServletRegistration; import javax.servlet.ServletRegistration;
@ -277,7 +277,7 @@ public class EServiceManager {
} }
} }
public Set<UUID> getContextsUUID() throws Exception { public Map<UUID,String> getContextsUUID() throws Exception {
return resourceRegistryPublisher.getResourceContexts(eService); return resourceRegistryPublisher.getResourceContexts(eService);
} }

3
src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java
View File

@ -16,7 +16,6 @@ import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -623,7 +622,7 @@ public class HostingNodeManager {
return cpuFacets; return cpuFacets;
} }
public Set<UUID> getContextsUUID() throws Exception { public Map<UUID,String> getContextsUUID() throws Exception {
return resourceRegistryPublisher.getResourceContexts(hostingNode); return resourceRegistryPublisher.getResourceContexts(hostingNode);
} }