From 2c4950a6fb73c08df4734d71866d277760270500 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Tue, 5 Nov 2019 18:47:10 +0100
Subject: [PATCH] Aligned APIs with IS model refactoring

---
 .../schema/ResourceRegistrySchemaClient.java              | 3 +--
 .../schema/ResourceRegistrySchemaClientImpl.java          | 7 ++-----
 .../schema/ResourceRegistrySchemaClientTest.java          | 8 +++-----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClient.java
index 2d68770..a6f0ccf 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClient.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClient.java
@@ -13,14 +13,13 @@ import org.gcube.informationsystem.types.reference.TypeDefinition;
  */
 public interface ResourceRegistrySchemaClient {
 
-	public <ISM extends ISManageable> TypeDefinition<ISM> create(Class<ISM> clz)
+	public <ISM extends ISManageable> TypeDefinition create(Class<ISM> clz)
 			throws SchemaException, ResourceRegistryException;
 	
 	public String create(String baseType, String typeDefinitition)
 			throws SchemaException, ResourceRegistryException;
 	
 	
-	@SuppressWarnings("rawtypes")
 	public <ISM extends ISManageable> List<TypeDefinition> read(Class<ISM> clz, Boolean polymorphic)
 			throws SchemaNotFoundException, ResourceRegistryException;
 	
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java
index a6e0b83..cccdb8e 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java
@@ -36,9 +36,8 @@ public class ResourceRegistrySchemaClientImpl implements ResourceRegistrySchemaC
 		
 	}
 	
-	@SuppressWarnings("unchecked")
 	@Override
-	public <ISM extends ISManageable> TypeDefinition<ISM> create(Class<ISM> clz)
+	public <ISM extends ISManageable> TypeDefinition create(Class<ISM> clz)
 			throws SchemaException, ResourceRegistryException {
 		try {
 			String typeDefinition = TypeBinder.serializeType(clz);
@@ -56,8 +55,7 @@ public class ResourceRegistrySchemaClientImpl implements ResourceRegistrySchemaC
 	public String create(String baseType, String typeDefinitition) throws ContextAlreadyPresentException, ResourceRegistryException {
 		try {
 			logger.trace("Going to create: {}", typeDefinitition);
-			@SuppressWarnings("unchecked")
-			TypeDefinition<? extends ISManageable> typeDefinitionObj = TypeBinder.deserializeTypeDefinition(typeDefinitition);
+			TypeDefinition typeDefinitionObj = TypeBinder.deserializeTypeDefinition(typeDefinitition);
 			
 			GXHTTPStringRequest gxHTTPStringRequest = GXHTTPStringRequest.newRequest(address);
 			gxHTTPStringRequest.from(ResourceRegistrySchemaClient.class.getSimpleName());
@@ -80,7 +78,6 @@ public class ResourceRegistrySchemaClientImpl implements ResourceRegistrySchemaC
 	}
 	
 	
-	@SuppressWarnings("rawtypes")
 	@Override
 	public <ISM extends ISManageable> List<TypeDefinition> read(Class<ISM> clz, Boolean polymorphic)
 			throws SchemaNotFoundException, ResourceRegistryException {
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java
index 6a8ba8e..9293b56 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java
@@ -2,7 +2,6 @@ package org.gcube.informationsystem.resourceregistry.schema;
 
 import java.util.List;
 
-import org.gcube.informationsystem.base.reference.ISManageable;
 import org.gcube.informationsystem.model.reference.entities.Facet;
 import org.gcube.informationsystem.types.TypeBinder;
 import org.gcube.informationsystem.types.annotations.Abstract;
@@ -26,11 +25,10 @@ public class ResourceRegistrySchemaClientTest extends ContextTest {
 	// @Test
 	public void testCreate() throws Exception {
 		ResourceRegistrySchemaClient resourceRegistrySchemaClient = ResourceRegistrySchemaClientFactory.create();
-		TypeDefinition<? extends ISManageable> td = resourceRegistrySchemaClient.create(AuxFacet.class);
+		TypeDefinition td = resourceRegistrySchemaClient.create(AuxFacet.class);
 		logger.debug("{}", td);
 	}
 	
-	@SuppressWarnings({"rawtypes", "unchecked"})
 	@Test
 	public void testRead() throws Exception {
 		ResourceRegistrySchemaClient resourceRegistrySchemaClient = ResourceRegistrySchemaClientFactory.create();
@@ -42,8 +40,8 @@ public class ResourceRegistrySchemaClientTest extends ContextTest {
 		
 		types = resourceRegistrySchemaClient.read(Facet.class, false);
 		Assert.assertTrue(types.size()==1);
-		TypeDefinition<Facet> gotFacetDefinition = types.get(0);
-		TypeDefinition<Facet> facetDefinition = TypeBinder.createTypeDefinition(Facet.class);
+		TypeDefinition gotFacetDefinition = types.get(0);
+		TypeDefinition facetDefinition = TypeBinder.createTypeDefinition(Facet.class);
 		
 		
 		Assert.assertTrue(gotFacetDefinition.getName().compareTo(facetDefinition.getName())==0);