Moved to new version of is-model

This commit is contained in:
Luca Frosini 2023-02-07 16:58:50 +01:00
parent 1cfbcd8529
commit 19a2efe05e
4 changed files with 18 additions and 45 deletions

View File

@ -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;

View File

@ -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<? extends Element> ismDiscovery) {
private void addDiscoveredModel(Discovery<? extends Element> ismDiscovery) {
ServiceLoader<? extends RegistrationProvider> regsitrationProviders = ServiceLoader
.load(RegistrationProvider.class);
for(RegistrationProvider registrationProvider : regsitrationProviders) {
List<Package> packages = registrationProvider.getPackagesToRegister();
Collection<Package> packages = registrationProvider.getPackagesToRegister();
for(Package p : packages) {
ismDiscovery.addPackage(p);
}
}
}
@Test
public void testDiscovery() throws Exception {
SchemaAction schemaAction = new SchemaAction() {
@Override
public <R extends RelationElement<? extends EntityElement,? extends EntityElement>> void manageRelationClass(Class<R> r)
throws Exception {
// TODO Auto-generated method stub
}
@Override
public <P extends PropertyElement> void managePropertyClass(Class<P> e) throws Exception {
// TODO Auto-generated method stub
}
@Override
public <E extends EntityElement> void manageEntityClass(Class<E> e) throws Exception {
// TODO Auto-generated method stub
}
};
Discovery.discover(schemaAction);
}
@Test
public void testPropertyDiscovery() throws Exception {
ElementSpecilizationDiscovery<PropertyElement> propertyDiscovery = new ElementSpecilizationDiscovery<PropertyElement>(PropertyElement.class);
Discovery<PropertyElement> propertyDiscovery = new Discovery<PropertyElement>(PropertyElement.class);
addDiscoveredModel(propertyDiscovery);
propertyDiscovery.discover();
for(Class<? extends PropertyElement> propertyClass : propertyDiscovery.getDiscovered()) {
for(Class<? extends PropertyElement> 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<EntityElement> entityDiscovery = new ElementSpecilizationDiscovery<>(EntityElement.class);
Discovery<EntityElement> entityDiscovery = new Discovery<>(EntityElement.class);
addDiscoveredModel(entityDiscovery);
entityDiscovery.discover();
for(Class<? extends EntityElement> entity : entityDiscovery.getDiscovered()) {
for(Class<? extends EntityElement> entity : entityDiscovery.getDiscoveredElements()) {
logger.info("{}", TypeMapper.serializeType(entity));
}
}
@ -105,11 +77,11 @@ public class EntityDiscoveryTest {
@Test
public void testRelationDiscovery() throws Exception {
@SuppressWarnings("rawtypes")
ElementSpecilizationDiscovery<RelationElement> relationDiscovery = new ElementSpecilizationDiscovery<>(RelationElement.class);
Discovery<RelationElement> relationDiscovery = new Discovery<>(RelationElement.class);
addDiscoveredModel(relationDiscovery);
relationDiscovery.discover();
for(@SuppressWarnings("rawtypes") Class<? extends RelationElement> relation : relationDiscovery.getDiscovered()) {
for(@SuppressWarnings("rawtypes") Class<? extends RelationElement> relation : relationDiscovery.getDiscoveredElements()) {
logger.info("{}", TypeMapper.serializeType(relation));
}
}

View File

@ -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);

View File

@ -9,3 +9,4 @@
/config.ini
/config.properties.prod
/d4science.key
/config.properties.localhost