Improve client

build.gradle

@@ -15,7 +15,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
     compile 'io.github.openfeign:feign-core:11.1'
     compile 'io.github.openfeign:feign-httpclient:11.1'
-    compile 'io.github.openfeign:feign-gson:11.1'
+    compile 'io.github.openfeign:feign-jackson-jaxb:11.1'
 
     compileOnly 'org.projectlombok:lombok:1.18.20'
     annotationProcessor 'org.projectlombok:lombok:1.18.20'

src/main/java/com/armstrongconsulting/acprotasks/AcproRepository.java

@@ -56,8 +56,8 @@ public class AcproRepository extends BaseRepository
         {
             apiKey = AcproConnector.getClient(getUrl()).getApiKey(getUsername(), getPassword(), 28800);
         }
-        return AcproConnector.getClient(getUrl()).getItems(query, offset, limit, apiKey).stream().peek(a -> logger.warn(a.toString())).map(AcproTask::new)
-            .toArray(AcproTask[]::new);
+        return new Task[0];/*AcproConnector.getClient(getUrl()).getItems(query, offset, limit, apiKey).stream().peek(a -> logger.warn(a.toString())).map(AcproTask::new)
+            .toArray(AcproTask[]::new);*/
     }
 
     @Override

src/main/java/com/armstrongconsulting/acprotasks/AcproTask.java

@@ -7,7 +7,7 @@ import javax.swing.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import com.armstrongconsulting.acprotasks.client.model.AcproItem;
+import com.armstrongconsulting.acprotasks.client.model.Item;
 import com.intellij.tasks.Comment;
 import com.intellij.tasks.Task;
 import com.intellij.tasks.TaskType;
@@ -20,7 +20,7 @@ public class AcproTask extends Task
     private String summary;
     private String description;
 
