fix issue with unicode requests when doing requests that contain data

ActiveCampaign · Mar 6, 2023 · ee62fc0 · ee62fc0
1 parent b71f8da
commit ee62fc0
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 35 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     </developers>
 
     <properties>
-        <postmark.version>1.10.1</postmark.version>
+        <postmark.version>1.10.2</postmark.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <jackson.minimum.version>2.9.7</jackson.minimum.version>

diff --git a/src/main/java/com/postmarkapp/postmark/client/HttpClient.java b/src/main/java/com/postmarkapp/postmark/client/HttpClient.java
@@ -10,8 +10,7 @@
 import org.apache.hc.core5.util.Timeout;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.Map;
 
 /**
@@ -76,29 +75,7 @@ public ClientResponse execute(REQUEST_TYPES request_type, String url) throws IOE
      * @return response from HTTP request
      */
     public ClientResponse execute(REQUEST_TYPES requestType, String url, String data) throws IOException {
-        ClassicHttpRequest request;
-
-        switch (requestType) {
-            case POST:
-                request = ClassicRequestBuilder.post(getHttpUrl(url)).setEntity(data, ContentType.APPLICATION_JSON).build();
-                break;
-
-            case PUT:
-                request = ClassicRequestBuilder.put(getHttpUrl(url)).setEntity(data, ContentType.APPLICATION_JSON).build();
-                break;
-
-            case PATCH:
-                request = ClassicRequestBuilder.patch(getHttpUrl(url)).setEntity(data, ContentType.APPLICATION_JSON).build();
-                break;
-
-            case DELETE:
-                request = ClassicRequestBuilder.delete(getHttpUrl(url)).build();
-                break;
-
-            default:
-                request = ClassicRequestBuilder.get(getHttpUrl(url)).build();
-                break;
-        }
+        ClassicHttpRequest request = createRequest(requestType, url, data);
 
         for (Map.Entry<String, Object> header : headers.entrySet()) {
             request.setHeader(header.getKey(), header.getValue().toString());
@@ -109,6 +86,29 @@ public ClientResponse execute(REQUEST_TYPES requestType, String url, String data
                 response -> new ClientResponse(response.getCode(), EntityUtils.toString(response.getEntity())));
     }
 
+    /**
+     *
+     * Create HTTP request based on request type and other data
+     *
+     * @param requestType type of HTTP request to initiate
+     * @param url request url
+     * @param data data sent for POST/PUT requests
+     * @return built HTTP request to execute
+     */
+    private ClassicHttpRequest createRequest(REQUEST_TYPES requestType, String url, String data) {
+        ClassicRequestBuilder requestBuilder = ClassicRequestBuilder
+                .create(requestType.name())
+                .setUri(getHttpUrl(url));
+
+        if (data != null) {
+            return requestBuilder
+                    .setEntity(data, ContentType.APPLICATION_JSON)
+                    .build();
+        } else {
+            return requestBuilder.build();
+        }
+    }
+
     // Setters and Getters
 
     public void setConnectTimeoutSeconds(int connectTimeoutSeconds) {

diff --git a/src/test/java/integration/TemplateTest.java b/src/test/java/integration/TemplateTest.java
@@ -54,7 +54,6 @@ void validateTextBody() throws PostmarkException, IOException {
 
     @Test
     void createTemplate() throws PostmarkException, IOException {
-
         String templateName = "name";
 
         TemplateContent templateContent = new TemplateContent();
@@ -72,26 +71,30 @@ void createTemplate() throws PostmarkException, IOException {
     }
 
     @Test
-    void createTemplate_should_work_with_utf_8() throws PostmarkException, IOException {
+    void createTemplateWithUTFContent() throws PostmarkException, IOException {
 
-        String utf8String = "test html with unicode symbols: € Ä Æ ©";
-        String templateName = "name";
+        String htmlBodyText = "test html with unicode symbols: € Ä Æ ©";
+        String textBodyText = "test text with unicode symbols: € Ä Æ ©";
+        String templateName = "name € Ä Æ ©";
+        String subject = "subject € Ä Æ ©";
 
         TemplateContent templateContent = new TemplateContent();
-        templateContent.setHtmlBody(utf8String);
-        templateContent.setTextBody("test text");
+        templateContent.setHtmlBody(htmlBodyText);
+        templateContent.setTextBody(textBodyText);
         templateContent.setName(templateName);
-        templateContent.setSubject("subject");
+        templateContent.setSubject(subject);
 
         BaseTemplate response = client.createTemplate(templateContent);
         assertEquals(response.getName(),templateName);
 
         Template template = client.getTemplate(response.getTemplateId());
-        assertEquals(utf8String, template.getHtmlBody());
+        assertEquals(htmlBodyText, template.getHtmlBody());
+        assertEquals(textBodyText, template.getTextBody());
+        assertEquals(subject, template.getSubject());
+        assertEquals(templateName, template.getName());
 
         Integer id = response.getTemplateId();
         client.deleteTemplate(id);
-
     }
 
     @Test