From 5e607461f1574b994aec03926152fec6a2895c50 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 3 Feb 2023 14:44:42 +0100
Subject: [PATCH] Renaming objects

---
 .../discovery/DiscoveredElementAction.java    | 15 +++++++++++
 .../discovery/DiscoveryUtility.java           | 13 +++++----
 .../discovery/SchemaAction.java               | 21 ---------------
 .../serialization/ElementMapper.java          |  6 ++---
 .../serialization/ElementMappingAction.java   | 27 +++----------------
 .../utils/discovery/ISMDiscoveryTest.java     |  4 +--
 6 files changed, 30 insertions(+), 56 deletions(-)
 create mode 100644 src/main/java/org/gcube/informationsystem/discovery/DiscoveredElementAction.java
 delete mode 100644 src/main/java/org/gcube/informationsystem/discovery/SchemaAction.java

diff --git a/src/main/java/org/gcube/informationsystem/discovery/DiscoveredElementAction.java b/src/main/java/org/gcube/informationsystem/discovery/DiscoveredElementAction.java
new file mode 100644
index 0000000..05904b2
--- /dev/null
+++ b/src/main/java/org/gcube/informationsystem/discovery/DiscoveredElementAction.java
@@ -0,0 +1,15 @@
+/**
+ * 
+ */
+package org.gcube.informationsystem.discovery;
+
+import org.gcube.informationsystem.base.reference.Element;
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public interface DiscoveredElementAction {
+
+	public <E extends Element> void manageElementType(Class<E> e) throws Exception;
+	
+}
diff --git a/src/main/java/org/gcube/informationsystem/discovery/DiscoveryUtility.java b/src/main/java/org/gcube/informationsystem/discovery/DiscoveryUtility.java
index 2a833a6..3a5592d 100644
--- a/src/main/java/org/gcube/informationsystem/discovery/DiscoveryUtility.java
+++ b/src/main/java/org/gcube/informationsystem/discovery/DiscoveryUtility.java
@@ -40,13 +40,12 @@ public class DiscoveryUtility {
 		return packages;
 	}
 	