-    public AcproTask(AcproItem item)
+    public AcproTask(Item item)
     {
         this.id = String.valueOf(item.getId());
         this.summary = item.getTitle();

src/main/java/com/armstrongconsulting/acprotasks/client/AcproClient.java

@@ -1,13 +1,12 @@
 package com.armstrongconsulting.acprotasks.client;
 
-import java.util.List;
-
-import com.armstrongconsulting.acprotasks.client.model.AcproItem;
+import com.armstrongconsulting.acprotasks.client.model.Items;
 
 import feign.Headers;
 import feign.Param;
 import feign.RequestLine;
 
+@Headers("Accept: application/json")
 public interface AcproClient
 {
     @RequestLine("GET /api_key?user={user}&password={password}&expires_after_seconds={expires_after_seconds}")
@@ -15,7 +14,6 @@ public interface AcproClient
         @Param("expires_after_seconds") Integer timeToLive);
 
     @RequestLine("GET /items?q=title:{title}&start={offset}&count={limit}&api_key={apiKey}")
-    @Headers("Accept: application/json")
-    List<AcproItem> getItems(@Param("title") String titleContains, @Param("offset") Integer offset,
+    Items getItems(@Param("title") String titleContains, @Param("offset") Integer offset,
         @Param("limit") Integer limit, @Param("apiKey") String apiKey);
 }

src/main/java/com/armstrongconsulting/acprotasks/client/AcproConnector.java

@@ -4,9 +4,9 @@ import com.sun.istack.NotNull;
 
 import feign.Feign;
 import feign.Logger;
-import feign.gson.GsonDecoder;
-import feign.gson.GsonEncoder;
 import feign.httpclient.ApacheHttpClient;
+import feign.jackson.jaxb.JacksonJaxbJsonDecoder;
+import feign.jackson.jaxb.JacksonJaxbJsonEncoder;
 
 public class AcproConnector
 {
@@ -21,8 +21,8 @@ public class AcproConnector
 
         return Feign.builder()
             .client(new ApacheHttpClient())
-            .encoder(new GsonEncoder())
-            .decoder(new GsonDecoder())
+            .encoder(new JacksonJaxbJsonEncoder())
+            .decoder(new JacksonJaxbJsonDecoder())
             .logger(new Logger.JavaLogger(AcproClient.class))
             .logLevel(Logger.Level.FULL)
             .target(AcproClient.class, url);

src/main/java/com/armstrongconsulting/acprotasks/client/model/AcproItem.java

@@ -1,13 +0,0 @@
-package com.armstrongconsulting.acprotasks.client.model;
-
-import lombok.Data;
-import lombok.ToString;
-
-@Data
-@ToString
-public class AcproItem
-{
-    private Long id;
-    private String title;
-    private String description;
-}

src/main/java/com/armstrongconsulting/acprotasks/client/model/Item.java

@@ -0,0 +1,297 @@
+package com.armstrongconsulting.acprotasks.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "actualHours",
+    "attachments",
+    "created",
+    "createdBy",
+    "createdBy_firstname",
+    "createdBy_lastname",
+    "description",
+    "estimateHours",
+    "id",
+    "lastChanged",
+    "lastChangedBy",
+    "lastChangedBy_firstname",
+    "lastChangedBy_lastname",
+    "project",
+    "project_name",
+    "status",
+    "title",
+    "unreadByAssignee",
+    "urgency"
+})
+public class Item
+{
+    @JsonProperty("actualHours")
+    private Integer actualHours;
+    @JsonProperty("attachments")
+    private Integer attachments;
+    @JsonProperty("created")
+    private String created;
+    @JsonProperty("createdBy")
+    private Integer createdBy;
+    @JsonProperty("createdBy_firstname")
+    private String createdByFirstname;
+    @JsonProperty("createdBy_lastname")
+    private String createdByLastname;
+    @JsonProperty("description")
+    private String description;
+    @JsonProperty("estimateHours")
+    private Integer estimateHours;
+    @JsonProperty("id")
+    private Integer id;
+    @JsonProperty("lastChanged")
+    private String lastChanged;
+    @JsonProperty("lastChangedBy")
+    private Integer lastChangedBy;
+    @JsonProperty("lastChangedBy_firstname")
+    private String lastChangedByFirstname;
+    @JsonProperty("lastChangedBy_lastname")
+    private String lastChangedByLastname;
+    @JsonProperty("project")
+    private Integer project;
+    @JsonProperty("project_name")
+    private String projectName;
+    @JsonProperty("status")
+    private String status;
+    @JsonProperty("title")
+    private String title;
+    @JsonProperty("unreadByAssignee")
+    private Boolean unreadByAssignee;
+    @JsonProperty("urgency")
+    private Integer urgency;
+
+    @JsonProperty("actualHours")
+    public Integer getActualHours()
+    {
+        return actualHours;
+    }
+
+    @JsonProperty("actualHours")
+    public void setActualHours(Integer actualHours)
+    {
+        this.actualHours = actualHours;
+    }
+
+    @JsonProperty("attachments")
+    public Integer getAttachments()
+    {
+        return attachments;
+    }
+
+    @JsonProperty("attachments")
+    public void setAttachments(Integer attachments)
+    {
+        this.attachments = attachments;
+    }
+
+    @JsonProperty("created")
+    public String getCreated()
+    {
+        return created;
+    }
+
+    @JsonProperty("created")
+    public void setCreated(String created)
+    {
+        this.created = created;
+    }
+
+    @JsonProperty("createdBy")
+    public Integer getCreatedBy()
+    {
+        return createdBy;
+    }
+
+    @JsonProperty("createdBy")
+    public void setCreatedBy(Integer createdBy)
+    {
+        this.createdBy = createdBy;
+    }
+
+    @JsonProperty("createdBy_firstname")
+    public String getCreatedByFirstname()
+    {
+        return createdByFirstname;
+    }
+
+    @JsonProperty("createdBy_firstname")
+    public void setCreatedByFirstname(String createdByFirstname)
+    {
+        this.createdByFirstname = createdByFirstname;
+    }
+
+    @JsonProperty("createdBy_lastname")
+    public String getCreatedByLastname()
+    {
+        return createdByLastname;
+    }
+
+    @JsonProperty("createdBy_lastname")
+    public void setCreatedByLastname(String createdByLastname)
+    {
+        this.createdByLastname = createdByLastname;
+    }
+
+    @JsonProperty("description")
+    public String getDescription()
+    {
+        return description;
+    }
+
+    @JsonProperty("description")
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    @JsonProperty("estimateHours")
+    public Integer getEstimateHours()
+    {
+        return estimateHours;
+    }
+
+    @JsonProperty("estimateHours")
+    public void setEstimateHours(Integer estimateHours)
+    {
+        this.estimateHours = estimateHours;
+    }
+
+    @JsonProperty("id")
+    public Integer getId()
+    {
+        return id;
+    }
+
+    @JsonProperty("id")
+    public void setId(Integer id)
+    {
+        this.id = id;
+    }
+
+    @JsonProperty("lastChanged")
+    public String getLastChanged()
+    {
+        return lastChanged;
+    }
+
+    @JsonProperty("lastChanged")
+    public void setLastChanged(String lastChanged)
+    {
+        this.lastChanged = lastChanged;
+    }
+
+    @JsonProperty("lastChangedBy")
+    public Integer getLastChangedBy()
+    {
+        return lastChangedBy;
+    }
+
+    @JsonProperty("lastChangedBy")
+    public void setLastChangedBy(Integer lastChangedBy)
+    {
+        this.lastChangedBy = lastChangedBy;
+    }
+
+    @JsonProperty("lastChangedBy_firstname")
+    public String getLastChangedByFirstname()
+    {
+        return lastChangedByFirstname;
+    }
+
+    @JsonProperty("lastChangedBy_firstname")
+    public void setLastChangedByFirstname(String lastChangedByFirstname)
+    {
+        this.lastChangedByFirstname = lastChangedByFirstname;
+    }
+
+    @JsonProperty("lastChangedBy_lastname")
+    public String getLastChangedByLastname()
+    {
+        return lastChangedByLastname;
+    }
+
+    @JsonProperty("lastChangedBy_lastname")
+    public void setLastChangedByLastname(String lastChangedByLastname)
+    {
+        this.lastChangedByLastname = lastChangedByLastname;
+    }
+
+    @JsonProperty("project")
+    public Integer getProject()
+    {
+        return project;
+    }
+
+    @JsonProperty("project")
+    public void setProject(Integer project)
+    {
+        this.project = project;
+    }
+
+    @JsonProperty("project_name")
+    public String getProjectName()
+    {
+        return projectName;
+    }
+
+    @JsonProperty("project_name")
+    public void setProjectName(String projectName)
+    {
+        this.projectName = projectName;
+    }
+
+    @JsonProperty("status")
+    public String getStatus()
+    {
+        return status;
+    }
+
+    @JsonProperty("status")
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    @JsonProperty("title")
+    public String getTitle()
+    {
+        return title;
+    }
+
+    @JsonProperty("title")
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    @JsonProperty("unreadByAssignee")
+    public Boolean getUnreadByAssignee()
+    {
+        return unreadByAssignee;
+    }
+
+    @JsonProperty("unreadByAssignee")
+    public void setUnreadByAssignee(Boolean unreadByAssignee)
+    {
+        this.unreadByAssignee = unreadByAssignee;
+    }
+
+    @JsonProperty("urgency")
+    public Integer getUrgency()
+    {
+        return urgency;
+    }
+
+    @JsonProperty("urgency")
+    public void setUrgency(Integer urgency)
+    {
+        this.urgency = urgency;
+    }
+}

