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.

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

Convenience #348

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 26 additions & 10 deletions src/main/java/com/plaid/client/ApiClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import retrofit2.converter.scalars.ScalarsConverterFactory;
import com.plaid.client.auth.HttpBasicAuth;
import com.plaid.client.auth.HttpBearerAuth;
import com.plaid.client.request.PlaidApi;
import com.plaid.client.auth.ApiKeyAuth;

import java.io.IOException;
Expand Down Expand Up @@ -114,6 +115,16 @@ public ApiClient(Map<String, String> apiKeys) {
addAuthorization(authName, auth);
}
}

/**
* Helper constructor for creating an ApiClient and setting the environment
* @param apiKeys
* @param environment
*/
public ApiClient(Map<String, String> apiKeys, Environment environment) {
this(apiKeys);
this.setPlaidAdapter(environment);
}

/**
* Basic constructor for single auth name
Expand Down Expand Up @@ -157,17 +168,18 @@ public void createDefaultAdapter() {
.addConverterFactory(ScalarsConverterFactory.create())
.addConverterFactory(GsonCustomConverterFactory.create(json.getGson()));
}
public void setPlaidAdapter(String baseUrl) {
public void setPlaidAdapter(Environment environment) {
json = new JSON();

List<String> PLAID_ENVS = Arrays.asList("https://sandbox.plaid.com", "https://production.plaid.com", "https://development.plaid.com");

if(!PLAID_ENVS.contains(baseUrl)) {
System.out.println("baseUrl not found in PLAID_ENVS, must be one of the following: https://sandbox.plaid.com, https://production.plaid.com, https://development.plaid.com");
}

if (!baseUrl.endsWith("/"))
baseUrl = baseUrl + "/";

String baseUrl = environment.toString();
// final List<String> PLAID_ENVS = Arrays.asList("https://sandbox.plaid.com", "https://production.plaid.com", "https://development.plaid.com");
//
// if(!PLAID_ENVS.contains(baseUrl)) {
// System.out.println("baseUrl not found in PLAID_ENVS, must be one of the following: https://sandbox.plaid.com, https://production.plaid.com, https://development.plaid.com");
// }
//
// if (!baseUrl.endsWith("/"))
// baseUrl = baseUrl + "/";

adapterBuilder = new Retrofit
.Builder()
Expand All @@ -183,6 +195,10 @@ public <S> S createService(Class<S> serviceClass) {
return adapterBuilder.client(okBuilder.build()).build().create(serviceClass);
}
}

public PlaidApi newPlaidApi() {
return createService(PlaidApi.class);
}

public ApiClient setDateFormat(DateFormat dateFormat) {
this.json.setDateFormat(dateFormat);
Expand Down
30 changes: 30 additions & 0 deletions src/main/java/com/plaid/client/Environment.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.plaid.client;

/**
* The Plaid environment to be used when making API calls.
* <br>
* See <a href="https://plaid.com/docs/quickstart/">quickstart</a> for the difference between them.
* @author Sam Hieken
*
*/
public enum Environment {
PRODUCTION, DEVELOPMENT, SANDBOX;

/**
* Converts the Plaid environment into its URL form.
*/
@Override
public String toString() {
switch (this) {

case PRODUCTION:
return "https://production.plaid.com/";
case DEVELOPMENT:
return "https://development.plaid.com/";
case SANDBOX:
return "https://sandbox.plaid.com/";
}

return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import com.google.gson.Gson;
import com.plaid.client.ApiClient;
import com.plaid.client.Environment;
import com.plaid.client.model.Error;
import com.plaid.client.model.Item;
import com.plaid.client.request.PlaidApi;
Expand Down Expand Up @@ -60,7 +61,7 @@ public void setUpClient() throws Exception {
apiKeys.put("secret", plaidSecret);
apiKeys.put("plaidVersion", "2020-09-14");
apiClient = new ApiClient(apiKeys);
apiClient.setPlaidAdapter(ApiClient.Sandbox);
apiClient.setPlaidAdapter(Environment.SANDBOX);

plaidClient = apiClient.createService(PlaidApi.class);
}
Expand Down