From 94e7f8c0820a358c12c733fe782e1a2204d82ac0 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 19 May 2023 09:10:08 +0200 Subject: [PATCH] Restored previous version --- .../resourceregistry/FacetBasedPublisher.java | 6 +++++- .../resourcemanager/EServiceManager.java | 2 +- .../resourcemanager/HostingNodeManager.java | 13 ++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/connector/resourceregistry/FacetBasedPublisher.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/FacetBasedPublisher.java index 8bbe4eb..589c295 100644 --- a/src/main/java/org/gcube/smartgears/connector/resourceregistry/FacetBasedPublisher.java +++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/FacetBasedPublisher.java @@ -9,6 +9,7 @@ import org.gcube.common.security.AuthorizedTasks; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.resourcemanagement.model.reference.entities.resources.EService; import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode; +import org.gcube.smartgears.configuration.AuthorizationProviderConfiguration; import org.gcube.smartgears.connector.resourceregistry.resourcemanager.EServiceManager; import org.gcube.smartgears.connector.resourceregistry.resourcemanager.HostingNodeManager; import org.gcube.smartgears.context.Property; @@ -17,6 +18,7 @@ import org.gcube.smartgears.context.container.ContainerContext; import org.gcube.smartgears.publishing.Publisher; import org.gcube.smartgears.publishing.SmartgearsProfilePublisher; import org.gcube.smartgears.security.AuthorizationProvider; +import org.gcube.smartgears.security.AuthorizationProviderFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +33,9 @@ public class FacetBasedPublisher implements Publisher { } public static AuthorizationProvider getAuthorizationProvider(ContainerContext containerContext) { - AuthorizationProvider authorizationProvider = containerContext.configuration().authorizationProvider(); + AuthorizationProviderConfiguration authorizationProviderConfiguration = containerContext.configuration().authorizationConfiguration(); + AuthorizationProviderFactory authorizationProviderFactory = authorizationProviderConfiguration.getAuthProviderFactory(); + AuthorizationProvider authorizationProvider = authorizationProviderFactory.connect(authorizationProviderConfiguration.getCredentials()); return authorizationProvider; } diff --git a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java index eb612ff..3a3b2ff 100644 --- a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java +++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java @@ -236,7 +236,7 @@ public class EServiceManager { SoftwareFacet softwareFacet = new SoftwareFacetImpl(); softwareFacet.setDescription(applicationConfiguration.description()); - softwareFacet.setGroup(applicationConfiguration.serviceClass()); + softwareFacet.setGroup(applicationConfiguration.group()); softwareFacet.setName(applicationConfiguration.name()); softwareFacet.setVersion(applicationConfiguration.version()); diff --git a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java index 84c9e43..0601196 100644 --- a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java +++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java @@ -74,13 +74,13 @@ import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNo import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasPersistentMemory; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasVolatileMemory; import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; +import org.gcube.smartgears.configuration.PersistenceConfiguration; +import org.gcube.smartgears.configuration.SmartgearsConfiguration; import org.gcube.smartgears.configuration.container.ContainerConfiguration; import org.gcube.smartgears.configuration.container.Site; -import org.gcube.smartgears.configuration.library.SmartGearsConfiguration; import org.gcube.smartgears.connector.resourceregistry.ContextUtility; import org.gcube.smartgears.connector.resourceregistry.FacetBasedPublisher; import org.gcube.smartgears.context.container.ContainerContext; -import org.gcube.smartgears.persistence.PersistenceWriter; import org.gcube.smartgears.provider.ProviderFactory; import org.gcube.smartgears.security.AuthorizationProvider; import org.slf4j.Logger; @@ -321,11 +321,11 @@ public class HostingNodeManager { hostingNode.addFacet(osSoftwareFacet); - SmartGearsConfiguration config = ProviderFactory.provider().smartgearsConfiguration(); + SmartgearsConfiguration config = ProviderFactory.provider().smartgearsConfiguration(); SoftwareFacet smartgearsSoftwareFacet = new SoftwareFacetImpl(); smartgearsSoftwareFacet.setGroup("gCube"); smartgearsSoftwareFacet.setName("SmartGears"); - smartgearsSoftwareFacet.setVersion(config.version()); + smartgearsSoftwareFacet.setVersion(config.getVersion()); hostingNode.addFacet(smartgearsSoftwareFacet); SoftwareFacet smartgearsDistributionSoftwareFacet = new SoftwareFacetImpl(); @@ -435,10 +435,9 @@ public class HostingNodeManager { long free = 0; long total = 0; try { - PersistenceWriter persistenceWriter = containerContext.configuration().persistence(); + PersistenceConfiguration persistenceConfiguration = containerContext.configuration().persistenceConfiguration(); FileStore fileStore = Files - .getFileStore(Paths.get(persistenceWriter.getLocation())); - // persistenceWriter.getFreeSpace(); + .getFileStore(Paths.get(persistenceConfiguration.getImplementationClass().newInstance().getLocation())); free = fileStore.getUsableSpace() / 1048576; // 1048576 = 1024*1024 // user to convert // bytes in MByte