src/main/java/com/armstrongconsulting/acprotasks/client/model/Items.java

@@ -0,0 +1,89 @@
+package com.armstrongconsulting.acprotasks.client.model;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "@rows",
+    "@sort",
+    "@start",
+    "@totalNumRows",
+    "item"
+})
+public class Items
+{
+    @JsonProperty("@rows")
+    private String rows;
+    @JsonProperty("@sort")
+    private String sort;
+    @JsonProperty("@start")
+    private String start;
+    @JsonProperty("@totalNumRows")
+    private String totalNumRows;
+    @JsonProperty("item")
+    private List<Item> item = null;
+
+    @JsonProperty("@rows")
+    public String getRows()
+    {
+        return rows;
+    }
+
+    @JsonProperty("@rows")
+    public void setRows(String rows)
+    {
+        this.rows = rows;
+    }
+
+    @JsonProperty("@sort")
+    public String getSort()
+    {
+        return sort;
+    }
+
+    @JsonProperty("@sort")
+    public void setSort(String sort)
+    {
+        this.sort = sort;
+    }
+
+    @JsonProperty("@start")
+    public String getStart()
+    {
+        return start;
+    }
+
+    @JsonProperty("@start")
+    public void setStart(String start)
+    {
+        this.start = start;
+    }
+
+    @JsonProperty("@totalNumRows")
+    public String getTotalNumRows()
+    {
+        return totalNumRows;
+    }
+
+    @JsonProperty("@totalNumRows")
+    public void setTotalNumRows(String totalNumRows)
+    {
+        this.totalNumRows = totalNumRows;
+    }
+
+    @JsonProperty("item")
+    public List<Item> getItem()
+    {
+        return item;
+    }
+
+    @JsonProperty("item")
+    public void setItem(List<Item> item)
+    {
+        this.item = item;
+    }
+}