Merge pull request #469 from Backendless/oleg.vyalyh/22707/json_adapting_type

Oleg.vyalyh/22707/json adapting type

Author: markpiller

build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'signing'
 
 
 group 'com.backendless'
-version '6.0.2'
+version '6.1.0'
 archivesBaseName='backendless'
 
 
@@ -63,7 +63,7 @@ uploadArchives {
             def ossrhPassword=''
 
 //            Properties props = new Properties()
-//            props.load(new FileInputStream("/Users/ksv/dev/Android-SDK/ossrh.properties"))
+//            props.load(new FileInputStream("./ossrh.properties"))
 //
 //            ossrhUsername=props.getProperty( "user.name" )
 //            ossrhPassword=props.getProperty( "user.password" )
@@ -261,7 +261,7 @@ dependencies {
     compileOnly( group: "com.backendless", name: "commons", version: "6.0.0", changing: true, ) {
         exclude group: 'com.fasterxml.jackson.core'
     }
-    compileOnly( group: "weborb", name: "weborbclient", version: "5.2.0.1", changing: true)
+    compileOnly( group: "weborb", name: "weborbclient", version: "5.2.0.3", changing: true)
 
     compileOnly ('io.socket:socket.io-client:1.0.0') {
 //       excluding org.json which is provided by Android

src/com/backendless/Backendless.java

@@ -29,7 +29,16 @@
 import com.backendless.io.BackendlessUserFactory;
 import com.backendless.io.BackendlessUserWriter;
 import com.backendless.io.DoubleWriter;
-import com.backendless.persistence.*;
+import com.backendless.persistence.BackendlessSerializer;
+import com.backendless.persistence.Geometry;
+import com.backendless.persistence.GeometryDTO;
+import com.backendless.persistence.JsonDTO;
+import com.backendless.persistence.JsonDTOAdaptingType;
+import com.backendless.persistence.LineString;
+import com.backendless.persistence.Point;
+import com.backendless.persistence.Polygon;
+import com.backendless.persistence.QueryOptions;
+import com.backendless.persistence.RealmSerializer;
 import com.backendless.persistence.local.UserIdStorageFactory;
 import com.backendless.persistence.local.UserTokenStorageFactory;
 import com.backendless.rt.RTService;
@@ -193,7 +202,7 @@ public static void initApp( Object context, final String applicationId, final St
     ObjectFactories.addArgumentObjectFactory( Point.class.getName(), new BackendlessGeometryFactory() );
     ObjectFactories.addArgumentObjectFactory( LineString.class.getName(), new BackendlessGeometryFactory() );
     ObjectFactories.addArgumentObjectFactory( Polygon.class.getName(), new BackendlessGeometryFactory() );
-    Types.addClientClassMapping( JsonDTO.class.getName(), JsonDTOAdapter.class );
+    Types.addClientClassMapping( JsonDTO.class.getName(), JsonDTOAdaptingType.class );
     //ObjectFactories.addArgumentObjectFactory( JsonDTO.class.getName(), new BackendlessJsonFactory() );
     ContextHandler.setContext( context );
 

src/com/backendless/persistence/JsonDTOAdapter.java renamed to src/com/backendless/persistence/JsonDTOAdaptingType.java

@@ -4,25 +4,22 @@
 import weborb.exceptions.AdaptingException;
 import weborb.reader.ReferenceCache;
 import weborb.types.ICacheableAdaptingType;
-import weborb.util.reflect.TypeUtils;
 
-import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
 
-public class JsonDTOAdapter implements ICacheableAdaptingType
+public class JsonDTOAdaptingType implements ICacheableAdaptingType
 {
   private String rawJsonString;
 
-  public JsonDTOAdapter()
+  public JsonDTOAdaptingType()
   {
-
   }
 
-  public JsonDTOAdapter( String rawJsonString )
+  public JsonDTOAdaptingType( String rawJsonString )
   {
     this.rawJsonString = rawJsonString;
   }
@@ -46,7 +43,7 @@ public boolean equals( Object o )
     if( !(o instanceof JsonDTO) )
       return false;
 
-    JsonDTOAdapter jsonDTO = (JsonDTOAdapter) o;
+    JsonDTOAdaptingType jsonDTO = (JsonDTOAdaptingType) o;
     return Objects.equals( rawJsonString, jsonDTO.rawJsonString );
   }
 
@@ -99,10 +96,7 @@ public Object adapt( Type type, ReferenceCache referenceCache ) throws AdaptingE
     if( getRawJsonString() == null )
       return null;
 
-    if( type instanceof ParameterizedType )
-      type = TypeUtils.getClass( ((ParameterizedType) type).getRawType() );
-    
-    Object result = JSONUtil.getJsonConverter().readObject( getRawJsonString(), (Class) type );
+    Object result = JSONUtil.getJsonConverter().readObject( getRawJsonString(), type );
     return result;
   }
 }

src/com/backendless/utils/JSONConverterWeborbImpl.java

@@ -7,17 +7,18 @@
 import weborb.util.io.Serializer;
 
 import java.io.IOException;
+import java.lang.reflect.Type;
+
 
 public class JSONConverterWeborbImpl implements JSONConverter
 {
   @Override
-  public <T> T readObject( String jsonString, Class<T> typeClass )
+  public <T> T readObject( String jsonString, Type type )
   {
     try
     {
       IAdaptingType adaptingType = (IAdaptingType) Serializer.fromBytes( jsonString.getBytes(), Serializer.JSON, true );
-
-      return (T) adaptingType.adapt( typeClass );
+      return (T) adaptingType.adapt( type );
     }
     catch( IOException e )
     {