From 72646ac162f9b827ce4c7fdfc60167486e3bfa09 Mon Sep 17 00:00:00 2001 From: Suhas Reddy Mulkalla Date: Wed, 9 Jan 2019 11:03:19 +0530 Subject: [PATCH] Refactor PHLO and Plivo Client, Created a BaseClient, Updated Getters and Updaters, Added PHLO api examples --- src/main/java/com/plivo/api/Client.java | 225 ++++++++++++++++++ .../{PhloRestClient.java => PhloClient.java} | 15 +- src/main/java/com/plivo/api/Plivo.java | 16 +- src/main/java/com/plivo/api/PlivoClient.java | 183 +------------- .../plivo/api/models/base/BaseRequest.java | 18 +- .../plivo/api/models/base/BaseResource.java | 8 +- .../com/plivo/api/models/base/Creator.java | 6 +- .../com/plivo/api/models/base/Deleter.java | 6 +- .../com/plivo/api/models/base/Getter.java | 8 +- .../com/plivo/api/models/base/Lister.java | 8 +- .../com/plivo/api/models/base/Updater.java | 6 +- .../models/call/actions/CallDtmfCreator.java | 6 +- .../models/call/actions/CallPlayCreator.java | 6 +- .../models/call/actions/CallPlayDeleter.java | 6 +- .../call/actions/CallRecordCreator.java | 6 +- .../call/actions/CallRecordDeleter.java | 6 +- .../models/call/actions/CallSpeakCreator.java | 6 +- .../models/call/actions/CallSpeakDeleter.java | 6 +- .../ConferenceMemberDeafCreator.java | 7 +- .../ConferenceMemberDeafDeleter.java | 7 +- .../conference/ConferenceMemberDeleter.java | 7 +- .../ConferenceMemberKickCreator.java | 7 +- .../ConferenceMemberMuteCreator.java | 7 +- .../ConferenceMemberMuteDeleter.java | 7 +- .../ConferenceMemberPlayCreator.java | 7 +- .../ConferenceMemberPlayDeleter.java | 7 +- .../ConferenceMemberSpeakCreator.java | 7 +- .../ConferenceMemberSpeakDeleter.java | 7 +- .../conference/ConferenceRecordCreator.java | 6 +- .../conference/ConferenceRecordDeleter.java | 6 +- .../api/models/node/MultiPartyCallGetter.java | 15 +- .../models/node/MultiPartyCallUpdater.java | 13 +- .../com/plivo/api/models/phlo/PhloGetter.java | 15 +- .../plivo/api/models/phlo/PhloUpdater.java | 15 +- .../java/com/plivo/examples/Accounts.java | 9 +- .../com/plivo/examples/MulitpartyCallAPI.java | 99 ++++++++ src/main/java/com/plivo/examples/PhloAPI.java | 76 ++++++ src/test/java/com/plivo/api/AccountTest.java | 8 +- src/test/java/com/plivo/api/AddressTest.java | 4 +- .../java/com/plivo/api/ApplicationTest.java | 4 +- src/test/java/com/plivo/api/BaseTest.java | 2 +- src/test/java/com/plivo/api/CallTest.java | 4 +- .../java/com/plivo/api/ConferenceTest.java | 4 +- src/test/java/com/plivo/api/EndpointTest.java | 4 +- src/test/java/com/plivo/api/IdentityTest.java | 4 +- src/test/java/com/plivo/api/MessageTest.java | 8 +- .../plivo/api/MultiPartyCallMemberTest.java | 4 +- .../com/plivo/api/MultiPartyCallTest.java | 4 +- src/test/java/com/plivo/api/NumberTest.java | 4 +- src/test/java/com/plivo/api/PricingTest.java | 2 +- .../java/com/plivo/api/RecordingTest.java | 4 +- 51 files changed, 602 insertions(+), 323 deletions(-) create mode 100644 src/main/java/com/plivo/api/Client.java rename src/main/java/com/plivo/api/{PhloRestClient.java => PhloClient.java} (80%) create mode 100644 src/main/java/com/plivo/examples/MulitpartyCallAPI.java create mode 100644 src/main/java/com/plivo/examples/PhloAPI.java diff --git a/src/main/java/com/plivo/api/Client.java b/src/main/java/com/plivo/api/Client.java new file mode 100644 index 00000000..228827cd --- /dev/null +++ b/src/main/java/com/plivo/api/Client.java @@ -0,0 +1,225 @@ +package com.plivo.api; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.BeanDescription; +import com.fasterxml.jackson.databind.DeserializationConfig; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import com.plivo.api.util.Utils; +import okhttp3.Credentials; +import okhttp3.Interceptor; +import okhttp3.OkHttpClient; +import okhttp3.Protocol; +import okhttp3.Response; +import okhttp3.ResponseBody; +import okhttp3.logging.HttpLoggingInterceptor; +import okhttp3.logging.HttpLoggingInterceptor.Level; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.ProtocolException; +import java.text.SimpleDateFormat; + +public class Client { + + private static SimpleModule simpleModule = new SimpleModule(); + private static String version = "Unknown Version"; + private boolean testing = false; + private static ObjectMapper objectMapper = new ObjectMapper(); + + public void setTesting(boolean testing) { + this.testing = testing; + } + + public boolean isTesting() { + return testing; + } + + static { + simpleModule.setDeserializerModifier(new BeanDeserializerModifier() { + @Override + public JsonDeserializer modifyEnumDeserializer(DeserializationConfig config, JavaType type, + BeanDescription beanDesc, JsonDeserializer deserializer) { + return new JsonDeserializer() { + @Override + public Enum deserialize(JsonParser jp, DeserializationContext ctxt) + throws IOException, JsonProcessingException { + Class rawClass = (Class>) type.getRawClass(); + return Enum.valueOf(rawClass, jp.getValueAsString().toUpperCase().replace("-", "_")); + } + }; + } + }); + simpleModule.addSerializer(Enum.class, new StdSerializer(Enum.class) { + @Override + public void serialize(Enum value, JsonGenerator gen, SerializerProvider provider) + throws IOException { + gen.writeString(value.name().toLowerCase().replace("_", "-")); + } + }); + } + + { + try { + InputStream inputStream = Client.class + .getResource("version.txt") + .openStream(); + + version = new BufferedReader(new InputStreamReader(inputStream)).readLine(); + } catch (IOException ignored) { + ignored.printStackTrace(); + } + objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + objectMapper.disable(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS); + objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")); + objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE); + } + + private final Interceptor interceptor = new HttpLoggingInterceptor() + .setLevel(Level.BODY); + private final String authId; + private final String authToken; + private OkHttpClient httpClient; + private Retrofit retrofit; + private PlivoAPIService apiService = null; + + /** + * Constructs a new PlivoClient instance. To set a proxy, timeout etc, you can pass in an OkHttpClient.Builder, on which you can set + * the timeout and proxy using: + * + * 

+   *   new OkHttpClient.Builder()
+   *   .proxy(proxy)
+   *   .connectTimeout(1, TimeUnit.MINUTES);
+   *
+ * + * @param authId + * @param authToken + * @param httpClientBuilder + * @param baseUrl + * @param simpleModule + */ + public Client(String authId, String authToken, OkHttpClient.Builder httpClientBuilder, final String baseUrl, final SimpleModule simpleModule) { + if (!(Utils.isAccountIdValid(authId) || Utils.isSubaccountIdValid(authId))) { + throw new IllegalArgumentException("invalid account ID"); + } + + this.authId = authId; + this.authToken = authToken; + this.objectMapper.registerModule(simpleModule); + + httpClient = httpClientBuilder + .addNetworkInterceptor(interceptor) + .addInterceptor(chain -> chain.proceed( + chain.request() + .newBuilder() + .addHeader("Authorization", Credentials.basic(getAuthId(), getAuthToken())) + .addHeader("User-Agent", String.format("%s/%s (Implementation: %s %s %s, Specification: %s %s %s)", "plivo-java", version, + Runtime.class.getPackage().getImplementationVendor(), + Runtime.class.getPackage().getImplementationTitle(), + Runtime.class.getPackage().getImplementationVersion(), + Runtime.class.getPackage().getSpecificationVendor(), + Runtime.class.getPackage().getSpecificationTitle(), + Runtime.class.getPackage().getSpecificationVersion() + )) + .build() + )) + .addNetworkInterceptor(chain -> { + Response response; + try { + response = chain.proceed(chain.request()); + } catch (ProtocolException protocolException) { + // We return bodies for HTTP 204! + response = new Response.Builder() + .request(chain.request()) + .code(204) + .protocol(Protocol.HTTP_1_1) + .body(ResponseBody.create(null, new byte[]{})) + .build(); + } + return response; + }).build(); + + retrofit = new Retrofit.Builder() + .client(httpClient) + .baseUrl(baseUrl) + .addConverterFactory(JacksonConverterFactory.create(objectMapper)) + .build(); + + this.apiService = retrofit.create(PlivoAPIService.class); + } + + /** + * Constructs a new PlivoClient instance. To set a proxy, timeout etc, you can pass in an OkHttpClient.Builder, on which you can set + * the timeout and proxy using: + * + * 

+   *   new OkHttpClient.Builder()
+   *   .proxy(proxy)
+   *   .connectTimeout(1, TimeUnit.MINUTES);
+   *
+ * + * @param authId + * @param authToken + */ + public Client(String authId, String authToken, final String baseUrl) { + this(authId, authToken, new OkHttpClient.Builder(), baseUrl, simpleModule); + } + + /** + * Constructs a new PlivoClient instance. To set a proxy, timeout etc, you can pass in an OkHttpClient.Builder, on which you can set + * the timeout and proxy using: + * + * 

+   *   new OkHttpClient.Builder()
+   *   .proxy(proxy)
+   *   .connectTimeout(1, TimeUnit.MINUTES);
+   *
+ * + * @param authId + * @param authToken + * @param httpClientBuilder + */ + public Client(String authId, String authToken, OkHttpClient.Builder httpClientBuilder, final String baseUrl) { + this(authId, authToken, httpClientBuilder, baseUrl, simpleModule); + } + + public static ObjectMapper getObjectMapper() { + return objectMapper; + } + + Retrofit getRetrofit() { + return retrofit; + } + + public PlivoAPIService getApiService() { + return apiService; + } + + void setApiService(PlivoAPIService apiService) { + this.apiService = apiService; + } + + public String getAuthId() { + return authId; + } + + public String getAuthToken() { + return authToken; + } +} diff --git a/src/main/java/com/plivo/api/PhloRestClient.java b/src/main/java/com/plivo/api/PhloClient.java similarity index 80% rename from src/main/java/com/plivo/api/PhloRestClient.java rename to src/main/java/com/plivo/api/PhloClient.java index d9b3eb75..d23cdade 100644 --- a/src/main/java/com/plivo/api/PhloRestClient.java +++ b/src/main/java/com/plivo/api/PhloClient.java @@ -12,15 +12,16 @@ import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.StdSerializer; + import okhttp3.OkHttpClient; import java.io.IOException; -public class PhloRestClient { +public class PhloClient { protected static String BASE_URL = "https://phlorunner.plivo.com/v1/"; private SimpleModule simpleModule = new SimpleModule(); - private final PlivoClient client; + private final Client client; { simpleModule.setDeserializerModifier(new BeanDeserializerModifier() { @@ -46,15 +47,15 @@ public void serialize(Enum value, JsonGenerator gen, SerializerProvider provider }); } - public PhloRestClient(String authId, String authToken) { - this.client = new PlivoClient(authId, authToken, new OkHttpClient.Builder(), BASE_URL, simpleModule); + public PhloClient(String authId, String authToken) { + this.client = new Client(authId, authToken, new OkHttpClient.Builder(), BASE_URL, simpleModule); } - public PhloRestClient(String authId, String authToken, OkHttpClient.Builder httpClientBuilder) { - this.client = new PlivoClient(authId, authToken, httpClientBuilder, BASE_URL, simpleModule); + public PhloClient(String authId, String authToken, OkHttpClient.Builder httpClientBuilder) { + this.client = new Client(authId, authToken, httpClientBuilder, BASE_URL, simpleModule); } - public PlivoClient getClient() { + public Client getClient() { return client; } } diff --git a/src/main/java/com/plivo/api/Plivo.java b/src/main/java/com/plivo/api/Plivo.java index 4a0687db..e0a05edb 100644 --- a/src/main/java/com/plivo/api/Plivo.java +++ b/src/main/java/com/plivo/api/Plivo.java @@ -2,30 +2,30 @@ public class Plivo { - private static PlivoClient plivoInstance = null; - private static PlivoClient phloInstance = null; + private static Client plivoInstance = null; + private static Client phloInstance = null; /** - * Initializes the global {@link PlivoClient} plivoInstance + * Initializes the global {@link Client} plivoInstance */ public static synchronized void init(String authId, String authToken) { - plivoInstance = new PlivoClient(authId, authToken); - phloInstance = new PhloRestClient(authId, authToken).getClient(); + plivoInstance = new PlivoClient(authId, authToken).getClient(); + phloInstance = new PhloClient(authId, authToken).getClient(); } /** - * Initializes the global {@link PlivoClient} plivoInstance, taking the authId and authToken from + * Initializes the global {@link Client} plivoInstance, taking the authId and authToken from * environment variables called PLIVO_AUTH_ID and PLIVO_AUTH_TOKEN. */ public static synchronized void init() { init(System.getenv("PLIVO_AUTH_ID"), System.getenv("PLIVO_AUTH_TOKEN")); } - public static PlivoClient getClient() { + public static Client getClient() { return plivoInstance; } - public static PlivoClient getPhloClient() { + public static Client getPhloClient() { return phloInstance; } } diff --git a/src/main/java/com/plivo/api/PlivoClient.java b/src/main/java/com/plivo/api/PlivoClient.java index 7e4b55f3..1124bd74 100644 --- a/src/main/java/com/plivo/api/PlivoClient.java +++ b/src/main/java/com/plivo/api/PlivoClient.java @@ -6,52 +6,24 @@ import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.DeserializationConfig; import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; -import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import com.plivo.api.util.Utils; -import okhttp3.Credentials; -import okhttp3.Interceptor; + import okhttp3.OkHttpClient; -import okhttp3.Protocol; -import okhttp3.Response; -import okhttp3.ResponseBody; -import okhttp3.logging.HttpLoggingInterceptor; -import okhttp3.logging.HttpLoggingInterceptor.Level; -import retrofit2.Retrofit; -import retrofit2.converter.jackson.JacksonConverterFactory; -import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.ProtocolException; -import java.text.SimpleDateFormat; public class PlivoClient { - private static SimpleModule simpleModule = new SimpleModule(); protected static String BASE_URL = "https://api.plivo.com/v1/"; - private static String version = "Unknown Version"; - private boolean testing = false; - private static ObjectMapper objectMapper = new ObjectMapper(); - - public void setTesting(boolean testing) { - this.testing = testing; - } + private SimpleModule simpleModule = new SimpleModule(); + private final Client client; - public boolean isTesting() { - return testing; - } - - static { + { simpleModule.setDeserializerModifier(new BeanDeserializerModifier() { @Override public JsonDeserializer modifyEnumDeserializer(DeserializationConfig config, JavaType type, @@ -70,157 +42,20 @@ public Enum deserialize(JsonParser jp, DeserializationContext ctxt) @Override public void serialize(Enum value, JsonGenerator gen, SerializerProvider provider) throws IOException { - gen.writeString(value.name().toLowerCase().replace("_", "-")); + gen.writeString(value.name().toLowerCase()); } }); } - { - try { - InputStream inputStream = PlivoClient.class - .getResource("version.txt") - .openStream(); - - version = new BufferedReader(new InputStreamReader(inputStream)).readLine(); - } catch (IOException ignored) { - ignored.printStackTrace(); - } - objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); - objectMapper.disable(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS); - objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")); - objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE); - } - - private final Interceptor interceptor = new HttpLoggingInterceptor() - .setLevel(Level.BODY); - private final String authId; - private final String authToken; - private OkHttpClient httpClient; - private Retrofit retrofit; - private PlivoAPIService apiService = null; - - /** - * Constructs a new PlivoClient instance. To set a proxy, timeout etc, you can pass in an OkHttpClient.Builder, on which you can set - * the timeout and proxy using: - * - * 

-   *   new OkHttpClient.Builder()
-   *   .proxy(proxy)
-   *   .connectTimeout(1, TimeUnit.MINUTES);
-   *
- * - * @param authId - * @param authToken - * @param httpClientBuilder - * @param baseUrl - * @param simpleModule - */ - public PlivoClient(String authId, String authToken, OkHttpClient.Builder httpClientBuilder, final String baseUrl, final SimpleModule simpleModule) { - if (!(Utils.isAccountIdValid(authId) || Utils.isSubaccountIdValid(authId))) { - throw new IllegalArgumentException("invalid account ID"); - } - - this.authId = authId; - this.authToken = authToken; - this.objectMapper.registerModule(simpleModule); - - httpClient = httpClientBuilder - .addNetworkInterceptor(interceptor) - .addInterceptor(chain -> chain.proceed( - chain.request() - .newBuilder() - .addHeader("Authorization", Credentials.basic(getAuthId(), getAuthToken())) - .addHeader("User-Agent", String.format("%s/%s (Implementation: %s %s %s, Specification: %s %s %s)", "plivo-java", version, - Runtime.class.getPackage().getImplementationVendor(), - Runtime.class.getPackage().getImplementationTitle(), - Runtime.class.getPackage().getImplementationVersion(), - Runtime.class.getPackage().getSpecificationVendor(), - Runtime.class.getPackage().getSpecificationTitle(), - Runtime.class.getPackage().getSpecificationVersion() - )) - .build() - )) - .addNetworkInterceptor(chain -> { - Response response; - try { - response = chain.proceed(chain.request()); - } catch (ProtocolException protocolException) { - // We return bodies for HTTP 204! - response = new Response.Builder() - .request(chain.request()) - .code(204) - .protocol(Protocol.HTTP_1_1) - .body(ResponseBody.create(null, new byte[]{})) - .build(); - } - return response; - }).build(); - - retrofit = new Retrofit.Builder() - .client(httpClient) - .baseUrl(baseUrl) - .addConverterFactory(JacksonConverterFactory.create(objectMapper)) - .build(); - - this.apiService = retrofit.create(PlivoAPIService.class); - } - - /** - * Constructs a new PlivoClient instance. To set a proxy, timeout etc, you can pass in an OkHttpClient.Builder, on which you can set - * the timeout and proxy using: - * - * 

-   *   new OkHttpClient.Builder()
-   *   .proxy(proxy)
-   *   .connectTimeout(1, TimeUnit.MINUTES);
-   *
- * - * @param authId - * @param authToken - */ public PlivoClient(String authId, String authToken) { - this(authId, authToken, new OkHttpClient.Builder(), BASE_URL, simpleModule); + this.client = new Client(authId, authToken, new OkHttpClient.Builder(), BASE_URL, simpleModule); } - /** - * Constructs a new PlivoClient instance. To set a proxy, timeout etc, you can pass in an OkHttpClient.Builder, on which you can set - * the timeout and proxy using: - * - * 

-   *   new OkHttpClient.Builder()
-   *   .proxy(proxy)
-   *   .connectTimeout(1, TimeUnit.MINUTES);
-   *
- * - * @param authId - * @param authToken - * @param httpClientBuilder - */ public PlivoClient(String authId, String authToken, OkHttpClient.Builder httpClientBuilder) { - this(authId, authToken, httpClientBuilder, BASE_URL, simpleModule); - } - - public static ObjectMapper getObjectMapper() { - return objectMapper; - } - - Retrofit getRetrofit() { - return retrofit; - } - - public PlivoAPIService getApiService() { - return apiService; - } - - void setApiService(PlivoAPIService apiService) { - this.apiService = apiService; - } - - public String getAuthId() { - return authId; + this.client = new Client(authId, authToken, httpClientBuilder, BASE_URL, simpleModule); } - public String getAuthToken() { - return authToken; + public Client getClient() { + return this.client; } } diff --git a/src/main/java/com/plivo/api/models/base/BaseRequest.java b/src/main/java/com/plivo/api/models/base/BaseRequest.java index bbbe9339..604518d2 100644 --- a/src/main/java/com/plivo/api/models/base/BaseRequest.java +++ b/src/main/java/com/plivo/api/models/base/BaseRequest.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.JsonNode; +import com.plivo.api.Client; import com.plivo.api.Plivo; -import com.plivo.api.PlivoClient; import com.plivo.api.exceptions.AuthenticationException; import com.plivo.api.exceptions.InvalidRequestException; import com.plivo.api.exceptions.PlivoRestException; @@ -22,24 +22,24 @@ @JsonAutoDetect(fieldVisibility = Visibility.ANY) public abstract class BaseRequest { @JsonIgnore - protected PlivoClient plivoClient = Plivo.getClient(); + protected Client client = Plivo.getClient(); - public PlivoClient client() { - return this.plivoClient; + public Client client() { + return this.client; } - public BaseRequest client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public BaseRequest client(final Client plivoClient) { + this.client = plivoClient; return this; } protected void validate() { - if (plivoClient == null) { + if (this.client == null) { throw new IllegalStateException("client cannot be null"); } // Convenient way to test setters and getters - if (plivoClient.isTesting()) { + if (client.isTesting()) { HashMap values = new HashMap<>(); for (Method method : this.getClass().getMethods()) { if (method.getParameterCount() == 0) { @@ -68,7 +68,7 @@ protected void validate() { } protected void handleResponse(Response response) throws PlivoRestException, IOException { - if (plivoClient.isTesting()) { + if (client.isTesting()) { if (response.body() != null) { if (!(response.body() instanceof ResponseBody)) { client().getObjectMapper().convertValue(response.body(), JsonNode.class); diff --git a/src/main/java/com/plivo/api/models/base/BaseResource.java b/src/main/java/com/plivo/api/models/base/BaseResource.java index 21df453b..4412f9fd 100644 --- a/src/main/java/com/plivo/api/models/base/BaseResource.java +++ b/src/main/java/com/plivo/api/models/base/BaseResource.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.core.JsonProcessingException; +import com.plivo.api.Client; import com.plivo.api.Plivo; -import com.plivo.api.PlivoClient; //@JsonIgnoreProperties(value = {"api_id"}) public abstract class BaseResource { @@ -16,14 +16,14 @@ public String getApiId() { public abstract String getId(); - protected PlivoClient plivoClient = Plivo.getClient(); + protected Client plivoClient = Plivo.getClient(); @JsonIgnore - public PlivoClient getPlivoClient() { + public Client getPlivoClient() { return plivoClient; } - public void setPlivoClient(PlivoClient plivoClient) { + public void setPlivoClient(Client plivoClient) { this.plivoClient = plivoClient; } diff --git a/src/main/java/com/plivo/api/models/base/Creator.java b/src/main/java/com/plivo/api/models/base/Creator.java index 19cddd15..843429f9 100644 --- a/src/main/java/com/plivo/api/models/base/Creator.java +++ b/src/main/java/com/plivo/api/models/base/Creator.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; import java.io.IOException; import retrofit2.Call; @@ -29,8 +29,8 @@ public CreateResponse create() throws IOException, PlivoRestException { } @Override - public Creator client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public Creator client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/base/Deleter.java b/src/main/java/com/plivo/api/models/base/Deleter.java index f508fb02..f8a947ae 100644 --- a/src/main/java/com/plivo/api/models/base/Deleter.java +++ b/src/main/java/com/plivo/api/models/base/Deleter.java @@ -1,6 +1,6 @@ package com.plivo.api.models.base; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; import java.io.IOException; import okhttp3.ResponseBody; @@ -35,8 +35,8 @@ public void delete() throws IOException, PlivoRestException { } @Override - public Deleter client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public Deleter client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/base/Getter.java b/src/main/java/com/plivo/api/models/base/Getter.java index 9220c146..a55c594a 100644 --- a/src/main/java/com/plivo/api/models/base/Getter.java +++ b/src/main/java/com/plivo/api/models/base/Getter.java @@ -1,6 +1,6 @@ package com.plivo.api.models.base; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; import java.io.IOException; import java.util.Map; @@ -39,14 +39,14 @@ public T get() throws IOException, PlivoRestException { } @Override - public Getter client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public Getter client(final Client plivoClient) { + this.client = plivoClient; return this; } protected Map toMap() { client(); - return Utils.objectToMap(PlivoClient.getObjectMapper(), this); + return Utils.objectToMap(Client.getObjectMapper(), this); } protected abstract Call obtainCall(); diff --git a/src/main/java/com/plivo/api/models/base/Lister.java b/src/main/java/com/plivo/api/models/base/Lister.java index 9f2ef3b1..66362642 100644 --- a/src/main/java/com/plivo/api/models/base/Lister.java +++ b/src/main/java/com/plivo/api/models/base/Lister.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize.Typing; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.IterableError; import com.plivo.api.exceptions.PlivoRestException; import com.plivo.api.util.Utils; @@ -26,8 +26,8 @@ public abstract class Lister extends BaseRequest impl protected Integer offset = null; @Override - public Lister client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public Lister client(final Client plivoClient) { + this.client = plivoClient; return this; } @@ -80,7 +80,7 @@ public ListResponse list() throws IOException, PlivoRestException { protected Map toMap() { client(); - return Utils.objectToMap(plivoClient.getObjectMapper(), this); + return Utils.objectToMap(client.getObjectMapper(), this); } @Override diff --git a/src/main/java/com/plivo/api/models/base/Updater.java b/src/main/java/com/plivo/api/models/base/Updater.java index 760d9f1e..1e0a7091 100644 --- a/src/main/java/com/plivo/api/models/base/Updater.java +++ b/src/main/java/com/plivo/api/models/base/Updater.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; import java.io.IOException; import retrofit2.Call; @@ -34,8 +34,8 @@ public T update() throws IOException, PlivoRestException { } @Override - public Updater client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public Updater client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/call/actions/CallDtmfCreator.java b/src/main/java/com/plivo/api/models/call/actions/CallDtmfCreator.java index 2fb783c5..6b7fb0d9 100644 --- a/src/main/java/com/plivo/api/models/call/actions/CallDtmfCreator.java +++ b/src/main/java/com/plivo/api/models/call/actions/CallDtmfCreator.java @@ -1,6 +1,6 @@ package com.plivo.api.models.call.actions; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; import com.plivo.api.models.base.Creator; import com.plivo.api.models.call.LegSpecifier; @@ -42,8 +42,8 @@ public CallDtmfCreateResponse sendDigits() throws IOException, PlivoRestExceptio } @Override - public CallDtmfCreator client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public CallDtmfCreator client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/call/actions/CallPlayCreator.java b/src/main/java/com/plivo/api/models/call/actions/CallPlayCreator.java index 54fa09c9..93ac3ea6 100644 --- a/src/main/java/com/plivo/api/models/call/actions/CallPlayCreator.java +++ b/src/main/java/com/plivo/api/models/call/actions/CallPlayCreator.java @@ -1,6 +1,6 @@ package com.plivo.api.models.call.actions; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; import com.plivo.api.models.base.Creator; import com.plivo.api.models.call.LegSpecifier; @@ -78,8 +78,8 @@ public CallPlayCreateResponse play() throws IOException, PlivoRestException { } @Override - public CallPlayCreator client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public CallPlayCreator client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/call/actions/CallPlayDeleter.java b/src/main/java/com/plivo/api/models/call/actions/CallPlayDeleter.java index 5d34e886..490e8f11 100644 --- a/src/main/java/com/plivo/api/models/call/actions/CallPlayDeleter.java +++ b/src/main/java/com/plivo/api/models/call/actions/CallPlayDeleter.java @@ -1,6 +1,6 @@ package com.plivo.api.models.call.actions; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; import com.plivo.api.models.base.Deleter; import com.plivo.api.models.call.Call; @@ -23,8 +23,8 @@ public void playStop() throws IOException, PlivoRestException { } @Override - public CallPlayDeleter client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public CallPlayDeleter client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/call/actions/CallRecordCreator.java b/src/main/java/com/plivo/api/models/call/actions/CallRecordCreator.java index c85e0757..690cdd1c 100644 --- a/src/main/java/com/plivo/api/models/call/actions/CallRecordCreator.java +++ b/src/main/java/com/plivo/api/models/call/actions/CallRecordCreator.java @@ -1,6 +1,6 @@ package com.plivo.api.models.call.actions; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; import com.plivo.api.models.base.Creator; import java.io.IOException; @@ -23,8 +23,8 @@ public CallRecordCreateResponse record() throws IOException, PlivoRestException } @Override - public CallRecordCreator client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public CallRecordCreator client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/call/actions/CallRecordDeleter.java b/src/main/java/com/plivo/api/models/call/actions/CallRecordDeleter.java index 9debd6fd..0e84fbee 100644 --- a/src/main/java/com/plivo/api/models/call/actions/CallRecordDeleter.java +++ b/src/main/java/com/plivo/api/models/call/actions/CallRecordDeleter.java @@ -1,6 +1,6 @@ package com.plivo.api.models.call.actions; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; import com.plivo.api.models.base.Deleter; import com.plivo.api.models.call.Call; @@ -23,8 +23,8 @@ public void recordStop() throws IOException, PlivoRestException { } @Override - public CallRecordDeleter client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public CallRecordDeleter client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/call/actions/CallSpeakCreator.java b/src/main/java/com/plivo/api/models/call/actions/CallSpeakCreator.java index 2f311d1e..a695e72c 100644 --- a/src/main/java/com/plivo/api/models/call/actions/CallSpeakCreator.java +++ b/src/main/java/com/plivo/api/models/call/actions/CallSpeakCreator.java @@ -1,6 +1,6 @@ package com.plivo.api.models.call.actions; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; import com.plivo.api.models.base.Creator; import com.plivo.api.models.call.LegSpecifier; @@ -32,8 +32,8 @@ public CallSpeakCreateResponse speak() throws IOException, PlivoRestException { } @Override - public CallSpeakCreator client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public CallSpeakCreator client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/call/actions/CallSpeakDeleter.java b/src/main/java/com/plivo/api/models/call/actions/CallSpeakDeleter.java index 43f717c5..bf6fe8b5 100644 --- a/src/main/java/com/plivo/api/models/call/actions/CallSpeakDeleter.java +++ b/src/main/java/com/plivo/api/models/call/actions/CallSpeakDeleter.java @@ -1,6 +1,6 @@ package com.plivo.api.models.call.actions; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; import com.plivo.api.models.base.Deleter; import com.plivo.api.models.call.Call; @@ -23,8 +23,8 @@ public void speakStop() throws IOException, PlivoRestException { } @Override - public CallSpeakDeleter client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public CallSpeakDeleter client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/conference/ConferenceMemberDeafCreator.java b/src/main/java/com/plivo/api/models/conference/ConferenceMemberDeafCreator.java index f6167c18..ad0d131a 100644 --- a/src/main/java/com/plivo/api/models/conference/ConferenceMemberDeafCreator.java +++ b/src/main/java/com/plivo/api/models/conference/ConferenceMemberDeafCreator.java @@ -1,7 +1,8 @@ package com.plivo.api.models.conference; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; + import java.io.IOException; import retrofit2.Call; @@ -23,8 +24,8 @@ public ConferenceMemberActionResponse deaf() throws IOException, PlivoRestExcept } @Override - public ConferenceMemberDeafCreator client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public ConferenceMemberDeafCreator client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/conference/ConferenceMemberDeafDeleter.java b/src/main/java/com/plivo/api/models/conference/ConferenceMemberDeafDeleter.java index 2b393ea3..a16b7290 100644 --- a/src/main/java/com/plivo/api/models/conference/ConferenceMemberDeafDeleter.java +++ b/src/main/java/com/plivo/api/models/conference/ConferenceMemberDeafDeleter.java @@ -1,6 +1,7 @@ package com.plivo.api.models.conference; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; + import okhttp3.ResponseBody; import retrofit2.Call; @@ -17,8 +18,8 @@ protected Call obtainCall() { } @Override - public ConferenceMemberDeafDeleter client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public ConferenceMemberDeafDeleter client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/conference/ConferenceMemberDeleter.java b/src/main/java/com/plivo/api/models/conference/ConferenceMemberDeleter.java index 08552a43..5d2169d3 100644 --- a/src/main/java/com/plivo/api/models/conference/ConferenceMemberDeleter.java +++ b/src/main/java/com/plivo/api/models/conference/ConferenceMemberDeleter.java @@ -1,7 +1,8 @@ package com.plivo.api.models.conference; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; + import java.io.IOException; import retrofit2.Call; @@ -22,8 +23,8 @@ public void hangup() throws IOException, PlivoRestException { } @Override - public ConferenceMemberDeleter client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public ConferenceMemberDeleter client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/conference/ConferenceMemberKickCreator.java b/src/main/java/com/plivo/api/models/conference/ConferenceMemberKickCreator.java index abb30c80..36182b83 100644 --- a/src/main/java/com/plivo/api/models/conference/ConferenceMemberKickCreator.java +++ b/src/main/java/com/plivo/api/models/conference/ConferenceMemberKickCreator.java @@ -1,7 +1,8 @@ package com.plivo.api.models.conference; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; + import java.io.IOException; import retrofit2.Call; @@ -23,8 +24,8 @@ public ConferenceMemberActionResponse kick() throws IOException, PlivoRestExcept } @Override - public ConferenceMemberKickCreator client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public ConferenceMemberKickCreator client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/conference/ConferenceMemberMuteCreator.java b/src/main/java/com/plivo/api/models/conference/ConferenceMemberMuteCreator.java index fb37e2a2..df55ecde 100644 --- a/src/main/java/com/plivo/api/models/conference/ConferenceMemberMuteCreator.java +++ b/src/main/java/com/plivo/api/models/conference/ConferenceMemberMuteCreator.java @@ -1,7 +1,8 @@ package com.plivo.api.models.conference; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; + import java.io.IOException; import retrofit2.Call; @@ -23,8 +24,8 @@ public ConferenceMemberActionResponse mute() throws IOException, PlivoRestExcept } @Override - public ConferenceMemberMuteCreator client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public ConferenceMemberMuteCreator client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/conference/ConferenceMemberMuteDeleter.java b/src/main/java/com/plivo/api/models/conference/ConferenceMemberMuteDeleter.java index 3425d29d..eae8afaf 100644 --- a/src/main/java/com/plivo/api/models/conference/ConferenceMemberMuteDeleter.java +++ b/src/main/java/com/plivo/api/models/conference/ConferenceMemberMuteDeleter.java @@ -1,6 +1,7 @@ package com.plivo.api.models.conference; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; + import okhttp3.ResponseBody; import retrofit2.Call; @@ -17,8 +18,8 @@ protected Call obtainCall() { } @Override - public ConferenceMemberMuteDeleter client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public ConferenceMemberMuteDeleter client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/conference/ConferenceMemberPlayCreator.java b/src/main/java/com/plivo/api/models/conference/ConferenceMemberPlayCreator.java index 5943cf1e..b8b8f609 100644 --- a/src/main/java/com/plivo/api/models/conference/ConferenceMemberPlayCreator.java +++ b/src/main/java/com/plivo/api/models/conference/ConferenceMemberPlayCreator.java @@ -1,7 +1,8 @@ package com.plivo.api.models.conference; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; + import java.io.IOException; import retrofit2.Call; @@ -22,8 +23,8 @@ protected Call obtainCall() { } @Override - public ConferenceMemberPlayCreator client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public ConferenceMemberPlayCreator client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/conference/ConferenceMemberPlayDeleter.java b/src/main/java/com/plivo/api/models/conference/ConferenceMemberPlayDeleter.java index fe2123a0..101c6eeb 100644 --- a/src/main/java/com/plivo/api/models/conference/ConferenceMemberPlayDeleter.java +++ b/src/main/java/com/plivo/api/models/conference/ConferenceMemberPlayDeleter.java @@ -1,6 +1,7 @@ package com.plivo.api.models.conference; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; + import okhttp3.ResponseBody; import retrofit2.Call; @@ -17,8 +18,8 @@ protected Call obtainCall() { } @Override - public ConferenceMemberPlayDeleter client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public ConferenceMemberPlayDeleter client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/conference/ConferenceMemberSpeakCreator.java b/src/main/java/com/plivo/api/models/conference/ConferenceMemberSpeakCreator.java index 425304c9..2824444e 100644 --- a/src/main/java/com/plivo/api/models/conference/ConferenceMemberSpeakCreator.java +++ b/src/main/java/com/plivo/api/models/conference/ConferenceMemberSpeakCreator.java @@ -1,7 +1,8 @@ package com.plivo.api.models.conference; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; + import java.io.IOException; import retrofit2.Call; @@ -51,8 +52,8 @@ public ConferenceMemberActionResponse speak() throws IOException, PlivoRestExcep } @Override - public ConferenceMemberSpeakCreator client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public ConferenceMemberSpeakCreator client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/conference/ConferenceMemberSpeakDeleter.java b/src/main/java/com/plivo/api/models/conference/ConferenceMemberSpeakDeleter.java index c6e7297a..9e687217 100644 --- a/src/main/java/com/plivo/api/models/conference/ConferenceMemberSpeakDeleter.java +++ b/src/main/java/com/plivo/api/models/conference/ConferenceMemberSpeakDeleter.java @@ -1,6 +1,7 @@ package com.plivo.api.models.conference; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; + import okhttp3.ResponseBody; import retrofit2.Call; @@ -17,8 +18,8 @@ protected Call obtainCall() { } @Override - public ConferenceMemberSpeakDeleter client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public ConferenceMemberSpeakDeleter client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/conference/ConferenceRecordCreator.java b/src/main/java/com/plivo/api/models/conference/ConferenceRecordCreator.java index 286e8fa4..a961718d 100644 --- a/src/main/java/com/plivo/api/models/conference/ConferenceRecordCreator.java +++ b/src/main/java/com/plivo/api/models/conference/ConferenceRecordCreator.java @@ -1,7 +1,7 @@ package com.plivo.api.models.conference; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; import com.plivo.api.models.base.Creator; import java.io.IOException; @@ -86,8 +86,8 @@ public ConferenceRecordCreateResponse record() throws IOException, PlivoRestExce } @Override - public ConferenceRecordCreator client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public ConferenceRecordCreator client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/conference/ConferenceRecordDeleter.java b/src/main/java/com/plivo/api/models/conference/ConferenceRecordDeleter.java index 1cbfabfc..1f5567c5 100644 --- a/src/main/java/com/plivo/api/models/conference/ConferenceRecordDeleter.java +++ b/src/main/java/com/plivo/api/models/conference/ConferenceRecordDeleter.java @@ -1,6 +1,6 @@ package com.plivo.api.models.conference; -import com.plivo.api.PlivoClient; +import com.plivo.api.Client; import com.plivo.api.exceptions.PlivoRestException; import com.plivo.api.models.base.Deleter; import java.io.IOException; @@ -23,8 +23,8 @@ public void stop() throws IOException, PlivoRestException { } @Override - public ConferenceRecordDeleter client(final PlivoClient plivoClient) { - this.plivoClient = plivoClient; + public ConferenceRecordDeleter client(final Client plivoClient) { + this.client = plivoClient; return this; } diff --git a/src/main/java/com/plivo/api/models/node/MultiPartyCallGetter.java b/src/main/java/com/plivo/api/models/node/MultiPartyCallGetter.java index c3f97e42..c55e74e6 100644 --- a/src/main/java/com/plivo/api/models/node/MultiPartyCallGetter.java +++ b/src/main/java/com/plivo/api/models/node/MultiPartyCallGetter.java @@ -1,9 +1,11 @@ package com.plivo.api.models.node; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.plivo.api.Client; import com.plivo.api.Plivo; -import com.plivo.api.PlivoClient; import com.plivo.api.models.base.Getter; +import com.plivo.api.models.phlo.PhloGetter; + import retrofit2.Call; public class MultiPartyCallGetter extends Getter { @@ -16,12 +18,19 @@ public MultiPartyCallGetter(String phloId, String id) { } @Override - public PlivoClient client() { + public Client client() { return this.plivoClient; } + + @Override + public MultiPartyCallGetter client(final Client plivoClient) { + super.client(plivoClient); + this.plivoClient = plivoClient; + return this; + } @JsonIgnore - protected PlivoClient plivoClient = Plivo.getPhloClient(); + protected Client plivoClient = Plivo.getPhloClient(); @Override protected Call obtainCall() { diff --git a/src/main/java/com/plivo/api/models/node/MultiPartyCallUpdater.java b/src/main/java/com/plivo/api/models/node/MultiPartyCallUpdater.java index adfec716..db6ddb7d 100644 --- a/src/main/java/com/plivo/api/models/node/MultiPartyCallUpdater.java +++ b/src/main/java/com/plivo/api/models/node/MultiPartyCallUpdater.java @@ -1,8 +1,8 @@ package com.plivo.api.models.node; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.plivo.api.Client; import com.plivo.api.Plivo; -import com.plivo.api.PlivoClient; import com.plivo.api.models.base.Updater; import retrofit2.Call; @@ -25,10 +25,17 @@ public MultiPartyCallUpdater(String phloId, String id) { } @JsonIgnore - protected PlivoClient plivoClient = Plivo.getPhloClient(); + protected Client plivoClient = Plivo.getPhloClient(); @Override - public PlivoClient client() { + public MultiPartyCallUpdater client(final Client plivoClient) { + super.client(plivoClient); + this.plivoClient = plivoClient; + return this; + } + + @Override + public Client client() { return this.plivoClient; } diff --git a/src/main/java/com/plivo/api/models/phlo/PhloGetter.java b/src/main/java/com/plivo/api/models/phlo/PhloGetter.java index a8349593..8c271669 100644 --- a/src/main/java/com/plivo/api/models/phlo/PhloGetter.java +++ b/src/main/java/com/plivo/api/models/phlo/PhloGetter.java @@ -1,8 +1,10 @@ package com.plivo.api.models.phlo; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.plivo.api.Client; import com.plivo.api.Plivo; -import com.plivo.api.PlivoClient; +import com.plivo.api.models.base.BaseRequest; +import com.plivo.api.models.base.BaseResource; import com.plivo.api.models.base.Getter; import retrofit2.Call; @@ -13,12 +15,19 @@ public PhloGetter(final String phloId) { } @Override - public PlivoClient client() { + public Client client() { return this.plivoClient; } + + @Override + public PhloGetter client(final Client plivoClient) { + super.client(plivoClient); + this.plivoClient = plivoClient; + return this; + } @JsonIgnore - protected PlivoClient plivoClient = Plivo.getPhloClient(); + protected Client plivoClient = Plivo.getPhloClient(); @Override protected Call obtainCall() { diff --git a/src/main/java/com/plivo/api/models/phlo/PhloUpdater.java b/src/main/java/com/plivo/api/models/phlo/PhloUpdater.java index c23ce34f..2c7faa58 100644 --- a/src/main/java/com/plivo/api/models/phlo/PhloUpdater.java +++ b/src/main/java/com/plivo/api/models/phlo/PhloUpdater.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.JsonParseException; +import com.plivo.api.Client; import com.plivo.api.Plivo; -import com.plivo.api.PlivoClient; import com.plivo.api.exceptions.PlivoRestException; import com.plivo.api.models.base.Updater; import retrofit2.Call; @@ -18,7 +18,7 @@ public class PhloUpdater extends Updater { private Map payload = new HashMap<>(); @JsonIgnore - protected PlivoClient plivoClient = Plivo.getPhloClient(); + protected Client plivoClient = Plivo.getPhloClient(); public PhloUpdater(final String phloId) { super(phloId); @@ -28,9 +28,16 @@ public PhloUpdater payload(Map payload) { this.payload = payload; return this; } - + + @Override + public PhloUpdater client(final Client plivoClient) { + super.client(plivoClient); + this.plivoClient = plivoClient; + return this; + } + @Override - public PlivoClient client() { + public Client client() { return this.plivoClient; } diff --git a/src/main/java/com/plivo/examples/Accounts.java b/src/main/java/com/plivo/examples/Accounts.java index 438b46b9..87e17a9a 100644 --- a/src/main/java/com/plivo/examples/Accounts.java +++ b/src/main/java/com/plivo/examples/Accounts.java @@ -1,5 +1,6 @@ package com.plivo.examples; +import com.plivo.api.Client; import com.plivo.api.Plivo; import com.plivo.api.PlivoClient; import com.plivo.api.exceptions.PlivoRestException; @@ -13,7 +14,7 @@ public class Accounts { private static final String authId = "MANTXXXXXXXXXXXXXXXX"; private static final String authToken = "ZMANTXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"; - private static PlivoClient client = new PlivoClient(authId, authToken); + private static Client plivoClient = new PlivoClient(authId, authToken).getClient(); public static void main(String[] args) { Plivo.init(authId, authToken); @@ -41,7 +42,7 @@ private static void getAccountInfo() { private static void getAccountInfoBySettingClient() { try { Account response = Account.getter() - .client(client) + .client(plivoClient) .get(); System.out.println(response); } catch (PlivoRestException | IOException e) { @@ -66,7 +67,7 @@ private static void modifyAccountBySettingClient() { try { AccountUpdateResponse response = Account.updater() .city("Test city") - .client(client) + .client(plivoClient) .update(); System.out.println(response); } catch (PlivoRestException | IOException e) { @@ -91,7 +92,7 @@ private static void createSubAccountBySettingClient() { try { SubaccountCreateResponse subaccount = Subaccount.creator("Test 2") .enabled(true) - .client(client) + .client(plivoClient) .create(); System.out.println(subaccount); } catch (PlivoRestException | IOException e) { diff --git a/src/main/java/com/plivo/examples/MulitpartyCallAPI.java b/src/main/java/com/plivo/examples/MulitpartyCallAPI.java new file mode 100644 index 00000000..10d9bf06 --- /dev/null +++ b/src/main/java/com/plivo/examples/MulitpartyCallAPI.java @@ -0,0 +1,99 @@ +package com.plivo.examples; + +import java.io.IOException; + +import com.plivo.api.Client; +import com.plivo.api.PhloClient; +import com.plivo.api.exceptions.PlivoRestException; +import com.plivo.api.models.node.MultiPartyCall; +import com.plivo.api.models.node.MultiPartyCallUpdateResponse; +import com.plivo.api.models.node.MultiPartyCallUpdater; + +public class MulitpartyCallAPI { + private static final String authId = "XXXXXXXXXXXXXXXXMZ"; + private static final String authToken = "NzUyYTXXXXXXXXXXXXXX5YTJmNTgwMDI4"; + private static final String phloID = "2e802f94-XXXXXX_XXXXX_XX5a0328544135"; + private static final String nodeID = "b18848dd-XXXXX-XXXXXX-XXXXXc274d5fb7"; + private static final String triggerSource = "111111111"; + private static final String to = "00000000000"; + private static final String role = "agent"; + private static final String memberID = "00000000000"; + private static Client phloClient = new PhloClient(authId, authToken).getClient(); + + public static void main(String[] args) { + testMultiPartyCallGetter(); + } + + + private static void testMultiPartyCallGetter() { + + + MultiPartyCall resp = null; + try { + resp = MultiPartyCall.getter(phloID, nodeID).client(phloClient).get(); + System.out.println(resp); + } catch (IOException | PlivoRestException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + + private static void testMultipartyCallCall() { + MultiPartyCallUpdateResponse response = null; + try { + MultiPartyCall.getter(phloID, nodeID).client(phloClient).get(); + response = MultiPartyCall.updater(phloID, nodeID).client(phloClient). + triggerSource(triggerSource).to(to).role(role).call().update(); + System.out.println(response); + } catch (IOException | PlivoRestException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + + private static void testMultipartyCalllWarmTransfer() { + MultiPartyCallUpdateResponse response = null; + try { + MultiPartyCall.getter(phloID, nodeID).client(phloClient).get(); + response = MultiPartyCall.updater(phloID, nodeID).client(phloClient). + triggerSource(triggerSource).to(to).role(role).warm_transfer().update(); + System.out.println(response); + } catch (IOException | PlivoRestException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + + private static void testMultipartyCalllColdTransfer() { + MultiPartyCallUpdateResponse response = null; + try { + MultiPartyCall.getter(phloID, nodeID).client(phloClient).get(); + response = MultiPartyCall.updater(phloID, nodeID).client(phloClient). + triggerSource(triggerSource).to(to).role(role).cold_transfer().update(); + System.out.println(response); + } catch (IOException | PlivoRestException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + private static void testMultipartyCalllHold() throws IOException { + MultiPartyCallUpdater resp = null; + try { + MultiPartyCall.getter(phloID, nodeID).client(phloClient).get(); + resp = MultiPartyCall.updater(phloID, nodeID).client(phloClient). + triggerSource(triggerSource).to(to).role(role).member(memberID).hold(); + System.out.println(resp); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + +} diff --git a/src/main/java/com/plivo/examples/PhloAPI.java b/src/main/java/com/plivo/examples/PhloAPI.java new file mode 100644 index 00000000..b61736c0 --- /dev/null +++ b/src/main/java/com/plivo/examples/PhloAPI.java @@ -0,0 +1,76 @@ +package com.plivo.examples; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import com.plivo.api.Client; +import com.plivo.api.PhloClient; +import com.plivo.api.Plivo; +import com.plivo.api.exceptions.PlivoRestException; +import com.plivo.api.models.phlo.Phlo; +import com.plivo.api.models.phlo.PhloUpdateResponse; + +public class PhloAPI { + private static final String authId = "XXXXXXXXXXXXXXXXMZ"; + private static final String authToken = "NzUyYTXXXXXXXXXXXXXX5YTJmNTgwMDI4"; + private static final String phloID = "2e802f94-XXXXXX_XXXXX_XX5a0328544135"; + + private static Client phloClient = new PhloClient(authId, authToken).getClient(); + + public static void main(String[] args) { + phloGetterWithInit(); + } + + + private static void phloGetterWithInit() { + Plivo.init(authId, authToken); + Phlo resp = null; + try { + resp = Phlo.getter(phloID).get(); + System.out.println(resp); + } catch (IOException | PlivoRestException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + private static void phloGetterWithClient() { + Phlo resp = null; + try { + resp = Phlo.getter(phloID).client(phloClient).get(); + System.out.println(resp); + } catch (IOException | PlivoRestException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + private static void testPhloWithPayload() { + PhloUpdateResponse resp = null; + try { + Map payload = new HashMap<>(); + payload.put("from", "XXXXXXXXXX"); + payload.put("to", "XXXXXXXXX"); + + resp = Phlo.updater(phloID).client(phloClient).payload(payload).run(); + System.out.println(resp); + } catch (IOException | PlivoRestException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + private static void testPhloWithoutPayload() { + PhloUpdateResponse resp = null; + try { + resp = Phlo.updater(phloID).client(phloClient).run(); + System.out.println(resp); + } catch (IOException | PlivoRestException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + +} diff --git a/src/test/java/com/plivo/api/AccountTest.java b/src/test/java/com/plivo/api/AccountTest.java index e6cd3a66..1d96c9a0 100644 --- a/src/test/java/com/plivo/api/AccountTest.java +++ b/src/test/java/com/plivo/api/AccountTest.java @@ -12,13 +12,13 @@ public class AccountTest extends BaseTest { - private PlivoClient client; + private Client client; @Before public void setUp() throws Exception { super.setUp(); client = new PlivoClient("MA123456789012345678", - "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); } @Test @@ -107,7 +107,7 @@ public void subaccountCreateShouldSucceed() throws Exception { public void subaccountCreateWithClientShouldSucceed() throws Exception { expectResponse("subaccountCreateResponse.json", 200); - PlivoClient client = new PlivoClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + Client client = new PlivoClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); Subaccount.creator("Test") .enabled(true) .client(client).create(); @@ -184,7 +184,7 @@ public void subaccountModifyShouldSucceed() throws Exception { public void subaccountModifyWithClientShouldSucceed() throws Exception { String fixtureName = "subaccountModifyResponse.json"; String subauthId = "SAMTVIYJDIYWYYMZHLYZ"; - PlivoClient client = new PlivoClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + Client client = new PlivoClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); expectResponse(fixtureName, 202); diff --git a/src/test/java/com/plivo/api/AddressTest.java b/src/test/java/com/plivo/api/AddressTest.java index 3186238d..291fe381 100644 --- a/src/test/java/com/plivo/api/AddressTest.java +++ b/src/test/java/com/plivo/api/AddressTest.java @@ -11,13 +11,13 @@ public class AddressTest extends BaseTest { - private PlivoClient client; + private Client client; @Before public void setUp() throws Exception { super.setUp(); client = new PlivoClient("MA123456789012345678", - "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); } @Test diff --git a/src/test/java/com/plivo/api/ApplicationTest.java b/src/test/java/com/plivo/api/ApplicationTest.java index f2c5c926..f54e4f90 100644 --- a/src/test/java/com/plivo/api/ApplicationTest.java +++ b/src/test/java/com/plivo/api/ApplicationTest.java @@ -11,13 +11,13 @@ public class ApplicationTest extends BaseTest { - private PlivoClient client; + private Client client; @Before public void setUp() throws Exception { super.setUp(); client = new PlivoClient("MA123456789012345678", - "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); } @Test diff --git a/src/test/java/com/plivo/api/BaseTest.java b/src/test/java/com/plivo/api/BaseTest.java index 8c3f5ccc..feb254e0 100644 --- a/src/test/java/com/plivo/api/BaseTest.java +++ b/src/test/java/com/plivo/api/BaseTest.java @@ -98,7 +98,7 @@ public void setUp() throws Exception { server.start(); PlivoClient.BASE_URL = server.url("/").toString(); - PhloRestClient.BASE_URL = server.url("/").toString(); + PhloClient.BASE_URL = server.url("/").toString(); Plivo.init(authId, authToken); Plivo.getClient().setTesting(true); Plivo.getPhloClient().setTesting(true); diff --git a/src/test/java/com/plivo/api/CallTest.java b/src/test/java/com/plivo/api/CallTest.java index 92666408..97260013 100644 --- a/src/test/java/com/plivo/api/CallTest.java +++ b/src/test/java/com/plivo/api/CallTest.java @@ -18,13 +18,13 @@ public class CallTest extends BaseTest { final ObjectMapper objectMapper = new ObjectMapper(); - private PlivoClient client; + private Client client; @Before public void setUp() throws Exception { super.setUp(); client = new PlivoClient("MA123456789012345678", - "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); } @Test diff --git a/src/test/java/com/plivo/api/ConferenceTest.java b/src/test/java/com/plivo/api/ConferenceTest.java index 4309e8c6..ccf9945e 100644 --- a/src/test/java/com/plivo/api/ConferenceTest.java +++ b/src/test/java/com/plivo/api/ConferenceTest.java @@ -8,13 +8,13 @@ public class ConferenceTest extends BaseTest { - private PlivoClient client; + private Client client; @Before public void setUp() throws Exception { super.setUp(); client = new PlivoClient("MA123456789012345678", - "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); } @Test diff --git a/src/test/java/com/plivo/api/EndpointTest.java b/src/test/java/com/plivo/api/EndpointTest.java index 5cf64366..bfafa739 100644 --- a/src/test/java/com/plivo/api/EndpointTest.java +++ b/src/test/java/com/plivo/api/EndpointTest.java @@ -8,13 +8,13 @@ public class EndpointTest extends BaseTest { - private PlivoClient client; + private Client client; @Before public void setUp() throws Exception { super.setUp(); client = new PlivoClient("MA123456789012345678", - "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); } @Test diff --git a/src/test/java/com/plivo/api/IdentityTest.java b/src/test/java/com/plivo/api/IdentityTest.java index f141db24..1144f978 100644 --- a/src/test/java/com/plivo/api/IdentityTest.java +++ b/src/test/java/com/plivo/api/IdentityTest.java @@ -14,13 +14,13 @@ public class IdentityTest extends BaseTest { - private PlivoClient client; + private Client client; @Before public void setUp() throws Exception { super.setUp(); client = new PlivoClient("MA123456789012345678", - "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); } @Test diff --git a/src/test/java/com/plivo/api/MessageTest.java b/src/test/java/com/plivo/api/MessageTest.java index 1547ee33..7ac6da42 100644 --- a/src/test/java/com/plivo/api/MessageTest.java +++ b/src/test/java/com/plivo/api/MessageTest.java @@ -15,13 +15,13 @@ public class MessageTest extends BaseTest { - private PlivoClient client; + private Client client; @Before public void setUp() throws Exception { super.setUp(); client = new PlivoClient("MA123456789012345678", - "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); } @Test(expected = IllegalArgumentException.class) @@ -52,7 +52,7 @@ public void messageBuildWithClientShouldFailWithoutAllProps() throws Exception { @Test(expected = IllegalArgumentException.class) public void messageWithPowerpackBuildWithClientShouldFailWithoutAllProps() throws Exception { expectResponse("messageSendResponse.json", 202); - PlivoClient client = new PlivoClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + Client client = new PlivoClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); Message.creator( null, "text", "testUUID") .client(client) @@ -118,7 +118,7 @@ public void messageCreateWithClientShouldSucceed() throws Exception { public void messageWithPowerpackCreateWithClientShouldSucceed() throws Exception { String fixtureName = "messageSendResponse.json"; - PlivoClient client = new PlivoClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + Client client = new PlivoClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); expectResponse(fixtureName, 202); Message.creator(Arrays.asList("+911231231330"), "test", "testUUID") diff --git a/src/test/java/com/plivo/api/MultiPartyCallMemberTest.java b/src/test/java/com/plivo/api/MultiPartyCallMemberTest.java index 30049107..f6c1cb5b 100644 --- a/src/test/java/com/plivo/api/MultiPartyCallMemberTest.java +++ b/src/test/java/com/plivo/api/MultiPartyCallMemberTest.java @@ -11,7 +11,7 @@ public class MultiPartyCallMemberTest extends BaseTest { private Phlo phlo; - PlivoClient client; + Client client; private String phloId = "a9f74ec4-2d3f-41d6-b8f0-f341fcfb59b6"; private String nodeId = "f4789ccf-25f5-4a1f-91a4-55ca022ba903"; @@ -21,7 +21,7 @@ public void setUp() throws Exception { expectResponse("phloGetResponse.json", 200); expectResponse("multiPartyCallGetResponse.json", 200); expectResponse("multiPartyCallActionResponse.json", 200); - client = new PhloRestClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); + client = new PhloClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); phlo = Phlo .getter(phloId) diff --git a/src/test/java/com/plivo/api/MultiPartyCallTest.java b/src/test/java/com/plivo/api/MultiPartyCallTest.java index 1912fc1f..61600de3 100644 --- a/src/test/java/com/plivo/api/MultiPartyCallTest.java +++ b/src/test/java/com/plivo/api/MultiPartyCallTest.java @@ -12,7 +12,7 @@ public class MultiPartyCallTest extends BaseTest { private Phlo phlo; - private PlivoClient client; + private Client client; private String phloId = "a9f74ec4-2d3f-41d6-b8f0-f341fcfb59b6"; private String nodeId = "f4789ccf-25f5-4a1f-91a4-55ca022ba903"; @@ -23,7 +23,7 @@ public void setUp() throws Exception { expectResponse("phloGetResponse.json", 200); expectResponse("multiPartyCallGetResponse.json", 200); expectResponse("multiPartyCallActionResponse.json", 200); - client = new PhloRestClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); + client = new PhloClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); phlo = Phlo .getter(phloId) diff --git a/src/test/java/com/plivo/api/NumberTest.java b/src/test/java/com/plivo/api/NumberTest.java index 3f5db792..ce6fb15e 100644 --- a/src/test/java/com/plivo/api/NumberTest.java +++ b/src/test/java/com/plivo/api/NumberTest.java @@ -13,13 +13,13 @@ public class NumberTest extends BaseTest { - private PlivoClient client; + private Client client; @Before public void setUp() throws Exception { super.setUp(); client = new PlivoClient("MA123456789012345678", - "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); } @Test diff --git a/src/test/java/com/plivo/api/PricingTest.java b/src/test/java/com/plivo/api/PricingTest.java index 34ee51fa..aca63494 100644 --- a/src/test/java/com/plivo/api/PricingTest.java +++ b/src/test/java/com/plivo/api/PricingTest.java @@ -28,7 +28,7 @@ public void pricingGetShouldSucceed() throws Exception { public void pricingGetWithClientShouldSucceed() throws Exception { expectResponse("pricingGetResponse.json", 200); - PlivoClient client = new PlivoClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + Client client = new PlivoClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); Pricing pricing = Pricing.getter("US").client(client) .get(); diff --git a/src/test/java/com/plivo/api/RecordingTest.java b/src/test/java/com/plivo/api/RecordingTest.java index 8b1245c2..2521fe97 100644 --- a/src/test/java/com/plivo/api/RecordingTest.java +++ b/src/test/java/com/plivo/api/RecordingTest.java @@ -14,12 +14,12 @@ public class RecordingTest extends BaseTest { - private PlivoClient client; + private Client client; @Before public void setUp() throws Exception { super.setUp(); - client = new PlivoClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + client = new PlivoClient("MA123456789012345678", "Zmxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx").getClient(); } @Test