From 949075fd717e3d566d7531dc3b91b0a3fe9a30d4 Mon Sep 17 00:00:00 2001 From: sbansla Date: Mon, 26 Jun 2023 21:56:14 +0530 Subject: [PATCH 1/3] added preview messaging domain url --- src/main/java/com/twilio/Domains.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/twilio/Domains.java b/src/main/java/com/twilio/Domains.java index 035f623ce3..efd2b69a2d 100644 --- a/src/main/java/com/twilio/Domains.java +++ b/src/main/java/com/twilio/Domains.java @@ -8,7 +8,7 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -package com.twilio.rest; +package com.twilio; public enum Domains { ACCOUNTS("accounts"), @@ -33,6 +33,7 @@ public enum Domains { NUMBERS("numbers"), OAUTH("oauth"), PREVIEW("preview"), + PREVIEWMESSAGING("preview.messaging"), PRICING("pricing"), PROXY("proxy"), ROUTES("routes"), From 352ecfa02f1ff3a29e0f393436ccd3394350c618 Mon Sep 17 00:00:00 2001 From: sbansla Date: Mon, 26 Jun 2023 21:57:51 +0530 Subject: [PATCH 2/3] reverted Domains file package --- src/main/java/com/twilio/Domains.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/twilio/Domains.java b/src/main/java/com/twilio/Domains.java index efd2b69a2d..d87d0a5c83 100644 --- a/src/main/java/com/twilio/Domains.java +++ b/src/main/java/com/twilio/Domains.java @@ -8,7 +8,7 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -package com.twilio; +package com.twilio.rest; public enum Domains { ACCOUNTS("accounts"), From d6f597051a8b21a080ac4cc13b415feea8ef5edd Mon Sep 17 00:00:00 2001 From: sbansla Date: Mon, 26 Jun 2023 22:42:02 +0530 Subject: [PATCH 3/3] changed name for Enum class to EnumConstants as it was conflicting with Enum datatype --- .../twilio/constant/{Enum.java => EnumConstants.java} | 2 +- src/main/java/com/twilio/http/NetworkHttpClient.java | 10 +++++----- src/main/java/com/twilio/http/Request.java | 8 ++++---- src/main/java/com/twilio/http/ValidationClient.java | 10 +++++----- .../java/com/twilio/http/NetworkHttpClientTest.java | 6 +++--- src/test/java/com/twilio/http/RequestTest.java | 6 +++--- .../java/com/twilio/http/ValidationClientTest.java | 6 +++--- 7 files changed, 24 insertions(+), 24 deletions(-) rename src/main/java/com/twilio/constant/{Enum.java => EnumConstants.java} (91%) diff --git a/src/main/java/com/twilio/constant/Enum.java b/src/main/java/com/twilio/constant/EnumConstants.java similarity index 91% rename from src/main/java/com/twilio/constant/Enum.java rename to src/main/java/com/twilio/constant/EnumConstants.java index a218bedb3e..7d2f70b590 100644 --- a/src/main/java/com/twilio/constant/Enum.java +++ b/src/main/java/com/twilio/constant/EnumConstants.java @@ -3,7 +3,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -public class Enum { +public class EnumConstants { @Getter @RequiredArgsConstructor diff --git a/src/main/java/com/twilio/http/NetworkHttpClient.java b/src/main/java/com/twilio/http/NetworkHttpClient.java index de5e8b2b7f..8a2fac3da0 100644 --- a/src/main/java/com/twilio/http/NetworkHttpClient.java +++ b/src/main/java/com/twilio/http/NetworkHttpClient.java @@ -1,7 +1,7 @@ package com.twilio.http; import com.twilio.Twilio; -import com.twilio.constant.Enum; +import com.twilio.constant.EnumConstants; import com.twilio.exception.ApiException; import java.io.IOException; @@ -127,15 +127,15 @@ public Response makeRequest(final Request request) { if (method == HttpMethod.POST) { // TODO: It will be removed after one RC Release. - if (request.getContentType() == null) request.setContentType(Enum.ContentType.FORM_URLENCODED); - if (Enum.ContentType.JSON.getValue().equals(request.getContentType().getValue())) { + if (request.getContentType() == null) request.setContentType(EnumConstants.ContentType.FORM_URLENCODED); + if (EnumConstants.ContentType.JSON.getValue().equals(request.getContentType().getValue())) { HttpEntity entity = new StringEntity(request.getBody(), ContentType.APPLICATION_JSON); builder.setEntity(entity); builder.addHeader( - HttpHeaders.CONTENT_TYPE, Enum.ContentType.JSON.getValue()); + HttpHeaders.CONTENT_TYPE, EnumConstants.ContentType.JSON.getValue()); } else { builder.addHeader( - HttpHeaders.CONTENT_TYPE, Enum.ContentType.FORM_URLENCODED.getValue()); + HttpHeaders.CONTENT_TYPE, EnumConstants.ContentType.FORM_URLENCODED.getValue()); for (Map.Entry> entry : request.getPostParams().entrySet()) { for (String value : entry.getValue()) { builder.addParameter(entry.getKey(), value); diff --git a/src/main/java/com/twilio/http/Request.java b/src/main/java/com/twilio/http/Request.java index 9bf96a4248..12ecbaa15f 100644 --- a/src/main/java/com/twilio/http/Request.java +++ b/src/main/java/com/twilio/http/Request.java @@ -1,6 +1,6 @@ package com.twilio.http; -import com.twilio.constant.Enum; +import com.twilio.constant.EnumConstants; import com.twilio.exception.ApiException; import com.twilio.exception.InvalidRequestException; @@ -37,7 +37,7 @@ public class Request { private List userAgentExtensions; - private Enum.ContentType contentType; + private EnumConstants.ContentType contentType; private String body; @@ -117,11 +117,11 @@ public List getUserAgentExtensions() { return this.userAgentExtensions; } - public Enum.ContentType getContentType() { + public EnumConstants.ContentType getContentType() { return contentType; } - public void setContentType(Enum.ContentType contentType) { + public void setContentType(EnumConstants.ContentType contentType) { this.contentType = contentType; } diff --git a/src/main/java/com/twilio/http/ValidationClient.java b/src/main/java/com/twilio/http/ValidationClient.java index 672633b1ea..a1f760a970 100644 --- a/src/main/java/com/twilio/http/ValidationClient.java +++ b/src/main/java/com/twilio/http/ValidationClient.java @@ -1,7 +1,7 @@ package com.twilio.http; import com.twilio.Twilio; -import com.twilio.constant.Enum; +import com.twilio.constant.EnumConstants; import com.twilio.exception.ApiException; import org.apache.http.HttpEntity; import org.apache.http.HttpHeaders; @@ -109,15 +109,15 @@ public Response makeRequest(Request request) { HttpMethod method = request.getMethod(); if (method == HttpMethod.POST) { // TODO: It will be removed after one RC Release. - if (request.getContentType() == null) request.setContentType(Enum.ContentType.FORM_URLENCODED); - if (Enum.ContentType.JSON.getValue().equals(request.getContentType().getValue())) { + if (request.getContentType() == null) request.setContentType(EnumConstants.ContentType.FORM_URLENCODED); + if (EnumConstants.ContentType.JSON.getValue().equals(request.getContentType().getValue())) { HttpEntity entity = new StringEntity(request.getBody(), ContentType.APPLICATION_JSON); builder.setEntity(entity); builder.addHeader( - HttpHeaders.CONTENT_TYPE, Enum.ContentType.JSON.getValue()); + HttpHeaders.CONTENT_TYPE, EnumConstants.ContentType.JSON.getValue()); } else { builder.addHeader( - HttpHeaders.CONTENT_TYPE, Enum.ContentType.FORM_URLENCODED.getValue()); + HttpHeaders.CONTENT_TYPE, EnumConstants.ContentType.FORM_URLENCODED.getValue()); for (Map.Entry> entry : request.getPostParams().entrySet()) { for (String value : entry.getValue()) { builder.addParameter(entry.getKey(), value); diff --git a/src/test/java/com/twilio/http/NetworkHttpClientTest.java b/src/test/java/com/twilio/http/NetworkHttpClientTest.java index df49d52b19..ee5c9050f4 100644 --- a/src/test/java/com/twilio/http/NetworkHttpClientTest.java +++ b/src/test/java/com/twilio/http/NetworkHttpClientTest.java @@ -1,6 +1,6 @@ package com.twilio.http; -import com.twilio.constant.Enum; +import com.twilio.constant.EnumConstants; import com.twilio.exception.ApiConnectionException; import org.apache.http.HttpEntity; import org.apache.http.StatusLine; @@ -67,7 +67,7 @@ private void setup( when(mockRequest.constructURL()).thenReturn(new URL("http://foo.com/hello")); when(mockRequest.requiresAuthentication()).thenReturn(requiresAuthentication); when(mockRequest.getAuthString()).thenReturn("foo:bar"); - when(mockRequest.getContentType()).thenReturn(Enum.ContentType.FORM_URLENCODED); + when(mockRequest.getContentType()).thenReturn(EnumConstants.ContentType.FORM_URLENCODED); when(mockClient.execute(any())).thenReturn(mockResponse); when(mockEntity.isRepeatable()).thenReturn(true); when(mockEntity.getContentLength()).thenReturn(1L); @@ -115,7 +115,7 @@ public void testPost() throws IOException { @Test public void testJsonPost() throws IOException { setup(201, "frobozz", HttpMethod.POST, false); - when(mockRequest.getContentType()).thenReturn(Enum.ContentType.JSON); + when(mockRequest.getContentType()).thenReturn(EnumConstants.ContentType.JSON); String body = "{\"from\":\"+12345\",\"body\":\"message body\",\"messages\":[{\"to\":\"+12345\"}]}"; when(mockRequest.getBody()).thenReturn(body); Response resp = client.makeRequest(mockRequest); diff --git a/src/test/java/com/twilio/http/RequestTest.java b/src/test/java/com/twilio/http/RequestTest.java index 63733da3b6..cb9aa8b9c8 100644 --- a/src/test/java/com/twilio/http/RequestTest.java +++ b/src/test/java/com/twilio/http/RequestTest.java @@ -1,6 +1,6 @@ package com.twilio.http; -import com.twilio.constant.Enum; +import com.twilio.constant.EnumConstants; import com.twilio.exception.ApiException; import com.twilio.rest.Domains; import java.time.ZonedDateTime; @@ -321,7 +321,7 @@ public void testEquals() { @Test public void testContentType() { Request r = new Request(HttpMethod.POST, "http://example.com/foobar"); - r.setContentType(Enum.ContentType.JSON); - assertEquals(Enum.ContentType.JSON, r.getContentType()); + r.setContentType(EnumConstants.ContentType.JSON); + assertEquals(EnumConstants.ContentType.JSON, r.getContentType()); } } diff --git a/src/test/java/com/twilio/http/ValidationClientTest.java b/src/test/java/com/twilio/http/ValidationClientTest.java index fca049b200..3d5659de95 100644 --- a/src/test/java/com/twilio/http/ValidationClientTest.java +++ b/src/test/java/com/twilio/http/ValidationClientTest.java @@ -1,6 +1,6 @@ package com.twilio.http; -import com.twilio.constant.Enum; +import com.twilio.constant.EnumConstants; import org.junit.Test; import java.security.KeyPair; @@ -59,14 +59,14 @@ private void testContentType(final HttpMethod httpMethod) throws Exception { final HttpUrl url = server.url(path); final ValidationClient client = new ValidationClient("dummy-sid1", "dummy-sid2", "dummy-signing-key", keyPair.getPrivate()); final Request request = new Request(httpMethod, url.url().toString()); - request.setContentType(Enum.ContentType.JSON); + request.setContentType(EnumConstants.ContentType.JSON); String body = "{\"from\":\"+12345\",\"body\":\"message body\",\"messages\":[{\"to\":\"+12345\"}]}"; request.setBody(body); final Response response = client.makeRequest(request); assertEquals(200, response.getStatusCode()); final RecordedRequest recordedRequest = server.takeRequest(); assertEquals(httpMethod.name(), recordedRequest.getMethod()); - assertEquals(Enum.ContentType.JSON.getValue(), recordedRequest.getHeader("Content-Type")); + assertEquals(EnumConstants.ContentType.JSON.getValue(), recordedRequest.getHeader("Content-Type")); final String validationHeaderValue = recordedRequest.getHeader("Twilio-Client-Validation"); assertNotNull(validationHeaderValue); assertTrue(validationHeaderValue.length() > 0);