-	public static void discover(SchemaAction schemaAction) throws Exception {
+	public static void discover(DiscoveredElementAction schemaAction) throws Exception {
 		List<Package> packages = DiscoveryUtility.discoverPackages();
 		DiscoveryUtility.manageISM(schemaAction , packages);
 	}
 
-	@SuppressWarnings("unchecked")
-	public static void manageISM(SchemaAction schemaAction, Package... packages) throws Exception {
+	public static void manageISM(DiscoveredElementAction dea, Package... packages) throws Exception {
 		Discovery<PropertyElement> propertyDiscovery = new Discovery<>(PropertyElement.class);
 		if(Objects.nonNull(packages)) {
 			Arrays.stream(packages).forEach(p -> propertyDiscovery.addPackage(p));
@@ -54,7 +53,7 @@ public class DiscoveryUtility {
 		propertyDiscovery.discover();
 		for(Class<? extends PropertyElement> property : propertyDiscovery.getDiscovered()) {
 			logger.trace("Going to manage : {}", property);
-			schemaAction.managePropertyClass(property);
+			dea.manageElementType(property);
 		}
 		
 		Discovery<EntityElement> entityDiscovery = new Discovery<>(EntityElement.class);
@@ -65,7 +64,7 @@ public class DiscoveryUtility {
 		
 		for(Class<? extends EntityElement> entity : entityDiscovery.getDiscovered()) {
 			logger.trace("Going to manage : {}", entity);
-			schemaAction.manageEntityClass(entity);
+			dea.manageElementType(entity);
 		}
 		
 		@SuppressWarnings("rawtypes")
@@ -77,11 +76,11 @@ public class DiscoveryUtility {
 		for(@SuppressWarnings("rawtypes")
 		Class<? extends RelationElement> relation : relationDiscovery.getDiscovered()) {
 			logger.trace("Going to manage : {}", relation);
-			schemaAction.manageRelationClass(relation);
+			dea.manageElementType(relation);
 		}
 	}
 
-	public static void manageISM(SchemaAction schemaAction, List<Package> packages) throws Exception {
+	public static void manageISM(DiscoveredElementAction schemaAction, List<Package> packages) throws Exception {
 		if(Objects.nonNull(packages) && packages.size() > 0) {
 			manageISM(schemaAction, packages.stream().toArray(Package[]::new));
 		} else {
diff --git a/src/main/java/org/gcube/informationsystem/discovery/SchemaAction.java b/src/main/java/org/gcube/informationsystem/discovery/SchemaAction.java
deleted file mode 100644
index be489f7..0000000
--- a/src/main/java/org/gcube/informationsystem/discovery/SchemaAction.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * 
- */
-package org.gcube.informationsystem.discovery;
-
-import org.gcube.informationsystem.base.reference.entities.EntityElement;
-import org.gcube.informationsystem.base.reference.properties.PropertyElement;
-import org.gcube.informationsystem.base.reference.relations.RelationElement;
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- */
-public interface SchemaAction {
-
-	public <P extends PropertyElement> void managePropertyClass(Class<P> p) throws Exception;
-	
-	public <E extends EntityElement> void manageEntityClass(Class<E> e) throws Exception;
-	
-	public <R extends RelationElement<? extends EntityElement, ? extends EntityElement>> void manageRelationClass(Class<R> r) throws Exception;
-	
-}
diff --git a/src/main/java/org/gcube/informationsystem/serialization/ElementMapper.java b/src/main/java/org/gcube/informationsystem/serialization/ElementMapper.java
index a2ce967..e8c0b05 100644
--- a/src/main/java/org/gcube/informationsystem/serialization/ElementMapper.java
+++ b/src/main/java/org/gcube/informationsystem/serialization/ElementMapper.java
@@ -30,7 +30,7 @@ import org.gcube.informationsystem.base.reference.AccessType;
 import org.gcube.informationsystem.base.reference.Element;
 import org.gcube.informationsystem.discovery.DiscoveryUtility;
 import org.gcube.informationsystem.discovery.RegistrationProvider;
-import org.gcube.informationsystem.discovery.SchemaAction;
+import org.gcube.informationsystem.discovery.DiscoveredElementAction;
 import org.gcube.informationsystem.types.TypeMapper;
 import org.gcube.informationsystem.types.reference.Type;
 import org.slf4j.Logger;
@@ -101,7 +101,7 @@ public abstract class ElementMapper {
 	}
 	
 	public static void registerPackages(List<Package> packages) {
-		SchemaAction schemaAction = new ElementMappingAction();
+		DiscoveredElementAction schemaAction = new ElementMappingAction();
 		try {
 			DiscoveryUtility.manageISM(schemaAction, packages);
 		} catch(Exception e) {
@@ -110,7 +110,7 @@ public abstract class ElementMapper {
 	}
 	
 	public static void registerPackages(Package... packages) {
-		SchemaAction schemaAction = new ElementMappingAction();
+		DiscoveredElementAction schemaAction = new ElementMappingAction();
 		try {
 			DiscoveryUtility.manageISM(schemaAction, packages);
 		} catch(Exception e) {
diff --git a/src/main/java/org/gcube/informationsystem/serialization/ElementMappingAction.java b/src/main/java/org/gcube/informationsystem/serialization/ElementMappingAction.java
index c3876f5..3c46d54 100644
--- a/src/main/java/org/gcube/informationsystem/serialization/ElementMappingAction.java
+++ b/src/main/java/org/gcube/informationsystem/serialization/ElementMappingAction.java
@@ -3,36 +3,17 @@
  */
 package org.gcube.informationsystem.serialization;
 
-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.SchemaAction;
+import org.gcube.informationsystem.base.reference.Element;
+import org.gcube.informationsystem.discovery.DiscoveredElementAction;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
-class ElementMappingAction implements SchemaAction {
+class ElementMappingAction implements DiscoveredElementAction {
 
-	public ElementMappingAction(){
-		
-	}
-	
 	@Override
-	public <P extends PropertyElement> void managePropertyClass(Class<P> e)
-			throws Exception {
+	public <E extends Element> void manageElementType(Class<E> e) throws Exception {
 		ElementMapper.registerSubtype(e);
 	}
-	
-	@Override
-	public <E extends EntityElement> void manageEntityClass(Class<E> e)
-			throws Exception {
-		ElementMapper.registerSubtype(e);
-	}
-	
-	@Override
-	public <R extends RelationElement<? extends EntityElement, ? extends EntityElement>> void manageRelationClass(
-			Class<R> r) throws Exception {
-		ElementMapper.registerSubtype(r);
-	}
 
 }
diff --git a/src/test/java/org/gcube/informationsystem/utils/discovery/ISMDiscoveryTest.java b/src/test/java/org/gcube/informationsystem/utils/discovery/ISMDiscoveryTest.java
index ded616e..9cc8ab3 100644
--- a/src/test/java/org/gcube/informationsystem/utils/discovery/ISMDiscoveryTest.java
+++ b/src/test/java/org/gcube/informationsystem/utils/discovery/ISMDiscoveryTest.java
@@ -13,7 +13,7 @@ import org.gcube.informationsystem.base.reference.relations.RelationElement;
 import org.gcube.informationsystem.discovery.Discovery;
 import org.gcube.informationsystem.discovery.DiscoveryUtility;
 import org.gcube.informationsystem.discovery.RegistrationProvider;
-import org.gcube.informationsystem.discovery.SchemaAction;
+import org.gcube.informationsystem.discovery.DiscoveredElementAction;
 import org.gcube.informationsystem.types.TypeMapper;
 import org.gcube.informationsystem.types.reference.Type;
 import org.gcube.informationsystem.types.reference.properties.PropertyDefinition;
@@ -98,7 +98,7 @@ public class ISMDiscoveryTest {
 			packages.addAll(registrationProvider.getPackagesToRegister());
 		}
 		
-		SchemaAction schemaAction = new SchemaAction() {
+		DiscoveredElementAction schemaAction = new DiscoveredElementAction() {
 			
 			@Override
 			public <R extends RelationElement<? extends EntityElement, ? extends EntityElement>> void manageRelationClass(