From 41111b3b74718f62e3e8f5bf6078e84fd0076b4c Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 6 Feb 2019 11:49:43 +0000 Subject: [PATCH] Fixing Exporter git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/is-exporter-se-plugin@177013 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../exporter/ISExporterPlugin.java | 2 - .../exporter/mapper/GCoreResourceMapper.java | 8 +- .../mapper/GenericResourceExporter.java | 56 +++++----- .../mapper/ServiceEndpointExporter.java | 101 +++++++++--------- 4 files changed, 79 insertions(+), 88 deletions(-) diff --git a/src/main/java/org/gcube/informationsystem/exporter/ISExporterPlugin.java b/src/main/java/org/gcube/informationsystem/exporter/ISExporterPlugin.java index 6b55ca8..13abe76 100644 --- a/src/main/java/org/gcube/informationsystem/exporter/ISExporterPlugin.java +++ b/src/main/java/org/gcube/informationsystem/exporter/ISExporterPlugin.java @@ -48,10 +48,8 @@ public class ISExporterPlugin extends Plugin { logger.debug("Failure Report are filtered (e.g. Failing UUID are not shown to avoid to produce to much uneeded reports)"); - /* GenericResourceExporter genericResourceExporter = new GenericResourceExporter(filteredReport); genericResourceExporter.export(); - */ ServiceEndpointExporter serviceEndpointExporter = new ServiceEndpointExporter(filteredReport); serviceEndpointExporter.export(); diff --git a/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java b/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java index d31fa1c..fcad23a 100644 --- a/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java +++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java @@ -22,9 +22,9 @@ import org.gcube.informationsystem.exporter.mapper.exception.UpdateException; import org.gcube.informationsystem.model.reference.ISConstants; import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.entities.Resource; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException; -import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; +import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAvailableInAnotherContextException; +import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException; import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClient; import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientFactory; import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher; @@ -131,9 +131,9 @@ public abstract class GCoreResourceMapper { +public class GenericResourceExporter extends GCoreResourceMapper { - public static final String FIXED_VERSION = "1.0.0"; - public static final String FULL_BODY = "FULL_BODY"; + public static final String FIXED_VERSION = "1.0.0"; + public static final String FULL_BODY = "FULL_BODY"; - public GenericResourceExporter(Boolean filteredReport){ + public GenericResourceExporter(Boolean filteredReport) { super(GenericResource.class, Configuration.class, filteredReport); } @@ -45,67 +45,65 @@ public class GenericResourceExporter extends GCoreResourceMapper> consistsOfs = configuration.getConsistsOf(); + List> consistsOfs = configuration.getConsistsOf(); - for(ConsistsOf c : consistsOfs){ + for(ConsistsOf c : consistsOfs) { Facet target = c.getTarget(); - if(c instanceof IsIdentifiedBy){ + if(c instanceof IsIdentifiedBy) { if(target instanceof SoftwareFacet) { softwareFacet = (SoftwareFacet) target; continue; } } - if(c instanceof ConsistsOf){ - if(target instanceof SimpleFacet){ + if(c instanceof ConsistsOf) { + if(target instanceof SimpleFacet) { simpleFacet = (SimpleFacet) target; continue; } } } - }else{ + } else { configuration = new ConfigurationImpl(); Header header = new HeaderImpl(uuid); configuration.setHeader(header); } - + /* ----------------------------------------- */ - if(softwareFacet==null){ + if(softwareFacet == null) { softwareFacet = new SoftwareFacetImpl(); - IsIdentifiedBy identifiedBy = - new IsIdentifiedByImpl(configuration, softwareFacet, null); + IsIdentifiedBy identifiedBy = new IsIdentifiedByImpl( + configuration, softwareFacet, null); configuration.addFacet(identifiedBy); } - softwareFacet.setGroup(profile.type()); softwareFacet.setName(profile.name()); softwareFacet.setVersion(FIXED_VERSION); String description = profile.description(); - if(description!=null && description.compareTo("")!=0){ + if(description != null && description.compareTo("") != 0) { softwareFacet.setDescription(getStringAsUTF8(description)); } /* ----------------------------------------- */ - + /* ----------------------------------------- */ String xmlBody = profile.bodyAsString(); JSONObject jsonBody = XML.toJSONObject(getStringAsUTF8(xmlBody)); - Map map = jsonBody.toMap(); - if(simpleFacet==null){ + Map map = jsonBody.toMap(); + if(simpleFacet == null) { simpleFacet = new SimpleFacetImpl(); configuration.addFacet(simpleFacet); @@ -115,13 +113,13 @@ public class GenericResourceExporter extends GCoreResourceMapper { +public class ServiceEndpointExporter extends GCoreResourceMapper { private static Logger logger = LoggerFactory.getLogger(ServiceEndpointExporter.class); - public static final String FIXED_VERSION = "1.0.0"; + public static final String FIXED_VERSION = "1.0.0"; public static final String PLATFORM = "PLATFORM"; public static final String POSITION = "POSITION"; @@ -56,18 +56,18 @@ public class ServiceEndpointExporter extends GCoreResourceMapper accessPoints = profile.accessPoints(); accessPointFacets = new AccessPointFacet[accessPoints.size()]; - if(readFromIS){ + if(readFromIS) { eService = read(uuid); //softwareFacet = (SoftwareFacet) eService.getIdentificationFacets().get(0); - List> consistsOfs = eService.getConsistsOf(); + List> consistsOfs = eService.getConsistsOf(); - for(ConsistsOf c : consistsOfs){ + for(ConsistsOf c : consistsOfs) { Facet target = c.getTarget(); - if(c instanceof IsIdentifiedBy){ + if(c instanceof IsIdentifiedBy) { if(target instanceof SoftwareFacet) { softwareFacet = (SoftwareFacet) target; continue; } } else { - if(target instanceof AccessPointFacet){ + if(target instanceof AccessPointFacet) { try { Object positionObject = c.getAdditionalProperty(POSITION); Integer position = Integer.valueOf(positionObject.toString()); - if(position!=null){ + if(position != null) { accessPointFacets[position] = (AccessPointFacet) target; } - }catch (Exception e) { + } catch(Exception e) { // Position is used on relation to match the AccessPoint on ServiceEndpoint logger.error("No POSITION found", e); } continue; } - if(target instanceof SoftwareFacet){ + if(target instanceof SoftwareFacet) { SoftwareFacet targetSoftwareFacet = (SoftwareFacet) target; - if(targetSoftwareFacet.getGroup().compareTo(PLATFORM)==0){ + if(targetSoftwareFacet.getGroup().compareTo(PLATFORM) == 0) { platformSoftwareFacet = targetSoftwareFacet; } continue; } - if(target instanceof ServiceStateFacet){ + if(target instanceof ServiceStateFacet) { serviceStateFacet = (ServiceStateFacet) target; continue; } - if(target instanceof NetworkingFacet){ + if(target instanceof NetworkingFacet) { networkingFacet = (NetworkingFacet) target; continue; } } - + } - }else{ + } else { eService = new EServiceImpl(); Header header = new HeaderImpl(uuid); eService.setHeader(header); } /* ----------------------------------------- */ - if(softwareFacet==null){ + if(softwareFacet == null) { softwareFacet = new SoftwareFacetImpl(); - IsIdentifiedBy identifiedBy = - new IsIdentifiedByImpl(eService, softwareFacet, null); + IsIdentifiedBy identifiedBy = new IsIdentifiedByImpl( + eService, softwareFacet, null); eService.addFacet(identifiedBy); } @@ -159,78 +159,75 @@ public class ServiceEndpointExporter extends GCoreResourceMapper consistsOf = new ConsistsOfImpl(eService, accessPointFacets[i], null); + ConsistsOf consistsOf = new ConsistsOfImpl( + eService, accessPointFacets[i], null); consistsOf.setAdditionalProperty(POSITION, i); eService.addFacet(consistsOf); } accessPointFacets[i].setEntryName(accessPoint.name()); String address = accessPoint.address(); - if(address!=null && address.compareTo("")!=0){ + if(address != null && address.compareTo("") != 0) { try { URI uri = URI.create(address); accessPointFacets[i].setEndpoint(uri); - }catch (IllegalArgumentException e) { + } catch(IllegalArgumentException e) { accessPointFacets[i].setAdditionalProperty(NOT_URI_ENDPOINT, address); } } String accessPointDescription = accessPoint.description(); - if(accessPointDescription!=null && accessPointDescription.compareTo("")!=0){ + if(accessPointDescription != null && accessPointDescription.compareTo("") != 0) { accessPointFacets[i].setDescription(getStringAsUTF8(accessPointDescription)); } - /* Managing Username and Password */ + /* Managing Username and Password */ try { String username = accessPoint.username(); String passwordString = accessPoint.password(); @@ -238,15 +235,14 @@ public class ServiceEndpointExporter extends GCoreResourceMapper properties = accessPoint.properties(); - if(properties!=null && properties.size()>0){ + if(properties != null && properties.size() > 0) { ObjectNode propertiesObjectNode = ISMapper.getObjectMapper().createObjectNode(); /* * List/Set support is currently disabled due to OrientDB bug see https://github.com/orientechnologies/orientdb/issues/7354 @@ -254,7 +250,7 @@ public class ServiceEndpointExporter extends GCoreResourceMapper