Minor fixes
This commit is contained in:
parent
45901f0a37
commit
714086096f
|
@ -28,6 +28,8 @@ import org.gcube.resourcemanagement.model.reference.properties.utilities.Validat
|
||||||
@Change(version = TypeVersion.MINIMAL_VERSION_STRING, description = TypeVersion.MINIMAL_VERSION_DESCRIPTION)
|
@Change(version = TypeVersion.MINIMAL_VERSION_STRING, description = TypeVersion.MINIMAL_VERSION_DESCRIPTION)
|
||||||
public interface EnumStringProperty extends GCubeProperty, ValidatedTypedProperty<Set<String>, String> {
|
public interface EnumStringProperty extends GCubeProperty, ValidatedTypedProperty<Set<String>, String> {
|
||||||
|
|
||||||
|
public static final String NAME = "EnumStringProperty"; //EnumStringProperty.class.getSimpleName();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
default Validation validate() {
|
default Validation validate() {
|
||||||
return new SetStringValidator().validate(this);
|
return new SetStringValidator().validate(this);
|
||||||
|
|
|
@ -24,5 +24,6 @@ import org.gcube.resourcemanagement.model.impl.properties.GCubePropertyImpl;
|
||||||
public interface GCubeProperty extends Property {
|
public interface GCubeProperty extends Property {
|
||||||
|
|
||||||
public static final String NAME = "GCubeProperty"; //GCubeProperty.class.getSimpleName();
|
public static final String NAME = "GCubeProperty"; //GCubeProperty.class.getSimpleName();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,6 +48,9 @@ public class ISMDiscoveryTest {
|
||||||
@Override
|
@Override
|
||||||
public <R extends RelationElement<? extends EntityElement, ? extends EntityElement>> void manageRelationClass(
|
public <R extends RelationElement<? extends EntityElement, ? extends EntityElement>> void manageRelationClass(
|
||||||
Class<R> r) throws Exception {
|
Class<R> r) throws Exception {
|
||||||
|
if(r.isAssignableFrom(Type.class)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
Type type = TypeMapper.createTypeDefinition(r);
|
Type type = TypeMapper.createTypeDefinition(r);
|
||||||
Assert.assertTrue(type.getName().compareTo(r.getSimpleName())==0);
|
Assert.assertTrue(type.getName().compareTo(r.getSimpleName())==0);
|
||||||
logger.debug("{} {}", r.getSimpleName(), TypeMapper.serializeTypeDefinition(type));
|
logger.debug("{} {}", r.getSimpleName(), TypeMapper.serializeTypeDefinition(type));
|
||||||
|
@ -55,6 +58,9 @@ public class ISMDiscoveryTest {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <P extends PropertyElement> void managePropertyClass(Class<P> p) throws Exception {
|
public <P extends PropertyElement> void managePropertyClass(Class<P> p) throws Exception {
|
||||||
|
if(p.isAssignableFrom(Type.class)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
Type type = TypeMapper.createTypeDefinition(p);
|
Type type = TypeMapper.createTypeDefinition(p);
|
||||||
Assert.assertTrue(type.getName().compareTo(p.getSimpleName())==0);
|
Assert.assertTrue(type.getName().compareTo(p.getSimpleName())==0);
|
||||||
logger.debug("{} {}", p.getSimpleName(), TypeMapper.serializeTypeDefinition(type));
|
logger.debug("{} {}", p.getSimpleName(), TypeMapper.serializeTypeDefinition(type));
|
||||||
|
@ -62,13 +68,15 @@ public class ISMDiscoveryTest {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <E extends EntityElement> void manageEntityClass(Class<E> e) throws Exception {
|
public <E extends EntityElement> void manageEntityClass(Class<E> e) throws Exception {
|
||||||
|
if(e.isAssignableFrom(Type.class)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
Type type = TypeMapper.createTypeDefinition(e);
|
Type type = TypeMapper.createTypeDefinition(e);
|
||||||
Assert.assertTrue(type.getName().compareTo(e.getSimpleName())==0);
|
Assert.assertTrue(type.getName().compareTo(e.getSimpleName())==0);
|
||||||
logger.debug("{} {}", e.getSimpleName(), TypeMapper.serializeTypeDefinition(type));
|
logger.debug("{} {}", e.getSimpleName(), TypeMapper.serializeTypeDefinition(type));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
ElementSpecilizationDiscovery.manageISM(schemaAction , packages);
|
ElementSpecilizationDiscovery.manageISM(schemaAction , packages);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue