Generic API OBserver V2 optimized

app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/autodebitaccountlisting/AutoDebitAccountListingV2Presenter.java

@@ -8,6 +8,7 @@ import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccou
 import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.AutoDebitModel;
 import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.KeyValueData;
 import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.WebRequestModel;
+import com.gmeremit.online.gmeremittance_native.autodebitV2.model.bankaccountvalidation.BankInfo;
 import com.gmeremit.online.gmeremittance_native.autodebitV2.model.bankaccountvalidation.BankVerificationResultModel;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
@@ -101,9 +102,10 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements
     }
 
     public class AutoDebitAccountListingObserver extends GenericApiObserverResponseV2<AutoDebitModel> {
+
         @Override
-        protected Type setType() {
-            return TypeToken.getParameterized(GenericResponseDataModel.class, AutoDebitModel.class).getType();
+        protected Type getDataType() {
+            return TypeToken.getParameterized(AutoDebitModel.class).getType();
         }
 
         @Override
@@ -167,11 +169,6 @@ public class AutoDebitAccountListingV2Presenter extends BasePresenter implements
             this.accountToBeDeleted = accountData;
         }
 
-        @Override
-        protected Type setType() {
-            return TypeToken.getParameterized(GenericResponseDataModel.class, MessageResponseDataModel.class).getType();
-        }
-
         @Override
         protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> t) {
             if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/presenter/bankaccountvalidation/BankAccountValidationV2Presenter.java

@@ -150,10 +150,10 @@ public class BankAccountValidationV2Presenter extends BasePresenter implements B
 
 
     public class BankAccountListingObserver extends GenericApiObserverResponseV2<List<BankInfo>> {
+
         @Override
-        protected Type setType() {
-            Type listofBank = TypeToken.getParameterized(List.class, BankInfo.class).getType();
-            return TypeToken.getParameterized(GenericResponseDataModel.class, listofBank).getType();
+        protected Type getDataType() {
+            return TypeToken.getParameterized(List.class, BankInfo.class).getType();
         }
 
         @Override
@@ -186,14 +186,6 @@ public class BankAccountValidationV2Presenter extends BasePresenter implements B
     public class BankAccountVerificationObserver extends GenericApiObserverResponseV2<MessageResponseDataModel> {
 
 
-
-
-
-        @Override
-        protected Type setType() {
-            return TypeToken.getParameterized(GenericResponseDataModel.class, MessageResponseDataModel.class).getType();
-        }
-
         @Override
         protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> t) {
             if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/pennytest/PennyTestPresenter.java

@@ -97,10 +97,6 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera
 
     public class PennyTestRequestObserver extends GenericApiObserverResponseV2<MessageResponseDataModel> {
 
-        @Override
-        protected Type setType() {
-            return TypeToken.getParameterized(GenericResponseDataModel.class, MessageResponseDataModel.class).getType();
-        }
 
         @Override
         protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> t) {
@@ -135,11 +131,6 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera
     public class PennyTestResultObserver extends GenericApiObserverResponseV2<MessageResponseDataModel> {
 
 
-        @Override
-        protected Type setType() {
-            return TypeToken.getParameterized(GenericResponseDataModel.class, MessageResponseDataModel.class).getType();
-        }
-
         @Override
         protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> t) {
             if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
@@ -183,10 +174,6 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera
             this.hasRequestedInternally = hasRequestedInternally;
         }
 
-        @Override
-        protected Type setType() {
-            return TypeToken.getParameterized(GenericResponseDataModel.class, MessageResponseDataModel.class).getType();
-        }
 
         @Override
         protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> t) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java

@@ -51,9 +51,8 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney
         init();
     }
 
-    private void init()
-    {
-        countDownRemainingValue=-1;
+    private void init() {
+        countDownRemainingValue = -1;
     }
 
     @Override
@@ -92,8 +91,7 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney
 
         String pAgent = previousTransactionRelatedData.getSelectedTransaction().getBankName().toUpperCase();
 
-        String accountNo=resendRelatedData.getRemitDetail().getReceiverAccountNo();
-
+        String accountNo = resendRelatedData.getRemitDetail().getReceiverAccountNo();
 
 
         return new VerificationViewModel(fullName, address, country, mobile, pCountry, pMode, pAmount, exRate, serviceCharge, pAgent, accountNo);
@@ -131,7 +129,7 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney
             public void onCancelled() {
 
             }
-        },this.countDownRemainingValue);
+        }, this.countDownRemainingValue);
     }
 
 
@@ -142,7 +140,7 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney
 
     @Override
     public String getPaymentType() {
-       return previousTransactionRelatedData.getSelectedAutoDebitAccount().getType();
+        return previousTransactionRelatedData.getSelectedAutoDebitAccount().getType();
     }
 
     @Override
@@ -163,7 +161,7 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney
 
     @Override
     public String getSelectedCurrency() {
-       return resendRelatedData.getExRate().getPCurrency();
+        return resendRelatedData.getExRate().getPCurrency();
     }
 
     @Override
