luca.frosini
/
resource-registry-database-creator
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing imports and code to be aligned with model reorganization

This commit is contained in:
Luca Frosini 2019-10-25 17:45:16 +02:00
parent f3fb7b26a4
commit 26c54a7a47
5 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@ -76,12 +76,15 @@
<!-- Test Dependency --> <!-- Test Dependency -->
<!--
<dependency> <dependency>
<groupId>org.gcube.information-system</groupId> <groupId>org.gcube.information-system</groupId>
<artifactId>resource-registry</artifactId> <artifactId>resource-registry</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version> <version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
-->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>

14
src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java
View File

@ -1,5 +1,5 @@
package org.gcube.informationsystem.resourceregistry.context; package org.gcube.informationsystem.resourceregistry.context;
/*
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -7,21 +7,24 @@ import java.util.UUID;
import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean;
import org.gcube.context.ContextElaborator; import org.gcube.context.ContextElaborator;
import org.gcube.informationsystem.model.impl.entities.ContextImpl; import org.gcube.informationsystem.context.impl.entities.ContextImpl;
import org.gcube.informationsystem.model.reference.entities.Context; import org.gcube.informationsystem.context.reference.entities.Context;
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; 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.ContextException;
import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException;
import org.gcube.informationsystem.utils.ISMapper; import org.gcube.informationsystem.utils.ISMapper;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
*/
public class ContextCreator extends ContextElaborator { public class ContextCreator {}
/*
extends ContextElaborator {
private static Logger logger = LoggerFactory.getLogger(ContextCreator.class); private static Logger logger = LoggerFactory.getLogger(ContextCreator.class);
protected Map<String, UUID> contexts; protected Map<String, UUID> contexts;
protected ContextManagement contextManagement; protected ContextManagement contextManagement;
public ContextCreator() { public ContextCreator() {
@ -82,3 +85,4 @@ public class ContextCreator extends ContextElaborator {
} }
} }
*/

59
src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java
View File

@ -3,11 +3,16 @@ package org.gcube.informationsystem.model.discovery;
import java.util.List; import java.util.List;
import java.util.ServiceLoader; import java.util.ServiceLoader;
import org.gcube.informationsystem.model.reference.ISManageable; import org.gcube.informationsystem.base.reference.ISManageable;
import org.gcube.informationsystem.model.reference.entities.Entity; import org.gcube.informationsystem.base.reference.entities.BaseEntity;
import org.gcube.informationsystem.model.reference.properties.Property; import org.gcube.informationsystem.base.reference.properties.BaseProperty;
import org.gcube.informationsystem.model.reference.relations.Relation; import org.gcube.informationsystem.base.reference.relations.BaseRelation;
import org.gcube.informationsystem.types.TypeBinder; 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.ISMDiscovery;
import org.gcube.informationsystem.utils.discovery.RegistrationProvider; import org.gcube.informationsystem.utils.discovery.RegistrationProvider;
import org.junit.Test; import org.junit.Test;
@ -15,12 +20,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class ISMDiscoveryTest { public class ISMDiscoveryTest {
private static Logger logger = LoggerFactory.getLogger(ISMDiscovery.class); private static Logger logger = LoggerFactory.getLogger(ISMDiscovery.class);
private void addDiscoveredModel(ISMDiscovery<? extends ISManageable> ismDiscovery) { private void addDiscoveredModel(ISMDiscovery<? extends ISManageable> ismDiscovery) {
ServiceLoader<? extends RegistrationProvider> regsitrationProviders = ServiceLoader.load(RegistrationProvider.class); ServiceLoader<? extends RegistrationProvider> regsitrationProviders = ServiceLoader
for (RegistrationProvider registrationProvider : regsitrationProviders) { .load(RegistrationProvider.class);
for(RegistrationProvider registrationProvider : regsitrationProviders) {
List<Package> packages = registrationProvider.getPackagesToRegister(); List<Package> packages = registrationProvider.getPackagesToRegister();
for(Package p : packages) { for(Package p : packages) {
ismDiscovery.addPackage(p); ismDiscovery.addPackage(p);
@ -29,36 +35,51 @@ public class ISMDiscoveryTest {
} }
@Test @Test
public void testPropertyDiscovery() throws Exception{ public void testPropertyDiscovery() throws Exception {
ISMDiscovery<Property> propertyDiscovery = new ISMDiscovery<>(Property.class); ISMDiscovery<BaseProperty> propertyDiscovery = new ISMDiscovery<BaseProperty>(BaseProperty.class);
addDiscoveredModel(propertyDiscovery); addDiscoveredModel(propertyDiscovery);
propertyDiscovery.discover(); propertyDiscovery.discover();
for(Class<Property> propertyClass : propertyDiscovery.getDiscovered()) { for(Class<BaseProperty> propertyClass : propertyDiscovery.getDiscovered()) {
logger.info("Going to create : {}", propertyClass);
logger.info("{}", TypeBinder.serializeType(propertyClass)); logger.info("{}", TypeBinder.serializeType(propertyClass));
} }
} }
@Test @Test
public void testEntityDiscovery() throws Exception{ public void testEntityTypeDefinitionSerialization() throws Exception {
ISMDiscovery<Entity> entityDiscovery = new ISMDiscovery<>(Entity.class); 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<BaseEntity> entityDiscovery = new ISMDiscovery<>(BaseEntity.class);
addDiscoveredModel(entityDiscovery); addDiscoveredModel(entityDiscovery);
entityDiscovery.discover(); entityDiscovery.discover();
for(Class<Entity> entity : entityDiscovery.getDiscovered()) { for(Class<BaseEntity> entity : entityDiscovery.getDiscovered()) {
logger.info("Going to create : {}", entity); logger.info("{}", TypeBinder.serializeType(entity));
} }
} }
@Test @Test
public void testRelationDiscovery() throws Exception{ public void testRelationDiscovery() throws Exception {
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
ISMDiscovery<Relation> relationDiscovery = new ISMDiscovery<>(Relation.class); ISMDiscovery<BaseRelation> relationDiscovery = new ISMDiscovery<>(BaseRelation.class);
addDiscoveredModel(relationDiscovery); addDiscoveredModel(relationDiscovery);
relationDiscovery.discover(); relationDiscovery.discover();
for(@SuppressWarnings("rawtypes") Class<BaseRelation> relation : relationDiscovery.getDiscovered()) {
logger.info("{}", TypeBinder.serializeType(relation));
}
} }
} }

5
src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
View File

@ -3,10 +3,9 @@ package org.gcube.informationsystem.resourceregistry;
import java.io.IOException; import java.io.IOException;
import java.util.ServiceLoader; import java.util.ServiceLoader;
import org.gcube.informationsystem.model.impl.entities.ContextImpl; import org.gcube.informationsystem.context.impl.entities.ContextImpl;
import org.gcube.informationsystem.model.reference.entities.Context; import org.gcube.informationsystem.context.reference.entities.Context;
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; 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.context.ContextManagement;
import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment; import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment;
import org.gcube.informationsystem.resourceregistry.dbinitialization.SchemaActionImpl; import org.gcube.informationsystem.resourceregistry.dbinitialization.SchemaActionImpl;

5
src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java
View File

@ -1,11 +1,6 @@
package org.gcube.informationsystem.resourceregistry.context; package org.gcube.informationsystem.resourceregistry.context;
import org.gcube.informationsystem.resourceregistry.ContextTest; import org.gcube.informationsystem.resourceregistry.ContextTest;
import org.junit.Test;
/*
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
*/
public class ContextManagementTest extends ContextTest { public class ContextManagementTest extends ContextTest {