Merge pull request #97 from amitshekhariitbhu/development

Bug Fixes and New Api

Author: amitshekhariitbhu

README.md

@@ -538,7 +538,7 @@ ANRequest request = AndroidNetworking.get("https://fierce-cove-29863.herokuapp.c
                         .addPathParameter("pageNumber", "0")
                         .addQueryParameter("limit", "3")
                         .build();
-ANResponse<List<User>> response = request.executeForParsed(new TypeToken<List<User>>() {});
+ANResponse<List<User>> response = request.executeForObjectList(User.class);
 if (response.isSuccess()) {
    List<User> users = responseTwo.getResult();
 } else {

android-networking/build.gradle

@@ -39,8 +39,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.5.0'
-    compile 'com.squareup.okhttp3:okhttp:3.5.0'
+    androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.6.0'
+    compile 'com.squareup.okhttp3:okhttp:3.6.0'
     compile 'com.google.code.gson:gson:2.8.0'
 }
 //apply from: 'upload.gradle'

android-networking/src/androidTest/java/com/androidnetworking/ApplicationTest.java renamed to android-networking/src/androidTest/java/com/androidnetworking/ApiTest.java

@@ -21,6 +21,8 @@
 import android.test.ApplicationTestCase;
 
 import com.androidnetworking.common.ANConstants;
+import com.androidnetworking.common.ANRequest;
+import com.androidnetworking.common.ANResponse;
 import com.androidnetworking.error.ANError;
 import com.androidnetworking.interfaces.StringRequestListener;
 
@@ -37,11 +39,11 @@
 /**
  * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
  */
-public class ApplicationTest extends ApplicationTestCase<Application> {
+public class ApiTest extends ApplicationTestCase<Application> {
     @Rule
     public final MockWebServer server = new MockWebServer();
 
-    public ApplicationTest() {
+    public ApiTest() {
         super(Application.class);
     }
 
@@ -246,5 +248,31 @@ public void onError(ANError anError) {
         assertEquals(404, errorCodeRef.get().intValue());
     }
 
+    @SuppressWarnings("unchecked")
+    public void testSynchronousGetRequest() throws InterruptedException {
+
+        server.enqueue(new MockResponse().setBody("getResponse"));
+
+        ANRequest request = AndroidNetworking.get(server.url("/").toString()).build();
+
+        ANResponse<String> response = request.executeForString();
+
+        assertEquals("getResponse", response.getResult());
+    }
+
+    @SuppressWarnings("unchecked")
+    public void testSynchronousPostRequest() throws InterruptedException {
+
+        server.enqueue(new MockResponse().setBody("postResponse"));
+
+        ANRequest request = AndroidNetworking.post(server.url("/").toString())
+                .addBodyParameter("fistName", "Amit")
+                .addBodyParameter("lastName", "Shekhar")
+                .build();
+
+        ANResponse<String> response = request.executeForString();
+
+        assertEquals("postResponse", response.getResult());
+    }
 
 }

android-networking/src/main/java/com/androidnetworking/common/ANRequest.java

@@ -301,6 +301,19 @@ public void getAsOkHttpResponseAndParsed(TypeToken typeToken, OkHttpResponseAndP
         ANRequestQueue.getInstance().addRequest(this);
     }
 
+    public void getAsOkHttpResponseAndObject(Class objectClass, OkHttpResponseAndParsedRequestListener parsedRequestListener) {
+        this.mType = objectClass;
+        this.mResponseType = ResponseType.PARSED;
+        this.mOkHttpResponseAndParsedRequestListener = parsedRequestListener;
+        ANRequestQueue.getInstance().addRequest(this);
+    }
+
+    public void getAsOkHttpResponseAndObjectList(Class objectClass, OkHttpResponseAndParsedRequestListener parsedRequestListener) {
+        this.mType = $Gson$Types.newParameterizedTypeWithOwner(null, List.class, objectClass);
+        this.mResponseType = ResponseType.PARSED;
+        this.mOkHttpResponseAndParsedRequestListener = parsedRequestListener;
+        ANRequestQueue.getInstance().addRequest(this);
+    }
 
     public void startDownload(DownloadListener downloadListener) {
         this.mDownloadListener = downloadListener;
@@ -343,6 +356,18 @@ public ANResponse executeForParsed(TypeToken typeToken) {
         return SynchronousCall.execute(this);
     }
 
+    public ANResponse executeForObject(Class objectClass) {
+        this.mType = objectClass;
+        this.mResponseType = ResponseType.PARSED;
+        return SynchronousCall.execute(this);
+    }
+
+    public ANResponse executeForObjectList(Class objectClass) {
+        this.mType = $Gson$Types.newParameterizedTypeWithOwner(null, List.class, objectClass);
+        this.mResponseType = ResponseType.PARSED;
+        return SynchronousCall.execute(this);
+    }
+
     public ANResponse executeForDownload() {
         return SynchronousCall.execute(this);
     }
@@ -917,7 +942,7 @@ public T addPathParameter(String key, String value) {
 
         @Override
         public T addPathParameter(Map<String, String> pathParameterMap) {
-            if (mPathParameterMap != null) {
+            if (pathParameterMap != null) {
                 mPathParameterMap.putAll(pathParameterMap);
             }
             return (T) this;
@@ -1131,7 +1156,7 @@ public T addPathParameter(String key, String value) {
 
         @Override
         public T addPathParameter(Map<String, String> pathParameterMap) {
-            if (mPathParameterMap != null) {
+            if (pathParameterMap != null) {
                 mPathParameterMap.putAll(pathParameterMap);
             }
             return (T) this;
@@ -1399,7 +1424,7 @@ public T addPathParameter(String key, String value) {
 
         @Override
         public T addPathParameter(Map<String, String> pathParameterMap) {
-            if (mPathParameterMap != null) {
+            if (pathParameterMap != null) {
                 mPathParameterMap.putAll(pathParameterMap);
             }
             return (T) this;
@@ -1538,7 +1563,7 @@ public T addPathParameter(String key, String value) {
 
         @Override
         public T addPathParameter(Map<String, String> pathParameterMap) {
-            if (mPathParameterMap != null) {
+            if (pathParameterMap != null) {
                 mPathParameterMap.putAll(pathParameterMap);
             }
             return (T) this;

android-networking/src/main/java/com/androidnetworking/internal/DownloadProgressHandler.java

@@ -25,28 +25,25 @@
 import com.androidnetworking.interfaces.DownloadProgressListener;
 import com.androidnetworking.model.Progress;
 
-import java.lang.ref.WeakReference;
-
 /**
  * Created by amitshekhar on 24/05/16.
  */
 public class DownloadProgressHandler extends Handler {
 
-    private final WeakReference<DownloadProgressListener> mDownloadProgressListenerWeakRef;
+    private final DownloadProgressListener mDownloadProgressListenerWeakRef;
 
     public DownloadProgressHandler(DownloadProgressListener downloadProgressListener) {
         super(Looper.getMainLooper());
-        mDownloadProgressListenerWeakRef = new WeakReference<>(downloadProgressListener);
+        mDownloadProgressListenerWeakRef = downloadProgressListener;
     }
 
     @Override
     public void handleMessage(Message msg) {
-        final DownloadProgressListener downloadProgressListener = mDownloadProgressListenerWeakRef.get();
         switch (msg.what) {
             case ANConstants.UPDATE:
-                if (downloadProgressListener != null) {
+                if (mDownloadProgressListenerWeakRef != null) {
                     final Progress progress = (Progress) msg.obj;
-                    downloadProgressListener.onProgress(progress.currentBytes, progress.totalBytes);
+                    mDownloadProgressListenerWeakRef.onProgress(progress.currentBytes, progress.totalBytes);
                 }
                 break;
             default:

android-networking/src/main/java/com/androidnetworking/internal/UploadProgressHandler.java

@@ -25,28 +25,25 @@
 import com.androidnetworking.interfaces.UploadProgressListener;
 import com.androidnetworking.model.Progress;
 
-import java.lang.ref.WeakReference;
-
 /**
  * Created by amitshekhar on 24/05/16.
  */
 public class UploadProgressHandler extends Handler {
 
-    private final WeakReference<UploadProgressListener> mUploadProgressListenerWeakRef;
+    private final UploadProgressListener mUploadProgressListenerWeakRef;
 
     public UploadProgressHandler(UploadProgressListener uploadProgressListener) {
         super(Looper.getMainLooper());
-        mUploadProgressListenerWeakRef = new WeakReference<>(uploadProgressListener);
+        mUploadProgressListenerWeakRef = uploadProgressListener;
     }
 
     @Override
     public void handleMessage(Message msg) {
-        final UploadProgressListener uploadProgressListener = mUploadProgressListenerWeakRef.get();
         switch (msg.what) {
             case ANConstants.UPDATE:
-                if (uploadProgressListener != null) {
+                if (mUploadProgressListenerWeakRef != null) {
                     final Progress progress = (Progress) msg.obj;
-                    uploadProgressListener.onProgress(progress.currentBytes, progress.totalBytes);
+                    mUploadProgressListenerWeakRef.onProgress(progress.currentBytes, progress.totalBytes);
                 }
                 break;
             default:

android-networking/upload.gradle

@@ -22,7 +22,7 @@ def siteUrl = 'https://github.com/amitshekhariitbhu/Fast-Android-Networking'
 def gitUrl = 'https://github.com/amitshekhariitbhu/Fast-Android-Networking.git'
 
 group = "com.amitshekhar.android"
-version = '0.4.0'
+version = '0.5.0-RC1'
 
 install {
     repositories.mavenInstaller {

app/src/main/java/com/networking/ApiTestActivity.java

@@ -37,7 +37,6 @@
 import com.androidnetworking.interfaces.OkHttpResponseListener;
 import com.androidnetworking.interfaces.ParsedRequestListener;
 import com.androidnetworking.interfaces.UploadProgressListener;
-import com.google.gson.reflect.TypeToken;
 import com.networking.model.User;
 import com.networking.utils.Utils;
 
@@ -1013,8 +1012,7 @@ public void onReceived(long timeTakenInMillis, long bytesSent, long bytesReceive
                                 Log.d(TAG, " isFromCache : " + isFromCache);
                             }
                         });
-                ANResponse<List<User>> responseTwo = requestTwo.executeForParsed(new TypeToken<List<User>>() {
-                });
+                ANResponse<List<User>> responseTwo = requestTwo.executeForObjectList(User.class);
 
                 if (responseTwo.isSuccess()) {
                     Log.d(TAG, "checkSynchronousCall : response success");

app/src/main/java/com/networking/OkHttpResponseTestActivity.java

@@ -34,13 +34,11 @@
 import com.androidnetworking.interfaces.AnalyticsListener;
 import com.androidnetworking.interfaces.DownloadListener;
 import com.androidnetworking.interfaces.DownloadProgressListener;
-import com.androidnetworking.interfaces.JSONObjectRequestListener;
 import com.androidnetworking.interfaces.OkHttpResponseAndJSONArrayRequestListener;
 import com.androidnetworking.interfaces.OkHttpResponseAndJSONObjectRequestListener;
 import com.androidnetworking.interfaces.OkHttpResponseAndParsedRequestListener;
 import com.androidnetworking.interfaces.OkHttpResponseListener;
 import com.androidnetworking.interfaces.UploadProgressListener;
-import com.google.gson.reflect.TypeToken;
 import com.networking.model.User;
 import com.networking.utils.Utils;
 
@@ -123,8 +121,7 @@ public void onReceived(long timeTakenInMillis, long bytesSent, long bytesReceive
                         Log.d(TAG, " isFromCache : " + isFromCache);
                     }
                 })
-                .getAsOkHttpResponseAndParsed(new TypeToken<List<User>>() {
-                }, new OkHttpResponseAndParsedRequestListener<List<User>>() {
+                .getAsOkHttpResponseAndObjectList(User.class, new OkHttpResponseAndParsedRequestListener<List<User>>() {
                     @Override
                     public void onResponse(Response okHttpResponse, List<User> users) {
                         Log.d(TAG, "userList size : " + users.size());
@@ -163,8 +160,7 @@ public void onReceived(long timeTakenInMillis, long bytesSent, long bytesReceive
                         Log.d(TAG, " isFromCache : " + isFromCache);
                     }
                 })
-                .getAsOkHttpResponseAndParsed(new TypeToken<User>() {
-                }, new OkHttpResponseAndParsedRequestListener<User>() {
+                .getAsOkHttpResponseAndObject(User.class, new OkHttpResponseAndParsedRequestListener<User>() {
                     @Override
                     public void onResponse(Response okHttpResponse, User user) {
                         Log.d(TAG, "id : " + user.id);
@@ -964,8 +960,7 @@ public void onReceived(long timeTakenInMillis, long bytesSent, long bytesReceive
                                 Log.d(TAG, " isFromCache : " + isFromCache);
                             }
                         });
-                ANResponse<List<User>> responseTwo = requestTwo.executeForParsed(new TypeToken<List<User>>() {
-                });
+                ANResponse<List<User>> responseTwo = requestTwo.executeForObjectList(User.class);
 
                 if (responseTwo.isSuccess()) {
                     Log.d(TAG, "checkSynchronousCall : response success");