gCubeSystem
/
resource-registry-schema-client
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TypeBinder has been renamed to TypeMapper

This commit is contained in:
Luca Frosini 2020-02-04 09:31:29 +01:00
parent 97b1122f02
commit 77fab51f0f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java
View File

@ -16,7 +16,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.Schema
import org.gcube.informationsystem.resourceregistry.api.rest.TypePath; import org.gcube.informationsystem.resourceregistry.api.rest.TypePath;
import org.gcube.informationsystem.resourceregistry.api.rest.httputils.HTTPUtility; import org.gcube.informationsystem.resourceregistry.api.rest.httputils.HTTPUtility;
import org.gcube.informationsystem.resourceregistry.api.utils.Utility; import org.gcube.informationsystem.resourceregistry.api.utils.Utility;
import org.gcube.informationsystem.types.TypeBinder; import org.gcube.informationsystem.types.TypeMapper;
import org.gcube.informationsystem.types.reference.Type; import org.gcube.informationsystem.types.reference.Type;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -39,10 +39,10 @@ public class ResourceRegistrySchemaClientImpl implements ResourceRegistrySchemaC
public <E extends Element> Type create(Class<E> clz) public <E extends Element> Type create(Class<E> clz)
throws SchemaException, ResourceRegistryException { throws SchemaException, ResourceRegistryException {
try { try {
String typeDefinition = TypeBinder.serializeType(clz); String typeDefinition = TypeMapper.serializeType(clz);
// String type = AccessType.getAccessType(clz).getName(); // String type = AccessType.getAccessType(clz).getName();
String res = create(typeDefinition); String res = create(typeDefinition);
return TypeBinder.deserializeTypeDefinition(res); return TypeMapper.deserializeTypeDefinition(res);
} catch(ResourceRegistryException e) { } catch(ResourceRegistryException e) {
throw e; throw e;
} catch(Exception e) { } catch(Exception e) {
@ -54,7 +54,7 @@ public class ResourceRegistrySchemaClientImpl implements ResourceRegistrySchemaC
public String create(String typeDefinitition) throws ContextAlreadyPresentException, ResourceRegistryException { public String create(String typeDefinitition) throws ContextAlreadyPresentException, ResourceRegistryException {
try { try {
logger.trace("Going to create: {}", typeDefinitition); logger.trace("Going to create: {}", typeDefinitition);
Type typeDefinitionObj = TypeBinder.deserializeTypeDefinition(typeDefinitition); Type typeDefinitionObj = TypeMapper.deserializeTypeDefinition(typeDefinitition);
GXHTTPStringRequest gxHTTPStringRequest = GXHTTPStringRequest.newRequest(address); GXHTTPStringRequest gxHTTPStringRequest = GXHTTPStringRequest.newRequest(address);
gxHTTPStringRequest.from(ResourceRegistrySchemaClient.class.getSimpleName()); gxHTTPStringRequest.from(ResourceRegistrySchemaClient.class.getSimpleName());
@ -83,7 +83,7 @@ public class ResourceRegistrySchemaClientImpl implements ResourceRegistrySchemaC
try { try {
String typeName = Utility.getTypeName(clz); String typeName = Utility.getTypeName(clz);
String res = read(typeName, polymorphic); String res = read(typeName, polymorphic);
return TypeBinder.deserializeTypeDefinitions(res); return TypeMapper.deserializeTypeDefinitions(res);
} catch(ResourceRegistryException e) { } catch(ResourceRegistryException e) {
throw e; throw e;
} catch(Exception e) { } catch(Exception e) {

4
src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java
View File

@ -3,7 +3,7 @@ package org.gcube.informationsystem.resourceregistry.schema;
import java.util.List; import java.util.List;
import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.entities.Facet;
import org.gcube.informationsystem.types.TypeBinder; import org.gcube.informationsystem.types.TypeMapper;
import org.gcube.informationsystem.types.annotations.Abstract; import org.gcube.informationsystem.types.annotations.Abstract;
import org.gcube.informationsystem.types.reference.Type; import org.gcube.informationsystem.types.reference.Type;
import org.junit.Assert; import org.junit.Assert;
@ -41,7 +41,7 @@ public class ResourceRegistrySchemaClientTest extends ContextTest {
types = resourceRegistrySchemaClient.read(Facet.class, false); types = resourceRegistrySchemaClient.read(Facet.class, false);
Assert.assertTrue(types.size()==1); Assert.assertTrue(types.size()==1);
Type gotFacetDefinition = types.get(0); Type gotFacetDefinition = types.get(0);
Type facetDefinition = TypeBinder.createTypeDefinition(Facet.class); Type facetDefinition = TypeMapper.createTypeDefinition(Facet.class);
Assert.assertTrue(gotFacetDefinition.getName().compareTo(facetDefinition.getName())==0); Assert.assertTrue(gotFacetDefinition.getName().compareTo(facetDefinition.getName())==0);