@@ -173,7 +171,7 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney
 
     @Override
     public void updateRemainingCountDownValue(long value) {
-        this.countDownRemainingValue=value;
+        this.countDownRemainingValue = value;
     }
 
 
@@ -233,13 +231,14 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney
     public class ResendRelatedDataObserver extends GenericApiObserverResponseV2<ResendRelatedDataModel> {
 
         @Override
-        protected Type setType() {
-            return TypeToken.getParameterized(GenericResponseDataModel.class, ResendRelatedDataModel.class).getType();
+        protected Type getDataType() {
+            return TypeToken.getParameterized( ResendRelatedDataModel.class).getType();
+
         }
 
         @Override
         protected void onSuccess(GenericResponseDataModel<ResendRelatedDataModel> t) {
-            if(t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
+            if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
                 resendRelatedData = t.getData();
 
                 resendRelatedData.getExRate().setPaymentType(previousTransactionRelatedData.getSelectedAutoDebitAccount().getType());
@@ -247,8 +246,7 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney
 
                 Log.d("RESENDREQUESTMODEL", resendRelatedData.getRemitDetail().toString());
                 getExRateFromNetwork();
-            }
-            else
+            } else
                 view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
 
         }

app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/transactionlisting/TransactionListingV2Presenter.java

@@ -107,10 +107,11 @@ public class TransactionListingV2Presenter extends BasePresenter implements Tran
     public class TransactionListingObserver extends GenericApiObserverResponseV2<TransactionListingModel> {
 
         @Override
-        protected Type setType() {
-            return TypeToken.getParameterized(GenericResponseDataModel.class, TransactionListingModel.class).getType();
+        protected Type getDataType() {
+            return TypeToken.getParameterized(TransactionListingModel.class).getType();
         }
 
+
         @Override
         protected void onSuccess(GenericResponseDataModel<TransactionListingModel> t) {
             if (t.getData().getTransactions() != null && t.getData().getTransactions().size() > 0) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2Presenter.java

@@ -187,11 +187,6 @@ public class TransactionPasswordPromptV2Presenter extends BasePresenter implemen
 
     class ResendRequestObserver extends GenericApiObserverResponseV2<MessageResponseDataModel> {
 
-        @Override
-        protected Type setType() {
-            return TypeToken.getParameterized(GenericResponseDataModel.class, MessageResponseDataModel.class).getType();
-        }
-
         @Override
         protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> response) {
             if (response.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/GenericApiObserverResponseV2.java

@@ -1,9 +1,13 @@
 package com.gmeremit.online.gmeremittance_native.utils.https;
 
 
+import com.gmeremit.online.gmeremittance_native.autodebitV2.model.bankaccountvalidation.BankInfo;
+import com.google.gson.reflect.TypeToken;
+
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.net.SocketTimeoutException;
+import java.util.List;
 
 import io.reactivex.observers.DisposableObserver;
 import okhttp3.ResponseBody;
@@ -13,9 +17,6 @@ import retrofit2.HttpException;
 public abstract class GenericApiObserverResponseV2<T> extends DisposableObserver<ResponseBody> {
 
 
-    private Type type;
-
-    protected abstract Type setType();
 
     protected abstract void onSuccess(GenericResponseDataModel<T> t);
 
@@ -26,8 +27,9 @@ public abstract class GenericApiObserverResponseV2<T> extends DisposableObserver
     protected abstract void unauthorizedAccess(String message);
 
 
-    public GenericApiObserverResponseV2() {
-        this.type = setType();
+    protected Type getDataType()
+    {
+        return TypeToken.getParameterized(List.class, MessageResponseDataModel.class).getType();
     }
 
     @Override
@@ -41,7 +43,7 @@ public abstract class GenericApiObserverResponseV2<T> extends DisposableObserver
     }
 
     private GenericResponseDataModel<T> parseResponseBody(ResponseBody body) throws Exception {
-        return HttpClientV2.getDeserializer().fromJson(body.string(), this.type);
+        return HttpClientV2.getDeserializer().fromJson(body.string(), TypeToken.getParameterized(GenericResponseDataModel.class, getDataType()).getType());
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2Presenter.java

@@ -125,7 +125,7 @@ public class WithdrawV2Presenter extends BasePresenter implements WithdrawV2Pres
         }
 
         @Override
-        protected Type setType() {
+        protected Type getDataType() {
             return TypeToken.getParameterized(GenericResponseDataModel.class, RefundRelatedMetaDataModel.class).getType();
         }
 
@@ -149,10 +149,6 @@ public class WithdrawV2Presenter extends BasePresenter implements WithdrawV2Pres
 
     class WithdrawOperationDataObserver extends GenericApiObserverResponseV2<MessageResponseDataModel> {
 
-        @Override
-        protected Type setType() {
-            return TypeToken.getParameterized(GenericResponseDataModel.class, MessageResponseDataModel.class).getType();
-        }
 
         @Override
         protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> response) {