feat: MLIBZ-2447 Extending user class with properties of different class cause an exception

android-lib/src/androidTest/java/com/kinvey/androidTest/model/InternalUserEntity.java

@@ -0,0 +1,18 @@
+package com.kinvey.androidTest.model;
+
+import com.google.api.client.json.GenericJson;
+import com.google.api.client.util.Key;
+
+public class InternalUserEntity extends GenericJson {
+
+    @Key
+    private String street;
+
+    public String getStreet() {
+        return street;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
+}

android-lib/src/androidTest/java/com/kinvey/androidTest/model/TestUser.java

@@ -8,9 +8,8 @@ public class TestUser extends User {
     @Key("companyName")
     private String companyName;
 
-    public TestUser() {
-
-    }
+    @Key
+    private InternalUserEntity internalUserEntity;
 
     public String getCompanyName() {
         return companyName;
@@ -19,4 +18,12 @@ public String getCompanyName() {
     public void setCompanyName(String companyName) {
         this.companyName = companyName;
     }
+
+    public InternalUserEntity getInternalUserEntity() {
+        return internalUserEntity;
+    }
+
+    public void setInternalUserEntity(InternalUserEntity internalUserEntity) {
+        this.internalUserEntity = internalUserEntity;
+    }
 }

android-lib/src/androidTest/java/com/kinvey/androidTest/store/UserStoreTest.java

@@ -20,6 +20,7 @@
 import com.kinvey.android.store.DataStore;
 import com.kinvey.android.store.UserStore;
 import com.kinvey.androidTest.LooperThread;
+import com.kinvey.androidTest.model.InternalUserEntity;
 import com.kinvey.androidTest.model.Person;
 import com.kinvey.androidTest.model.TestUser;
 import com.kinvey.java.Query;
@@ -378,11 +379,17 @@ public void testCustomSignUp() throws InterruptedException {
         client.setUserClass(TestUser.class);
         TestUser user = new TestUser();
         user.setCompanyName("Test Company");
+        InternalUserEntity internalUserEntity = new InternalUserEntity();
+        internalUserEntity.setStreet("TestStreet");
+        user.setInternalUserEntity(internalUserEntity);
         CustomKinveyClientCallback callback = signUp(user);
         assertNull(callback.error);
         assertNotNull(callback.result);
-        destroyUser();
         assertEquals(user.getCompanyName(), callback.result.getCompanyName());
+        assertEquals("TestStreet", callback.result.getInternalUserEntity().getStreet());
+        assertEquals("Test Company", ((TestUser)client.getActiveUser()).getCompanyName());
+        assertEquals("TestStreet", ((TestUser)client.getActiveUser()).getInternalUserEntity().getStreet());
+        destroyUser();
     }
 
     @Test
@@ -1125,16 +1132,21 @@ public void testUpdateCustomUser() throws InterruptedException {
         client.setUserClass(TestUser.class);
         TestUser user = new TestUser();
         user.setCompanyName("Test Company");
+        InternalUserEntity internalUserEntity = new InternalUserEntity();
+        internalUserEntity.setStreet("TestStreet");
+        user.setInternalUserEntity(internalUserEntity);
         CustomKinveyClientCallback callback = signUp(user);
         assertNull(callback.error);
         assertNotNull(callback.result);
 
         assertEquals(user.getCompanyName(), callback.result.getCompanyName(), client.getActiveUser().get("companyName"));
 
         client.getActiveUser().set("companyName", "New Company");
+        ((TestUser) client.getActiveUser()).getInternalUserEntity().setStreet("TestStreet2");
         CustomKinveyClientCallback userKinveyClientCallback = updateCustomUser(client);
         assertNotNull(userKinveyClientCallback.result);
-        assertNotEquals(user.getCompanyName(), userKinveyClientCallback.result.getCompanyName());
+        assertEquals("New Company", userKinveyClientCallback.result.getCompanyName());
+        assertEquals("TestStreet2", userKinveyClientCallback.result.getInternalUserEntity().getStreet());
         assertNotNull(deleteUser(true, client));
     }
 

android-lib/src/main/java/com/kinvey/android/Client.java

@@ -431,7 +431,7 @@ public Context getContext(){
      * <p/>
      * This Builder class is not thread-safe.
      */
-    public static class Builder extends AbstractClient.Builder {
+    public static class Builder<T extends User> extends AbstractClient.Builder {
 
         private Context context = null;
         private KinveyUserCallback<User> retrieveUserCallback = null;
@@ -447,7 +447,7 @@ public static class Builder extends AbstractClient.Builder {
         private String MICVersion;
         private String MICBaseURL;
         private boolean deltaSetCache = false;
-        private Class userClass = User.class;
+        private Class userClass = null;
         private byte[] encryptionKey;
 
         /**
@@ -764,7 +764,7 @@ public Builder(Context context) {
             this(context, newCompatibleTransport());
         }
 
-        public Builder setUserClass(Class userClass){
+        public Builder setUserClass(Class<T> userClass){
             this.userClass = userClass;
             return this;
         }
@@ -795,18 +795,18 @@ public Builder setInstanceID(String instanceID) {
          * which contains factory methods for accessing various functionality.
          */
         @Override
-        public Client build(){
+        public Client<T> build(){
             kinveyHandlerThread = new KinveyHandlerThread("KinveyHandlerThread");
             kinveyHandlerThread.start();
             Realm.init(context);
-            final Client client = new Client(getTransport(),
+            final Client<T> client = new Client<>(getTransport(),
                     getHttpRequestInitializer(), getBaseUrl(),
                     getServicePath(), this.getObjectParser(), getKinveyClientRequestInitializer(), getCredentialStore(),
                     getRequestBackoffPolicy(), this.encryptionKey, this.context);
 
             client.clientUser = AndroidUserStore.getUserStore(this.context);
 
-            client.setUserClass(userClass);
+            client.setUserClass(userClass != null ? userClass : User.class);
 
             //GCM explicitly enabled
             if (this.GCM_Enabled){
@@ -858,7 +858,7 @@ public Client build(){
          *
          * </p>
          *
-         * @param buildCallback Instance of {@link: KinveyClientBuilderCallback}
+         * @param buildCallback Instance of {@link KinveyClientBuilderCallback}
          */
         public void build(KinveyClientBuilderCallback buildCallback) {
             new Build(buildCallback).execute();
@@ -868,7 +868,7 @@ public void build(KinveyClientBuilderCallback buildCallback) {
         /**
          * Define how credentials will be stored
          *
-         * @param store something implpemting CredentialStore interface
+         * @param store something implementing CredentialStore interface
          * @return this builder, with the new credential store set
          */
         public Builder setCredentialStore(CredentialStore store) {
@@ -894,7 +894,7 @@ public Builder setJsonFactory(JsonFactory factory){
          * Sets a callback to be called after a client is intialized and BaseUser attributes is being retrieved.
          *
          * <p>
-         * When a client is intialized after an initial login, the user's credentials are cached locally and used for the
+         * When a client is initialized after an initial login, the user's credentials are cached locally and used for the
          * initialization of the client.  As part of the initialization process, a background thread is spawned to retrieve
          * up-to-date user attributes.  This optional callback is called when the retrieval process is complete and passes
          * an instance of the logged in user.