From 19a2efe05ef352e7173266fbd3143276d119992e Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 7 Feb 2023 16:58:50 +0100 Subject: [PATCH] Moved to new version of is-model --- .../contexts/ContextCreator.java | 2 +- .../model/discovery/EntityDiscoveryTest.java | 54 +++++-------------- .../resourceregistry/DataBaseCreator.java | 6 +-- src/test/resources/.gitignore | 1 + 4 files changed, 18 insertions(+), 45 deletions(-) diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ContextCreator.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ContextCreator.java index 3219e43..14d5d21 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ContextCreator.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ContextCreator.java @@ -14,7 +14,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.api.exceptions.contexts.ContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.contexts.ContextNotFoundException; import org.gcube.informationsystem.resourceregistry.contexts.entities.ContextManagement; -import org.gcube.informationsystem.utils.ElementMapper; +import org.gcube.informationsystem.serialization.ElementMapper; import org.gcube.resourcemanagement.support.shared.types.datamodel.D4SEnvironment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/gcube/informationsystem/model/discovery/EntityDiscoveryTest.java b/src/test/java/org/gcube/informationsystem/model/discovery/EntityDiscoveryTest.java index 5f872ab..f6adf02 100644 --- a/src/test/java/org/gcube/informationsystem/model/discovery/EntityDiscoveryTest.java +++ b/src/test/java/org/gcube/informationsystem/model/discovery/EntityDiscoveryTest.java @@ -1,75 +1,47 @@ package org.gcube.informationsystem.model.discovery; -import java.util.List; +import java.util.Collection; import java.util.ServiceLoader; import org.gcube.informationsystem.base.reference.Element; import org.gcube.informationsystem.base.reference.entities.EntityElement; import org.gcube.informationsystem.base.reference.properties.PropertyElement; import org.gcube.informationsystem.base.reference.relations.RelationElement; +import org.gcube.informationsystem.discovery.Discovery; +import org.gcube.informationsystem.discovery.RegistrationProvider; +import org.gcube.informationsystem.serialization.ElementMapper; import org.gcube.informationsystem.types.TypeMapper; import org.gcube.informationsystem.types.reference.Type; import org.gcube.informationsystem.types.reference.entities.EntityType; import org.gcube.informationsystem.types.reference.properties.PropertyDefinition; import org.gcube.informationsystem.types.reference.properties.PropertyType; import org.gcube.informationsystem.types.reference.relations.RelationType; -import org.gcube.informationsystem.utils.ElementMapper; -import org.gcube.informationsystem.utils.discovery.Discovery; -import org.gcube.informationsystem.utils.discovery.ElementSpecilizationDiscovery; -import org.gcube.informationsystem.utils.discovery.RegistrationProvider; -import org.gcube.informationsystem.utils.discovery.SchemaAction; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class EntityDiscoveryTest { - private static Logger logger = LoggerFactory.getLogger(ElementSpecilizationDiscovery.class); + private static Logger logger = LoggerFactory.getLogger(EntityDiscoveryTest.class); - private void addDiscoveredModel(ElementSpecilizationDiscovery ismDiscovery) { + private void addDiscoveredModel(Discovery ismDiscovery) { ServiceLoader regsitrationProviders = ServiceLoader .load(RegistrationProvider.class); for(RegistrationProvider registrationProvider : regsitrationProviders) { - List packages = registrationProvider.getPackagesToRegister(); + Collection packages = registrationProvider.getPackagesToRegister(); for(Package p : packages) { ismDiscovery.addPackage(p); } } } - @Test - public void testDiscovery() throws Exception { - SchemaAction schemaAction = new SchemaAction() { - - @Override - public > void manageRelationClass(Class r) - throws Exception { - // TODO Auto-generated method stub - - } - - @Override - public

void managePropertyClass(Class

e) throws Exception { - // TODO Auto-generated method stub - - } - - @Override - public void manageEntityClass(Class e) throws Exception { - // TODO Auto-generated method stub - - } - }; - Discovery.discover(schemaAction); - } - @Test public void testPropertyDiscovery() throws Exception { - ElementSpecilizationDiscovery propertyDiscovery = new ElementSpecilizationDiscovery(PropertyElement.class); + Discovery propertyDiscovery = new Discovery(PropertyElement.class); addDiscoveredModel(propertyDiscovery); propertyDiscovery.discover(); - for(Class propertyClass : propertyDiscovery.getDiscovered()) { + for(Class propertyClass : propertyDiscovery.getDiscoveredElements()) { String json = TypeMapper.serializeType(propertyClass); logger.info("{}", json); Type typeDefinition = TypeMapper.deserializeTypeDefinition(json); @@ -93,11 +65,11 @@ public class EntityDiscoveryTest { @Test public void testEntityDiscovery() throws Exception { - ElementSpecilizationDiscovery entityDiscovery = new ElementSpecilizationDiscovery<>(EntityElement.class); + Discovery entityDiscovery = new Discovery<>(EntityElement.class); addDiscoveredModel(entityDiscovery); entityDiscovery.discover(); - for(Class entity : entityDiscovery.getDiscovered()) { + for(Class entity : entityDiscovery.getDiscoveredElements()) { logger.info("{}", TypeMapper.serializeType(entity)); } } @@ -105,11 +77,11 @@ public class EntityDiscoveryTest { @Test public void testRelationDiscovery() throws Exception { @SuppressWarnings("rawtypes") - ElementSpecilizationDiscovery relationDiscovery = new ElementSpecilizationDiscovery<>(RelationElement.class); + Discovery relationDiscovery = new Discovery<>(RelationElement.class); addDiscoveredModel(relationDiscovery); relationDiscovery.discover(); - for(@SuppressWarnings("rawtypes") Class relation : relationDiscovery.getDiscovered()) { + for(@SuppressWarnings("rawtypes") Class relation : relationDiscovery.getDiscoveredElements()) { logger.info("{}", TypeMapper.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 ff8342d..ece72e6 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java @@ -8,7 +8,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis import org.gcube.informationsystem.resourceregistry.contexts.ContextCreator; import org.gcube.informationsystem.resourceregistry.contexts.entities.ContextManagement; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; -import org.gcube.informationsystem.utils.ElementMapper; +import org.gcube.informationsystem.serialization.ElementMapper; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,7 +25,7 @@ public class DataBaseCreator extends ContextTest { logger.debug("{} created", db); } - @Test + // @Test public void createAllContext() throws Exception { ContextTest.setContextByName(ROOT_DEV); ContextCreator contextCreator = new ContextCreator(); @@ -41,7 +41,7 @@ public class DataBaseCreator extends ContextTest { return c; } - // @Test + @Test public void createDevContext() throws Exception { Context gcube = new ContextImpl("gcube"); gcube = create(gcube); diff --git a/src/test/resources/.gitignore b/src/test/resources/.gitignore index adfc5eb..54ab8fa 100644 --- a/src/test/resources/.gitignore +++ b/src/test/resources/.gitignore @@ -9,3 +9,4 @@ /config.ini /config.properties.prod /d4science.key +/config.properties.localhost