gCubeSystem
/
resource-registry-publisher-connector
16
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Restored previous version

This commit is contained in:
Luca Frosini 2023-05-19 09:10:08 +02:00
parent 580dda9f43
commit 94e7f8c082
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/smartgears/connector/resourceregistry/FacetBasedPublisher.java
View File

@ -9,6 +9,7 @@ import org.gcube.common.security.AuthorizedTasks;
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; 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.EService;
import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode; 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.EServiceManager;
import org.gcube.smartgears.connector.resourceregistry.resourcemanager.HostingNodeManager; import org.gcube.smartgears.connector.resourceregistry.resourcemanager.HostingNodeManager;
import org.gcube.smartgears.context.Property; 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.Publisher;
import org.gcube.smartgears.publishing.SmartgearsProfilePublisher; import org.gcube.smartgears.publishing.SmartgearsProfilePublisher;
import org.gcube.smartgears.security.AuthorizationProvider; import org.gcube.smartgears.security.AuthorizationProvider;
import org.gcube.smartgears.security.AuthorizationProviderFactory;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -31,7 +33,9 @@ public class FacetBasedPublisher implements Publisher {
} }
public static AuthorizationProvider getAuthorizationProvider(ContainerContext containerContext) { 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; return authorizationProvider;
} }

2
src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java
View File

@ -236,7 +236,7 @@ public class EServiceManager {
SoftwareFacet softwareFacet = new SoftwareFacetImpl(); SoftwareFacet softwareFacet = new SoftwareFacetImpl();
softwareFacet.setDescription(applicationConfiguration.description()); softwareFacet.setDescription(applicationConfiguration.description());
softwareFacet.setGroup(applicationConfiguration.serviceClass()); softwareFacet.setGroup(applicationConfiguration.group());
softwareFacet.setName(applicationConfiguration.name()); softwareFacet.setName(applicationConfiguration.name());
softwareFacet.setVersion(applicationConfiguration.version()); softwareFacet.setVersion(applicationConfiguration.version());

13
src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java
View File

@ -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.HasPersistentMemory;
import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasVolatileMemory; import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasVolatileMemory;
import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy; 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.ContainerConfiguration;
import org.gcube.smartgears.configuration.container.Site; 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.ContextUtility;
import org.gcube.smartgears.connector.resourceregistry.FacetBasedPublisher; import org.gcube.smartgears.connector.resourceregistry.FacetBasedPublisher;
import org.gcube.smartgears.context.container.ContainerContext; import org.gcube.smartgears.context.container.ContainerContext;
import org.gcube.smartgears.persistence.PersistenceWriter;
import org.gcube.smartgears.provider.ProviderFactory; import org.gcube.smartgears.provider.ProviderFactory;
import org.gcube.smartgears.security.AuthorizationProvider; import org.gcube.smartgears.security.AuthorizationProvider;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -321,11 +321,11 @@ public class HostingNodeManager {
hostingNode.addFacet(osSoftwareFacet); hostingNode.addFacet(osSoftwareFacet);
SmartGearsConfiguration config = ProviderFactory.provider().smartgearsConfiguration(); SmartgearsConfiguration config = ProviderFactory.provider().smartgearsConfiguration();
SoftwareFacet smartgearsSoftwareFacet = new SoftwareFacetImpl(); SoftwareFacet smartgearsSoftwareFacet = new SoftwareFacetImpl();
smartgearsSoftwareFacet.setGroup("gCube"); smartgearsSoftwareFacet.setGroup("gCube");
smartgearsSoftwareFacet.setName("SmartGears"); smartgearsSoftwareFacet.setName("SmartGears");
smartgearsSoftwareFacet.setVersion(config.version()); smartgearsSoftwareFacet.setVersion(config.getVersion());
hostingNode.addFacet(smartgearsSoftwareFacet); hostingNode.addFacet(smartgearsSoftwareFacet);
SoftwareFacet smartgearsDistributionSoftwareFacet = new SoftwareFacetImpl(); SoftwareFacet smartgearsDistributionSoftwareFacet = new SoftwareFacetImpl();
@ -435,10 +435,9 @@ public class HostingNodeManager {
long free = 0; long free = 0;
long total = 0; long total = 0;
try { try {
PersistenceWriter persistenceWriter = containerContext.configuration().persistence(); PersistenceConfiguration persistenceConfiguration = containerContext.configuration().persistenceConfiguration();
FileStore fileStore = Files FileStore fileStore = Files
.getFileStore(Paths.get(persistenceWriter.getLocation())); .getFileStore(Paths.get(persistenceConfiguration.getImplementationClass().newInstance().getLocation()));
// persistenceWriter.getFreeSpace();
free = fileStore.getUsableSpace() / 1048576; // 1048576 = 1024*1024 free = fileStore.getUsableSpace() / 1048576; // 1048576 = 1024*1024
// user to convert // user to convert
// bytes in MByte // bytes in MByte