From 714086096fbde63ce6eea1ab088164dbe40168ef Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Tue, 15 Dec 2020 20:07:16 +0100
Subject: [PATCH] Minor fixes

---
 .../model/reference/properties/EnumStringProperty.java |  2 ++
 .../model/reference/properties/GCubeProperty.java      |  1 +
 .../resourcemanagement/model/ISMDiscoveryTest.java     | 10 +++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringProperty.java b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringProperty.java
index 6756ca8..46fae99 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringProperty.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/EnumStringProperty.java
@@ -28,6 +28,8 @@ import org.gcube.resourcemanagement.model.reference.properties.utilities.Validat
 @Change(version = TypeVersion.MINIMAL_VERSION_STRING, description = TypeVersion.MINIMAL_VERSION_DESCRIPTION)
 public interface EnumStringProperty extends GCubeProperty, ValidatedTypedProperty<Set<String>, String> {
 	
+	public static final String NAME = "EnumStringProperty"; //EnumStringProperty.class.getSimpleName();
+	
 	@Override
 	default Validation validate() {
 		return new SetStringValidator().validate(this);
diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/GCubeProperty.java b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/GCubeProperty.java
index b74a197..230c7de 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/reference/properties/GCubeProperty.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/reference/properties/GCubeProperty.java
@@ -24,5 +24,6 @@ import org.gcube.resourcemanagement.model.impl.properties.GCubePropertyImpl;
 public interface GCubeProperty extends Property {
 	
 	public static final String NAME = "GCubeProperty"; //GCubeProperty.class.getSimpleName();
+	
 }
 	
\ No newline at end of file
diff --git a/src/test/java/org/gcube/resourcemanagement/model/ISMDiscoveryTest.java b/src/test/java/org/gcube/resourcemanagement/model/ISMDiscoveryTest.java
index ccbbb7c..6bbf611 100644
--- a/src/test/java/org/gcube/resourcemanagement/model/ISMDiscoveryTest.java
+++ b/src/test/java/org/gcube/resourcemanagement/model/ISMDiscoveryTest.java
@@ -48,6 +48,9 @@ public class ISMDiscoveryTest {
 			@Override
 			public <R extends RelationElement<? extends EntityElement, ? extends EntityElement>> void manageRelationClass(
 					Class<R> r) throws Exception {
+				if(r.isAssignableFrom(Type.class)) {
+					return;
+				}
 				Type type = TypeMapper.createTypeDefinition(r);
 				Assert.assertTrue(type.getName().compareTo(r.getSimpleName())==0);
 				logger.debug("{} {}", r.getSimpleName(), TypeMapper.serializeTypeDefinition(type));
@@ -55,6 +58,9 @@ public class ISMDiscoveryTest {
 			
 			@Override
 			public <P extends PropertyElement> void managePropertyClass(Class<P> p) throws Exception {
+				if(p.isAssignableFrom(Type.class)) {
+					return;
+				}
 				Type type = TypeMapper.createTypeDefinition(p);
 				Assert.assertTrue(type.getName().compareTo(p.getSimpleName())==0);
 				logger.debug("{} {}", p.getSimpleName(), TypeMapper.serializeTypeDefinition(type));
@@ -62,13 +68,15 @@ public class ISMDiscoveryTest {
 			
 			@Override
 			public <E extends EntityElement> void manageEntityClass(Class<E> e) throws Exception {
+				if(e.isAssignableFrom(Type.class)) {
+					return;
+				}
 				Type type = TypeMapper.createTypeDefinition(e);
 				Assert.assertTrue(type.getName().compareTo(e.getSimpleName())==0);
 				logger.debug("{} {}", e.getSimpleName(), TypeMapper.serializeTypeDefinition(type));
 			}
 		};
 		
-		
 		ElementSpecilizationDiscovery.manageISM(schemaAction , packages);
 	}
 }