remove url from Timezone, replace wildcard import

Author: nkharabaruk

src/main/java/org/zendesk/client/v2/Zendesk.java

@@ -21,7 +21,44 @@
 import org.asynchttpclient.request.body.multipart.StringPart;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.zendesk.client.v2.model.*;
+import org.zendesk.client.v2.model.AgentRole;
+import org.zendesk.client.v2.model.Attachment;
+import org.zendesk.client.v2.model.Audit;
+import org.zendesk.client.v2.model.Automation;
+import org.zendesk.client.v2.model.Brand;
+import org.zendesk.client.v2.model.Comment;
+import org.zendesk.client.v2.model.ComplianceDeletionStatus;
+import org.zendesk.client.v2.model.DeletedTicket;
+import org.zendesk.client.v2.model.Field;
+import org.zendesk.client.v2.model.Forum;
+import org.zendesk.client.v2.model.Group;
+import org.zendesk.client.v2.model.GroupMembership;
+import org.zendesk.client.v2.model.Identity;
+import org.zendesk.client.v2.model.JobStatus;
+import org.zendesk.client.v2.model.Macro;
+import org.zendesk.client.v2.model.Metric;
+import org.zendesk.client.v2.model.Organization;
+import org.zendesk.client.v2.model.OrganizationField;
+import org.zendesk.client.v2.model.OrganizationMembership;
+import org.zendesk.client.v2.model.SatisfactionRating;
+import org.zendesk.client.v2.model.SearchResultEntity;
+import org.zendesk.client.v2.model.SortOrder;
+import org.zendesk.client.v2.model.Status;
+import org.zendesk.client.v2.model.SuspendedTicket;
+import org.zendesk.client.v2.model.Ticket;
+import org.zendesk.client.v2.model.TicketCount;
+import org.zendesk.client.v2.model.TicketForm;
+import org.zendesk.client.v2.model.TicketImport;
+import org.zendesk.client.v2.model.TicketPage;
+import org.zendesk.client.v2.model.TicketResult;
+import org.zendesk.client.v2.model.TimeZone;
+import org.zendesk.client.v2.model.Topic;
+import org.zendesk.client.v2.model.Trigger;
+import org.zendesk.client.v2.model.TwitterMonitor;
+import org.zendesk.client.v2.model.User;
+import org.zendesk.client.v2.model.UserField;
+import org.zendesk.client.v2.model.UserRelatedInfo;
+import org.zendesk.client.v2.model.View;
 import org.zendesk.client.v2.model.dynamic.DynamicContentItem;
 import org.zendesk.client.v2.model.dynamic.DynamicContentItemVariant;
 import org.zendesk.client.v2.model.hc.Article;

src/main/java/org/zendesk/client/v2/model/TimeZone.java

@@ -13,7 +13,6 @@ public class TimeZone {
     private String translatedName;
     private String name;
     private String ianaName;
-    private String url;
     private int offset;
     private String formattedOffset;
 
@@ -43,14 +42,6 @@ public void setIanaName(String ianaName) {
         this.ianaName = ianaName;
     }
 
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
     public int getOffset() {
         return offset;
     }
@@ -75,11 +66,11 @@ public boolean equals(Object o) {
         TimeZone timeZone = (TimeZone) o;
         return offset == timeZone.offset && Objects.equals(translatedName, timeZone.translatedName) &&
                 Objects.equals(name, timeZone.name) && Objects.equals(ianaName, timeZone.ianaName) &&
-                Objects.equals(url, timeZone.url) && Objects.equals(formattedOffset, timeZone.formattedOffset);
+                Objects.equals(formattedOffset, timeZone.formattedOffset);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(translatedName, name, ianaName, url, offset, formattedOffset);
+        return Objects.hash(translatedName, name, ianaName, offset, formattedOffset);
     }
 }

src/test/java/org/zendesk/client/v2/model/TimeZoneTest.java

@@ -32,14 +32,14 @@ public class TimeZoneTest {
 
     @Rule
     public WireMockClassRule zendeskApiMock = zendeskApiClass;
-    private final int ephemeralPort = zendeskApiMock.port();
-    private final String hostname = String.format(MOCK_URL_FORMATTED_STRING, ephemeralPort);
 
     private Zendesk client;
     private final ObjectMapper objectMapper = Zendesk.createMapper();
 
     @Before
     public void setUp() {
+        int ephemeralPort = zendeskApiMock.port();
+        String hostname = String.format(MOCK_URL_FORMATTED_STRING, ephemeralPort);
         client = new Zendesk.Builder(hostname)
                 .setUsername(MOCK_USERNAME)
                 .setToken(MOCK_API_TOKEN)
@@ -61,15 +61,13 @@ public void getTimeZones() throws JsonProcessingException {
         timeZone1.setTranslatedName("Pacific Time (US & Canada)");
         timeZone1.setName("Pacific Time (US & Canada)");
         timeZone1.setIanaName("America/Los_Angeles");
-        timeZone1.setUrl(hostname + "/api/v2/time_zones/Pacific%20Time%20(US%20&%20Canada).json");
         timeZone1.setOffset(-420);
         timeZone1.setFormattedOffset("GMT-07:00");
 
         TimeZone timeZone2 = new TimeZone();
         timeZone1.setTranslatedName("Kyiv");
         timeZone1.setName("Kyiv");
         timeZone1.setIanaName("Europe/Kiev");
-        timeZone1.setUrl(hostname + "/api/v2/time_zones/Kyiv.json");
         timeZone1.setOffset(180);
         timeZone1.setFormattedOffset("GMT+03:00");