From 0e6b9f48542ac71309000745b30d32fa4397d572 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 2 Jul 2020 19:17:57 +0200
Subject: [PATCH] Cleaning code

---
 .../gcube/informationsystem/utils/ElementMapper.java  | 11 ++++++-----
 .../informationsystem/utils/ElementMappingAction.java |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/gcube/informationsystem/utils/ElementMapper.java b/src/main/java/org/gcube/informationsystem/utils/ElementMapper.java
index 950d636..0c38794 100644
--- a/src/main/java/org/gcube/informationsystem/utils/ElementMapper.java
+++ b/src/main/java/org/gcube/informationsystem/utils/ElementMapper.java
@@ -65,9 +65,10 @@ public abstract class ElementMapper {
 		List<Package> packages = new ArrayList<Package>();
 		
 		Class<Type> tdClz = Type.class;
-		ElementMapper.registerSubtypes(tdClz);
+		ElementMapper.registerSubtype(tdClz);
 		packages.add(tdClz.getPackage());
 		
+		
 		AccessType[] accessTypes = AccessType.values();
 		for(AccessType accessType : accessTypes) {
 			@SuppressWarnings("rawtypes")
@@ -77,15 +78,15 @@ public abstract class ElementMapper {
 				if(dummyClz != null) {
 					ElementMapper.registerSubtypes(clz, dummyClz);
 				}else {
-					ElementMapper.registerSubtypes(clz);
+					ElementMapper.registerSubtype(clz);
 				}
 				packages.add(clz.getPackage());
 			}
 			
 		}
-		
 		registerPackages(packages);
 		
+		
 		ServiceLoader<? extends RegistrationProvider> regsitrationProviders = ServiceLoader
 				.load(RegistrationProvider.class);
 		for(RegistrationProvider registrationProvider : regsitrationProviders) {
@@ -117,10 +118,10 @@ public abstract class ElementMapper {
 		SimpleModule isModule = new SimpleModule(typeName);
 		isModule.addDeserializer(clz, new ElementDeserializer<>(clz, mapper));
 		mapper.registerModule(isModule);
-		registerSubtypes(implementationClass);
+		registerSubtype(implementationClass);
 	}
 	
-	public static <El extends Element> void registerSubtypes(Class<El> clz) {
+	public static <El extends Element> void registerSubtype(Class<El> clz) {
 		String typeName =  TypeMapper.getType(clz);
 		knownTypes.put(typeName, clz);
 		mapper.registerSubtypes(clz);
diff --git a/src/main/java/org/gcube/informationsystem/utils/ElementMappingAction.java b/src/main/java/org/gcube/informationsystem/utils/ElementMappingAction.java
index fc6be1f..cf907af 100644
--- a/src/main/java/org/gcube/informationsystem/utils/ElementMappingAction.java
+++ b/src/main/java/org/gcube/informationsystem/utils/ElementMappingAction.java
@@ -20,19 +20,19 @@ class ElementMappingAction implements SchemaAction {
 	@Override
 	public <P extends PropertyElement> void managePropertyClass(Class<P> e)
 			throws Exception {
-		ElementMapper.registerSubtypes(e);
+		ElementMapper.registerSubtype(e);
 	}
 	
 	@Override
 	public <E extends EntityElement> void manageEntityClass(Class<E> e)
 			throws Exception {
-		ElementMapper.registerSubtypes(e);
+		ElementMapper.registerSubtype(e);
 	}
 	
 	@Override
 	public <R extends RelationElement<? extends EntityElement, ? extends EntityElement>> void manageRelationClass(
 			Class<R> r) throws Exception {
-		ElementMapper.registerSubtypes(r);
+		ElementMapper.registerSubtype(r);
 	}
 
 }