Merge pull request #917 from mrocao/fix/url-timezone-compatibility

Fix timezone compatibility for date parameters

Author: curquiza

src/main/java/com/meilisearch/sdk/http/URLBuilder.java

@@ -3,6 +3,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.TimeZone;
 import lombok.Getter;
 
 @Getter
@@ -68,11 +69,10 @@ public URLBuilder addParameter(String parameter, int[] value) {
     public URLBuilder addParameter(String parameter, Date value) {
         if (value != null) {
             // Changed to utilise RFC 3339 format
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
             addSeparator();
             params.append(parameter);
             params.append("=");
-            params.append(formatter.format(value));
+            params.append(formatDateParameter(value));
         }
         return this;
     }
@@ -117,6 +117,12 @@ private String formatArrayParameters(int[] fields) {
         return String.join(",", arr);
     }
 
+    private String formatDateParameter(Date value) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        formatter.setTimeZone(TimeZone.getTimeZone("UTC"));
+        return formatter.format(value);
+    }
+
     public String getURL() {
         return routes.toString() + params.toString();
     }

src/test/java/com/meilisearch/sdk/http/URLBuilderTest.java

@@ -3,23 +3,17 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.TimeZone;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class URLBuilderTest {
 
     private final URLBuilder classToTest = new URLBuilder();
 
-    @BeforeEach
-    void beforeEach() {
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-    }
-
     @Test
     void addSubroute() {
         classToTest.addSubroute("route");
@@ -114,6 +108,16 @@ void addParameterStringDate() throws Exception {
                 "?parameter1=2042-01-30T15:30:00Z&parameter2=2042-01-30T15:30:00Z");
     }
 
+    @Test
+    void addParameterStringDateWithPositiveTimezoneOffset() throws Exception {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        Date date = format.parse("2042-01-30T17:30:00+02:00");
+
+        classToTest.addParameter("parameter1", date);
+
+        assertEquals("?parameter1=2042-01-30T15:30:00Z", classToTest.getParams().toString());
+    }
+
     @Test
     void getURL() {
         assertThat(classToTest.getURL(), is(equalTo("")));