Merge pull request #592 from Cizo89/master

Add new properties (zopimUrl and account) to Zendesk4Settings

Author: liry

src/main/java/com/gooddata/connector/Zendesk4Settings.java

@@ -20,19 +20,26 @@ public class Zendesk4Settings implements Settings {
     public static final String URL = "/gdc/projects/{project}/connectors/zendesk4/integration/settings";
 
     private String apiUrl;
+    private String zopimUrl;
+    private String account;
     private final String type;
     private final String syncTime;
     private final String syncTimeZone;
 
     public Zendesk4Settings(final String apiUrl) {
-        this(apiUrl, null, null, null);
+        this(apiUrl, null, null, null, null, null);
     }
 
     @JsonCreator
-    public Zendesk4Settings(@JsonProperty("apiUrl") String apiUrl, @JsonProperty("type") String type,
+    public Zendesk4Settings(@JsonProperty("apiUrl") String apiUrl,
+                            @JsonProperty("zopimUrl") String zopimUrl,
+                            @JsonProperty("account") String account,
+                            @JsonProperty("type") String type,
                             @JsonProperty("syncTime") String syncTime,
                             @JsonProperty("syncTimeZone") String syncTimeZone) {
         this.apiUrl = notEmpty(apiUrl, "apiUrl");
+        this.zopimUrl = zopimUrl;
+        this.account = account;
         this.type = type;
         this.syncTime = syncTime;
         this.syncTimeZone = syncTimeZone;
@@ -46,6 +53,22 @@ public void setApiUrl(final String apiUrl) {
         this.apiUrl = notEmpty(apiUrl, "apiUrl");
     }
 
+    public String getZopimUrl() {
+        return zopimUrl;
+    }
+
+    public void setZopimUrl(final String zopimUrl) {
+        this.zopimUrl = zopimUrl;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(final String account) {
+        this.account = account;
+    }
+
     public String getType() {
         return type;
     }

src/test/java/com/gooddata/connector/Zendesk4SettingsTest.java

@@ -14,23 +14,47 @@
 import static net.javacrumbs.jsonunit.core.util.ResourceUtils.resource;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.text.MatchesPattern.matchesPattern;
 
 public class Zendesk4SettingsTest {
 
     @Test
     public void shouldSerialize() throws Exception {
-        final Zendesk4Settings settings = new Zendesk4Settings("https://foo.com", plus.name(), "12am", "America/Los_Angeles");
+        final Zendesk4Settings settings = new Zendesk4Settings("https://foo.com", "zopim.com", "testAccount",
+                plus.name(), "12am", "America/Los_Angeles");
         assertThat(settings, jsonEquals(resource("connector/settings-zendesk4.json")));
     }
 
+    @Test
+    public void shouldSerialize_beforeTemplate26() throws Exception {
+        final Zendesk4Settings settings = new Zendesk4Settings("https://foo.com", null, null,
+                plus.name(), "12am", "America/Los_Angeles");
+        assertThat(settings, jsonEquals(resource("connector/settings-zendesk4-before-template26.json")));
+    }
+
     @Test
     public void shouldDeserialize() throws Exception {
         final Zendesk4Settings settings = readObjectFromResource("/connector/settings-zendesk4.json", Zendesk4Settings.class);
 
         assertThat(settings, is(notNullValue()));
         assertThat(settings.getApiUrl(), is("https://foo.com"));
+        assertThat(settings.getZopimUrl(), is("zopim.com"));
+        assertThat(settings.getAccount(), is("testAccount"));
+        assertThat(settings.getType(), is(plus.name()));
+        assertThat(settings.getSyncTime(), is("12am"));
+        assertThat(settings.getSyncTimeZone(), is("America/Los_Angeles"));
+    }
+
+    @Test
+    public void shouldDeserialize_beforeTemplate26() throws Exception {
+        final Zendesk4Settings settings = readObjectFromResource("/connector/settings-zendesk4-before-template26.json", Zendesk4Settings.class);
+
+        assertThat(settings, is(notNullValue()));
+        assertThat(settings.getApiUrl(), is("https://foo.com"));
+        assertThat(settings.getZopimUrl(), is(nullValue()));
+        assertThat(settings.getAccount(), is(nullValue()));
         assertThat(settings.getType(), is(plus.name()));
         assertThat(settings.getSyncTime(), is("12am"));
         assertThat(settings.getSyncTimeZone(), is("America/Los_Angeles"));
@@ -60,6 +84,20 @@ public void testSetApiUrl() throws Exception {
         assertThat(settings.getApiUrl(), is("new url"));
     }
 
+    @Test
+    public void testSetZopimUrl() throws Exception {
+        final Zendesk4Settings settings = new Zendesk4Settings("api url");
+        settings.setZopimUrl("zopim url");
+        assertThat(settings.getZopimUrl(), is("zopim url"));
+    }
+
+    @Test
+    public void testSetAccount() throws Exception {
+        final Zendesk4Settings settings = new Zendesk4Settings("api url");
+        settings.setAccount("test account");
+        assertThat(settings.getAccount(), is("test account"));
+    }
+
     @Test
     public void testToStringFormat() {
         final Zendesk4Settings settings = new Zendesk4Settings("old url");

src/test/resources/connector/settings-zendesk4-before-template26.json

@@ -0,0 +1,8 @@
+{
+  "settings" : {
+    "apiUrl" : "https://foo.com",
+    "type" : "plus",
+    "syncTime" : "12am",
+    "syncTimeZone" : "America/Los_Angeles"
+  }
+}

src/test/resources/connector/settings-zendesk4.json

@@ -1,6 +1,8 @@
 {
   "settings" : {
     "apiUrl" : "https://foo.com",
+    "zopimUrl" : "zopim.com",
+    "account" : "testAccount",
     "type" : "plus",
     "syncTime" : "12am",
     "syncTimeZone" : "America/Los_Angeles"