Merge pull request #101 from tradingticket/gd/upgrade_new_java_api/15…

…9878269 Gd/upgrade new java api/159878269
tradingticket · Aug 23, 2018 · 820bd19 · 820bd19
2 parents 85c00d0 + 0ec0130
commit 820bd19
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 29 deletions.
diff --git a/tradeit-android-sdk/build.gradle b/tradeit-android-sdk/build.gradle
@@ -52,7 +52,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:multidex:1.0.1'
     compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'it.trade:tradeit-java-api:1.1.13'
+    compile 'it.trade:tradeit-java-api:1.1.15'
     compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.

diff --git a/...androidTest/java/it/trade/android/sdk/model/TradeItLinkedBrokerAccountParcelableTest.java b/...androidTest/java/it/trade/android/sdk/model/TradeItLinkedBrokerAccountParcelableTest.java
@@ -16,7 +16,6 @@
 
 import it.trade.android.sdk.TradeItConfigurationBuilder;
 import it.trade.android.sdk.TradeItSDK;
-import it.trade.android.sdk.enums.TradeItOrderAction;
 import it.trade.api.TradeItApiClient;
 import it.trade.model.reponse.DisplayLabelValue;
 import it.trade.model.reponse.Instrument;
@@ -42,8 +41,7 @@ public void createTradeItLinkedBrokerAccount() {
         TradeItSDK.clearConfig();
         TradeItSDK.configure(new TradeItConfigurationBuilder(instrumentationCtx.getApplicationContext(), "tradeit-test-api-key", TradeItEnvironment.QA));
 
-        TradeItOAuthAccessTokenRequest oAuthAccessTokenRequest = new TradeItOAuthAccessTokenRequest("MyOauthVerifier");
-        oAuthAccessTokenRequest.apiKey = "MyApiKey";
+        TradeItOAuthAccessTokenRequest oAuthAccessTokenRequest = new TradeItOAuthAccessTokenRequest("MyApiKey","MyOauthVerifier");
         TradeItOAuthAccessTokenResponse oAuthAccessTokenResponse = new TradeItOAuthAccessTokenResponse();
         oAuthAccessTokenResponse.userId = "MyUserId";
         oAuthAccessTokenResponse.userToken = "MyUserToken";

diff --git a/...dk/src/androidTest/java/it/trade/android/sdk/model/TradeItLinkedBrokerParcelableTest.java b/...dk/src/androidTest/java/it/trade/android/sdk/model/TradeItLinkedBrokerParcelableTest.java
@@ -39,8 +39,8 @@ public void createTradeItLinkedBroker() {
         TradeItSDK.clearConfig();
         TradeItSDK.configure(new TradeItConfigurationBuilder(instrumentationCtx.getApplicationContext(), "tradeit-test-api-key", TradeItEnvironment.QA));
 
-        TradeItOAuthAccessTokenRequest oAuthAccessTokenRequest = new TradeItOAuthAccessTokenRequest("MyOauthVerifier");
-        oAuthAccessTokenRequest.apiKey = "MyApiKey";
+        TradeItOAuthAccessTokenRequest oAuthAccessTokenRequest = new TradeItOAuthAccessTokenRequest("MyApiKey","MyOauthVerifier");
+
         TradeItOAuthAccessTokenResponse oAuthAccessTokenResponse = new TradeItOAuthAccessTokenResponse();
         oAuthAccessTokenResponse.userId = "MyUserId";
         oAuthAccessTokenResponse.userToken = "MyUserToken";

diff --git a/...droid-sdk/src/androidTest/java/it/trade/android/sdk/model/TradeItOrderParcelableTest.java b/...droid-sdk/src/androidTest/java/it/trade/android/sdk/model/TradeItOrderParcelableTest.java
@@ -36,8 +36,7 @@ public void createTradeItOrder() {
         TradeItSDK.clearConfig();
         TradeItSDK.configure(new TradeItConfigurationBuilder(instrumentationCtx.getApplicationContext(), "tradeit-test-api-key", TradeItEnvironment.QA));
 
-        TradeItOAuthAccessTokenRequest oAuthAccessTokenRequest = new TradeItOAuthAccessTokenRequest("MyOauthVerifier");
-        oAuthAccessTokenRequest.apiKey = "MyApiKey";
+        TradeItOAuthAccessTokenRequest oAuthAccessTokenRequest = new TradeItOAuthAccessTokenRequest("MyApiKey","MyOauthVerifier");
         TradeItOAuthAccessTokenResponse oAuthAccessTokenResponse = new TradeItOAuthAccessTokenResponse();
         oAuthAccessTokenResponse.userId = "MyUserId";
         oAuthAccessTokenResponse.userToken = "MyUserToken";

diff --git a/tradeit-android-sdk/src/main/java/it/trade/android/sdk/model/TradeItApiClientParcelable.java b/tradeit-android-sdk/src/main/java/it/trade/android/sdk/model/TradeItApiClientParcelable.java
@@ -4,10 +4,9 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import it.trade.api.TradeItApi;
+import it.trade.api.StatelessTradeItApiClient;
 import it.trade.api.TradeItApiClient;
 import it.trade.model.request.TradeItEnvironment;
-import it.trade.model.request.TradeItRequestWithKey;
 
 public class TradeItApiClientParcelable extends TradeItApiClient implements Parcelable {
 
@@ -21,8 +20,8 @@ public TradeItApiClientParcelable(String apiKey, TradeItEnvironment environment,
         this.requestInterceptorParcelable = requestInterceptorParcelable;
     }
 
-    protected TradeItApiClientParcelable(TradeItApi tradeItApi) {
-        super(tradeItApi);
+    protected TradeItApiClientParcelable(String apiKey, StatelessTradeItApiClient statelessTradeItApiClient) {
+        super(apiKey, statelessTradeItApiClient);
     }
 
     public RequestInterceptorParcelable getRequestInterceptorParcelable() {
@@ -50,8 +49,7 @@ protected TradeItApiClientParcelable(Parcel in) {
         int tmpEnvironment = in.readInt();
         this.environment = tmpEnvironment == -1 ? null : TradeItEnvironment.values()[tmpEnvironment];
         this.apiKey = in.readString();
-        TradeItRequestWithKey.API_KEY = apiKey;
-        this.tradeItApi = this.createTradeItApi(environment, requestInterceptorParcelable, forceTLS12());
+        this.statelessTradeItApiClient = this.createStatelessTradeItApiClient(environment, requestInterceptorParcelable, forceTLS12());
     }
 
     public static final Creator<TradeItApiClientParcelable> CREATOR = new Creator<TradeItApiClientParcelable>() {

diff --git a/...it-android-sdk/src/main/java/it/trade/android/sdk/model/TradeItLinkedLoginParcelable.java b/...it-android-sdk/src/main/java/it/trade/android/sdk/model/TradeItLinkedLoginParcelable.java
@@ -3,9 +3,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import it.trade.model.reponse.TradeItLinkLoginResponse;
 import it.trade.model.reponse.TradeItOAuthAccessTokenResponse;
-import it.trade.model.request.TradeItLinkLoginRequest;
 import it.trade.model.request.TradeItLinkedLogin;
 import it.trade.model.request.TradeItOAuthAccessTokenRequest;
 
@@ -15,10 +13,6 @@ public TradeItLinkedLoginParcelable(String broker, String userId, String userTok
         super(broker, userId, userToken);
     }
 
-    public TradeItLinkedLoginParcelable(TradeItLinkLoginRequest linkLoginRequest, TradeItLinkLoginResponse linkLoginResponse) {
-        super(linkLoginRequest, linkLoginResponse);
-    }
-
     public TradeItLinkedLoginParcelable(TradeItOAuthAccessTokenRequest oAuthAccessTokenRequest, TradeItOAuthAccessTokenResponse oAuthAccessTokenResponse) {
         super(oAuthAccessTokenRequest, oAuthAccessTokenResponse);
     }

diff --git a/...id-sdk/src/test/groovy/it/trade/android/sdk/manager/TradeItLinkedBrokerManagerSpec.groovy b/...id-sdk/src/test/groovy/it/trade/android/sdk/manager/TradeItLinkedBrokerManagerSpec.groovy
@@ -567,11 +567,11 @@ class TradeItLinkedBrokerManagerSpec extends Specification {
             int errorCallBackCount = 0
             String mySpecialUrl = "http://myspecialoauthurl.com?oAuthTempToken=2bae6cc8-8d37-4b4a-ae5e-6bbde9209ac4"
 
-            TradeItLinkedLoginParcelable linkedLogin = Mock(TradeItLinkedLoginParcelable.class)
+            TradeItLinkedLoginParcelable linkedLogin = Mock(TradeItLinkedLoginParcelable)
             linkedLogin.userId = myUserId
             linkedLogin.userToken = myUserToken
 
-            TradeItLinkedBrokerParcelable linkedBroker = Mock(TradeItLinkedBrokerParcelable.class)
+            TradeItLinkedBrokerParcelable linkedBroker = Mock(TradeItLinkedBrokerParcelable)
             1 * linkedBroker.getBrokerName() >> "My broker 1"
             3 * linkedBroker.getLinkedLogin() >> linkedLogin
             1 * apiClient.getOAuthLoginPopupUrlForTokenUpdate("My broker 1", myUserId, myUserToken, "my internal app callback", _) >> { broker, userId, userToken,  deepLinkCallback, TradeItCallback<String> callback ->

diff --git a/...ndroid-sdk/src/test/groovy/it/trade/android/sdk/model/TradeItLinkedBrokerCacheSpec.groovy b/...ndroid-sdk/src/test/groovy/it/trade/android/sdk/model/TradeItLinkedBrokerCacheSpec.groovy
@@ -5,8 +5,8 @@ import android.content.SharedPreferences
 import com.google.gson.Gson
 import it.trade.model.reponse.TradeItAccountOverview
 import it.trade.model.reponse.TradeItBrokerAccount
-import it.trade.model.reponse.TradeItLinkLoginResponse
-import it.trade.model.request.TradeItLinkLoginRequest
+import it.trade.model.reponse.TradeItOAuthAccessTokenResponse
+import it.trade.model.request.TradeItOAuthAccessTokenRequest
 import spock.lang.Specification
 
 class TradeItLinkedBrokerCacheSpec extends Specification {
@@ -19,11 +19,12 @@ class TradeItLinkedBrokerCacheSpec extends Specification {
     TradeItLinkedLoginParcelable linkedLogin
 
     def setup() {
-        TradeItLinkLoginRequest linkLoginRequest = new TradeItLinkLoginRequest("my id", "my password", "broker")
-        TradeItLinkLoginResponse linkLoginResponse = new TradeItLinkLoginResponse()
-        linkLoginResponse.userId = userId
-        linkLoginResponse.userToken = "My userToken"
-        linkedLogin = new TradeItLinkedLoginParcelable(linkLoginRequest, linkLoginResponse)
+        TradeItOAuthAccessTokenRequest oAuthAccessTokenRequest = new TradeItOAuthAccessTokenRequest("My Api Key", "oauth verifier")
+        TradeItOAuthAccessTokenResponse oAuthAccessTokenResponse = new TradeItOAuthAccessTokenResponse()
+        oAuthAccessTokenResponse.userId = userId
+        oAuthAccessTokenResponse.userToken = "My userToken"
+        oAuthAccessTokenResponse.broker = "My broker"
+        linkedLogin = new TradeItLinkedLoginParcelable(oAuthAccessTokenRequest, oAuthAccessTokenResponse)
 
 
         context.getSharedPreferences(_, Context.MODE_PRIVATE) >> {