Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gd/upgrade new java api/159878269 #101

Merged
merged 2 commits into from
Aug 23, 2018
Merged

Gd/upgrade new java api/159878269 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8f0802
update java api version
guillaumedebavelaere Aug 21, 2018
0ec0130
[#159878269] Update TradeItApiClientParcelable and tests
guillaumedebavelaere Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tradeit-android-sdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 1 addition & 3 deletions ...androidTest/java/it/trade/android/sdk/model/TradeItLinkedBrokerAccountParcelableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions ...dk/src/androidTest/java/it/trade/android/sdk/model/TradeItLinkedBrokerParcelableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 1 addition & 2 deletions ...droid-sdk/src/androidTest/java/it/trade/android/sdk/model/TradeItOrderParcelableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
10 changes: 4 additions & 6 deletions tradeit-android-sdk/src/main/java/it/trade/android/sdk/model/TradeItApiClientParcelable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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() {
Expand Down Expand Up @@ -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>() {
Expand Down
6 changes: 0 additions & 6 deletions ...it-android-sdk/src/main/java/it/trade/android/sdk/model/TradeItLinkedLoginParcelable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions ...id-sdk/src/test/groovy/it/trade/android/sdk/manager/TradeItLinkedBrokerManagerSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand Down
15 changes: 8 additions & 7 deletions ...ndroid-sdk/src/test/groovy/it/trade/android/sdk/model/TradeItLinkedBrokerCacheSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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) >> {
Expand Down