Added Methods - onError, onComplete

Changed Method - onResult to onNext
shashkiranr · Oct 1, 2017 · 86506e3 · 86506e3
1 parent 18ce7de
commit 86506e3
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 15 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/fyi/rxretrofittest/MainActivity.java b/app/src/main/java/fyi/rxretrofittest/MainActivity.java
@@ -49,9 +49,19 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
     @Override
-    public void getResult(Object result) {
+    public void onNext(Object result) {
         ApiDetail apiDetail = (ApiDetail) result;
         Log.d(TAG, "apidetail to string " + result.toString());
     }
 
+    @Override
+    public void onError(Throwable e) {
+        Log.d(TAG, "onError: " + e.toString());
+    }
+
+    @Override
+    public void onComplete() {
+        Log.d(TAG, "onComplete: ");
+
+    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Sep 17 15:37:54 EDT 2017
+#Sun Oct 01 16:23:16 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/rxretrofit/src/main/java/fyi/library/rxretrofit/RxRetrofit.java b/rxretrofit/src/main/java/fyi/library/rxretrofit/RxRetrofit.java
@@ -48,7 +48,7 @@ public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
             public void onNext(@io.reactivex.annotations.NonNull Object object) {
                 try {
                     JsonElement jsonElement = gson.toJsonTree(object);
-                    rxRetrofitCallBack.getResult(gson.fromJson(jsonElement, returnClassType));
+                    rxRetrofitCallBack.onNext(gson.fromJson(jsonElement, returnClassType));
 
                 } catch (Exception e) {
                     Log.d(TAG, "callback methods are not found " + e.getMessage());
@@ -59,10 +59,12 @@ public void onNext(@io.reactivex.annotations.NonNull Object object) {
             @Override
             public void onError(@io.reactivex.annotations.NonNull Throwable e) {
                 Log.d(TAG, "onError: " + e.getMessage());
+                rxRetrofitCallBack.onError(e);
             }
 
             @Override
             public void onComplete() {
+                rxRetrofitCallBack.onComplete();
             }
         };
 
@@ -82,6 +84,12 @@ public void onComplete() {
     }
 
     public interface RxRetrofitCallBack {
-        void getResult(Object result);
+
+        void onNext(Object result);
+
+        void onError(Throwable e);
+
+        void onComplete();
+
     }
 }
diff --git a/rxretrofit/src/main/java/fyi/library/rxretrofit/SOService.java b/rxretrofit/src/main/java/fyi/library/rxretrofit/SOService.java
@@ -1,6 +1,7 @@
 package fyi.library.rxretrofit;
 
 import java.util.Map;
+import java.util.Objects;
 
 import io.reactivex.Observable;
 import retrofit2.http.GET;