From 26c54a7a47975c0b48fad18a973ef246ba176ddb Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 25 Oct 2019 17:45:16 +0200 Subject: [PATCH] Fixing imports and code to be aligned with model reorganization --- pom.xml | 3 + .../context/ContextCreator.java | 14 +++-- .../model/discovery/ISMDiscoveryTest.java | 59 +++++++++++++------ .../resourceregistry/DataBaseCreator.java | 5 +- .../context/ContextManagementTest.java | 5 -- 5 files changed, 54 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index 4a77b1d..d51e6b7 100644 --- a/pom.xml +++ b/pom.xml @@ -76,12 +76,15 @@ + + junit diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java index 77d77ca..05318c8 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java @@ -1,5 +1,5 @@ package org.gcube.informationsystem.resourceregistry.context; - +/* import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -7,21 +7,24 @@ import java.util.UUID; import org.gcube.common.scope.impl.ScopeBean; import org.gcube.context.ContextElaborator; -import org.gcube.informationsystem.model.impl.entities.ContextImpl; -import org.gcube.informationsystem.model.reference.entities.Context; +import org.gcube.informationsystem.context.impl.entities.ContextImpl; +import org.gcube.informationsystem.context.reference.entities.Context; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException; + import org.gcube.informationsystem.utils.ISMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +*/ -public class ContextCreator extends ContextElaborator { +public class ContextCreator {} + /* + extends ContextElaborator { private static Logger logger = LoggerFactory.getLogger(ContextCreator.class); protected Map contexts; - protected ContextManagement contextManagement; public ContextCreator() { @@ -82,3 +85,4 @@ public class ContextCreator extends ContextElaborator { } } +*/ diff --git a/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java b/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java index a498f85..8e877e1 100644 --- a/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java +++ b/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java @@ -3,11 +3,16 @@ package org.gcube.informationsystem.model.discovery; import java.util.List; import java.util.ServiceLoader; -import org.gcube.informationsystem.model.reference.ISManageable; -import org.gcube.informationsystem.model.reference.entities.Entity; -import org.gcube.informationsystem.model.reference.properties.Property; -import org.gcube.informationsystem.model.reference.relations.Relation; +import org.gcube.informationsystem.base.reference.ISManageable; +import org.gcube.informationsystem.base.reference.entities.BaseEntity; +import org.gcube.informationsystem.base.reference.properties.BaseProperty; +import org.gcube.informationsystem.base.reference.relations.BaseRelation; import org.gcube.informationsystem.types.TypeBinder; +import org.gcube.informationsystem.types.reference.TypeDefinition; +import org.gcube.informationsystem.types.reference.entities.EntityTypeDefinition; +import org.gcube.informationsystem.types.reference.properties.PropertyDefinition; +import org.gcube.informationsystem.types.reference.properties.PropertyTypeDefiniton; +import org.gcube.informationsystem.types.reference.relations.RelationTypeDefinition; import org.gcube.informationsystem.utils.discovery.ISMDiscovery; import org.gcube.informationsystem.utils.discovery.RegistrationProvider; import org.junit.Test; @@ -15,12 +20,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class ISMDiscoveryTest { - + private static Logger logger = LoggerFactory.getLogger(ISMDiscovery.class); private void addDiscoveredModel(ISMDiscovery ismDiscovery) { - ServiceLoader regsitrationProviders = ServiceLoader.load(RegistrationProvider.class); - for (RegistrationProvider registrationProvider : regsitrationProviders) { + ServiceLoader regsitrationProviders = ServiceLoader + .load(RegistrationProvider.class); + for(RegistrationProvider registrationProvider : regsitrationProviders) { List packages = registrationProvider.getPackagesToRegister(); for(Package p : packages) { ismDiscovery.addPackage(p); @@ -29,36 +35,51 @@ public class ISMDiscoveryTest { } @Test - public void testPropertyDiscovery() throws Exception{ - ISMDiscovery propertyDiscovery = new ISMDiscovery<>(Property.class); + public void testPropertyDiscovery() throws Exception { + ISMDiscovery propertyDiscovery = new ISMDiscovery(BaseProperty.class); addDiscoveredModel(propertyDiscovery); propertyDiscovery.discover(); - for(Class propertyClass : propertyDiscovery.getDiscovered()) { - logger.info("Going to create : {}", propertyClass); + for(Class propertyClass : propertyDiscovery.getDiscovered()) { logger.info("{}", TypeBinder.serializeType(propertyClass)); } } @Test - public void testEntityDiscovery() throws Exception{ - ISMDiscovery entityDiscovery = new ISMDiscovery<>(Entity.class); + public void testEntityTypeDefinitionSerialization() throws Exception { + logger.info("{}", TypeBinder.serializeType(EntityTypeDefinition.class)); + } + + @Test + public void testDefinitionSerialization() throws Exception { + logger.info("{}", TypeBinder.serializeType(TypeDefinition.class)); + logger.info("{}", TypeBinder.serializeType(EntityTypeDefinition.class)); + logger.info("{}", TypeBinder.serializeType(RelationTypeDefinition.class)); + logger.info("{}", TypeBinder.serializeType(PropertyTypeDefiniton.class)); + logger.info("{}", TypeBinder.serializeType(PropertyDefinition.class)); + } + + @Test + public void testEntityDiscovery() throws Exception { + ISMDiscovery entityDiscovery = new ISMDiscovery<>(BaseEntity.class); addDiscoveredModel(entityDiscovery); entityDiscovery.discover(); - for(Class entity : entityDiscovery.getDiscovered()) { - logger.info("Going to create : {}", entity); + for(Class entity : entityDiscovery.getDiscovered()) { + logger.info("{}", TypeBinder.serializeType(entity)); } } @Test - public void testRelationDiscovery() throws Exception{ + public void testRelationDiscovery() throws Exception { @SuppressWarnings("rawtypes") - ISMDiscovery relationDiscovery = new ISMDiscovery<>(Relation.class); + ISMDiscovery relationDiscovery = new ISMDiscovery<>(BaseRelation.class); addDiscoveredModel(relationDiscovery); relationDiscovery.discover(); + + for(@SuppressWarnings("rawtypes") Class relation : relationDiscovery.getDiscovered()) { + logger.info("{}", TypeBinder.serializeType(relation)); + } } - - } diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java b/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java index a5f798a..c9baaf9 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java @@ -3,10 +3,9 @@ package org.gcube.informationsystem.resourceregistry; import java.io.IOException; import java.util.ServiceLoader; -import org.gcube.informationsystem.model.impl.entities.ContextImpl; -import org.gcube.informationsystem.model.reference.entities.Context; +import org.gcube.informationsystem.context.impl.entities.ContextImpl; +import org.gcube.informationsystem.context.reference.entities.Context; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; -import org.gcube.informationsystem.resourceregistry.context.ContextCreator; import org.gcube.informationsystem.resourceregistry.context.ContextManagement; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; import org.gcube.informationsystem.resourceregistry.dbinitialization.SchemaActionImpl; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java index ecd715a..6ca41e7 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java @@ -1,11 +1,6 @@ package org.gcube.informationsystem.resourceregistry.context; import org.gcube.informationsystem.resourceregistry.ContextTest; -import org.junit.Test; -/* -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -*/ public class ContextManagementTest extends ContextTest {