Kaynağa Gözat

Add comments to task

ext.rascm 4 yıl önce
ebeveyn
işleme
acd62bab30

+ 39 - 0
src/main/java/com/armstrongconsulting/acprotasks/AcproComment.java

@@ -0,0 +1,39 @@
1
+package com.armstrongconsulting.acprotasks;
2
+
3
+import java.util.Date;
4
+
5
+import org.jetbrains.annotations.Nullable;
6
+
7
+import com.intellij.tasks.Comment;
8
+
9
+public class AcproComment extends Comment
10
+{
11
+    private String text;
12
+    private String author;
13
+    private Date date;
14
+
15
+    public AcproComment(String text, String author, Date date)
16
+    {
17
+        this.text = text;
18
+        this.author = author;
19
+        this.date = date;
20
+    }
21
+
22
+    @Override
23
+    public String getText()
24
+    {
25
+        return text;
26
+    }
27
+
28
+    @Override
29
+    public @Nullable String getAuthor()
30
+    {
31
+        return author;
32
+    }
33
+
34
+    @Override
35
+    public @Nullable Date getDate()
36
+    {
37
+        return date;
38
+    }
39
+}

+ 17 - 9
src/main/java/com/armstrongconsulting/acprotasks/AcproRepository.java

@@ -4,7 +4,9 @@ import org.apache.commons.lang.StringUtils;
4 4
 import org.jetbrains.annotations.NotNull;
5 5
 import org.jetbrains.annotations.Nullable;
6 6
 
7
+import com.armstrongconsulting.acprotasks.client.AcproClient;
7 8
 import com.armstrongconsulting.acprotasks.client.AcproConnector;
9
+import com.armstrongconsulting.acprotasks.client.model.Comments;
8 10
 import com.armstrongconsulting.acprotasks.client.model.ItemsContainer;
9 11
 import com.intellij.ide.util.PropertiesComponent;
10 12
 import com.intellij.openapi.progress.ProgressIndicator;
@@ -43,12 +45,6 @@ public class AcproRepository extends BaseRepository
43 45
     }
44 46
 
45 47
     @Override
46
-    public @NotNull BaseRepository clone()
47
-    {
48
-        return new AcproRepository(this);
49
-    }
50
-
51
-    @Override
52 48
     public Task[] getIssues(@Nullable String query, int offset, int limit, boolean withClosed,
53 49
         @NotNull ProgressIndicator cancelled) throws Exception
54 50
     {
@@ -57,11 +53,17 @@ public class AcproRepository extends BaseRepository
57 53
             return new Task[0];
58 54
         }
59 55
 
60
-        ItemsContainer response = AcproConnector.getClient(this).getItems(query, offset, limit);
56
+        final AcproClient client = AcproConnector.getClient(this);
57
+        ItemsContainer response = client.getItems(query, offset, limit);
61 58
         Task[] result = new Task[0];
62
-        if (response.getItems() != null && response.getItems().getItem() != null)
59
+        if (response.getItems() != null && response.getItems().getItemData() != null)
63 60
         {
64
-            result = response.getItems().getItem().stream().map(AcproTask::new).toArray(Task[]::new);
61
+            result = response.getItems().getItemData().stream()
62
+                .map(i -> {
63
+                    Comments comments = client.getComments(String.valueOf(i.getId()));
64
+                    return new AcproTask(i,
65
+                        comments != null && comments.getComment() != null ? comments.getComment() : null);
66
+                }).toArray(Task[]::new);
65 67
         }
66 68
         return result;
67 69
     }
@@ -110,4 +112,10 @@ public class AcproRepository extends BaseRepository
110 112
     {
111 113
         PropertiesComponent.getInstance().setValue("api_key", apiKey);
112 114
     }
115
+
116
+    @Override
117
+    public @NotNull BaseRepository clone()
118
+    {
119
+        return new AcproRepository(this);
120
+    }
113 121
 }

+ 38 - 13
src/main/java/com/armstrongconsulting/acprotasks/AcproTask.java

@@ -1,13 +1,14 @@
1 1
 package com.armstrongconsulting.acprotasks;
2 2
 
3 3
 import java.util.Date;
4
+import java.util.List;
4 5
 
5 6
 import javax.swing.*;
6 7
 
7 8
 import org.jetbrains.annotations.NotNull;
8 9
 import org.jetbrains.annotations.Nullable;
9 10
 
10
-import com.armstrongconsulting.acprotasks.client.model.Item;
11
+import com.armstrongconsulting.acprotasks.client.model.ItemData;
11 12
 import com.intellij.tasks.Comment;
12 13
 import com.intellij.tasks.Task;
13 14
 import com.intellij.tasks.TaskType;
@@ -16,15 +17,33 @@ import icons.TasksIcons;
16 17
 
17 18
 public class AcproTask extends Task
18 19
 {
19
-    private String id;
20
-    private String summary;
21
-    private String description;
22
-
23
-    public AcproTask(Item item)
20
+    private final String id;
21
+    private final String summary;
22
+    private final String description;
23
+    private final Date updated;
24
+    private final Date created;
25
+    private final Comment[] comments;
26
+    private final String project;
27
+
28
+    public AcproTask(ItemData itemData, List<com.armstrongconsulting.acprotasks.client.model.Comment> comments)
24 29
     {
25
-        this.id = String.valueOf(item.getId());
26
-        this.summary = item.getTitle();
27
-        this.description = item.getDescription();
30
+        this.id = String.valueOf(itemData.getId());
31
+        this.summary = itemData.getTitle();
32
+        this.description = itemData.getDescription();
33
+        this.updated = itemData.getLastChanged();
34
+        this.created = itemData.getCreated();
35
+        if (comments != null)
36
+        {
37
+            this.comments =
38
+                comments.stream()
39
+                    .map(c -> new AcproComment(c.getText(), c.getCreatorLogin(), c.getCreated()))
40
+                    .toArray(Comment[]::new);
41
+        }
42
+        else
43
+        {
44
+            this.comments = Comment.EMPTY_ARRAY;
45
+        }
46
+        this.project = String.valueOf(itemData.getProject());
28 47
     }
29 48
 
30 49
     @Override
@@ -48,7 +67,7 @@ public class AcproTask extends Task
48 67
     @Override
49 68
     public @NotNull Comment[] getComments()
50 69
     {
51
-        return new Comment[0];
70
+        return comments;
52 71
     }
53 72
 
54 73
     @Override
@@ -60,19 +79,19 @@ public class AcproTask extends Task
60 79
     @Override
61 80
     public @NotNull TaskType getType()
62 81
     {
63
-        return TaskType.BUG;
82
+        return TaskType.OTHER;
64 83
     }
65 84
 
66 85
     @Override
67 86
     public @Nullable Date getUpdated()
68 87
     {
69
-        return null;
88
+        return this.updated;
70 89
     }
71 90
 
72 91
     @Override
73 92
     public @Nullable Date getCreated()
74 93
     {
75
-        return null;
94
+        return this.created;
76 95
     }
77 96
 
78 97
     @Override
@@ -92,4 +111,10 @@ public class AcproTask extends Task
92 111
     {
93 112
         return "https://www.acpro.at/item/" + id;
94 113
     }
114
+
115
+    @Override
116
+    public @Nullable String getProject()
117
+    {
118
+        return project;
119
+    }
95 120
 }

+ 8 - 0
src/main/java/com/armstrongconsulting/acprotasks/client/AcproClient.java

@@ -1,5 +1,7 @@
1 1
 package com.armstrongconsulting.acprotasks.client;
2 2
 
3
+import com.armstrongconsulting.acprotasks.client.model.Comments;
4
+import com.armstrongconsulting.acprotasks.client.model.Item;
3 5
 import com.armstrongconsulting.acprotasks.client.model.ItemsContainer;
4 6
 
5 7
 import feign.Headers;
@@ -15,4 +17,10 @@ public interface AcproClient
15 17
     @RequestLine("GET /items?q=title:{title}&start={offset}&count={limit}")
16 18
     ItemsContainer getItems(@Param("title") String titleContains, @Param("offset") Integer offset,
17 19
         @Param("limit") Integer limit);
20
+
21
+    @RequestLine("GET /item/{id}?markAsRead={markAsRead}")
22
+    Item getItem(@Param("id") String id, @Param("markAsRead") boolean markAsRead);
23
+
24
+    @RequestLine("GET /item/{id}/comments")
25
+    Comments getComments(@Param("id") String itemId);
18 26
 }

+ 106 - 0
src/main/java/com/armstrongconsulting/acprotasks/client/model/Comment.java

@@ -0,0 +1,106 @@
1
+package com.armstrongconsulting.acprotasks.client.model;
2
+
3
+import java.util.Date;
4
+
5
+import com.fasterxml.jackson.annotation.JsonInclude;
6
+import com.fasterxml.jackson.annotation.JsonProperty;
7
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
8
+
9
+@JsonInclude(JsonInclude.Include.NON_NULL)
10
+@JsonPropertyOrder({
11
+    "created",
12
+    "creator",
13
+    "creator_login",
14
+    "id",
15
+    "item",
16
+    "text"
17
+})
18
+public class Comment
19
+{
20
+
21
+    @JsonProperty("created")
22
+    private Date created;
23
+    @JsonProperty("creator")
24
+    private Integer creator;
25
+    @JsonProperty("creator_login")
26
+    private String creatorLogin;
27
+    @JsonProperty("id")
28
+    private Integer id;
29
+    @JsonProperty("item")
30
+    private Integer item;
31
+    @JsonProperty("text")
32
+    private String text;
33
+
34
+    @JsonProperty("created")
35
+    public Date getCreated()
36
+    {
37
+        return created;
38
+    }
39
+
40
+    @JsonProperty("created")
41
+    public void setCreated(Date created)
42
+    {
43
+        this.created = created;
44
+    }
45
+
46
+    @JsonProperty("creator")
47
+    public Integer getCreator()
48
+    {
49
+        return creator;
50
+    }
51
+
52
+    @JsonProperty("creator")
53
+    public void setCreator(Integer creator)
54
+    {
55
+        this.creator = creator;
56
+    }
57
+
58
+    @JsonProperty("creator_login")
59
+    public String getCreatorLogin()
60
+    {
61
+        return creatorLogin;
62
+    }
63
+
64
+    @JsonProperty("creator_login")
65
+    public void setCreatorLogin(String creatorLogin)
66
+    {
67
+        this.creatorLogin = creatorLogin;
68
+    }
69
+
70
+    @JsonProperty("id")
71
+    public Integer getId()
72
+    {
73
+        return id;
74
+    }
75
+
76
+    @JsonProperty("id")
77
+    public void setId(Integer id)
78
+    {
79
+        this.id = id;
80
+    }
81
+
82
+    @JsonProperty("item")
83
+    public Integer getItem()
84
+    {
85
+        return item;
86
+    }
87
+
88
+    @JsonProperty("item")
89
+    public void setItem(Integer item)
90
+    {
91
+        this.item = item;
92
+    }
93
+
94
+    @JsonProperty("text")
95
+    public String getText()
96
+    {
97
+        return text;
98
+    }
99
+
100
+    @JsonProperty("text")
101
+    public void setText(String text)
102
+    {
103
+        this.text = text;
104
+    }
105
+
106
+}

+ 29 - 0
src/main/java/com/armstrongconsulting/acprotasks/client/model/Comments.java

@@ -0,0 +1,29 @@
1
+package com.armstrongconsulting.acprotasks.client.model;
2
+
3
+import java.util.List;
4
+
5
+import com.fasterxml.jackson.annotation.JsonInclude;
6
+import com.fasterxml.jackson.annotation.JsonProperty;
7
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
8
+
9
+@JsonInclude(JsonInclude.Include.NON_NULL)
10
+@JsonPropertyOrder({
11
+    "comment"
12
+})
13
+public class Comments
14
+{
15
+    @JsonProperty("comment")
16
+    private List<Comment> comment = null;
17
+
18
+    @JsonProperty("comment")
19
+    public List<Comment> getComment()
20
+    {
21
+        return comment;
22
+    }
23
+
24
+    @JsonProperty("comment")
25
+    public void setComment(List<Comment> comment)
26
+    {
27
+        this.comment = comment;
28
+    }
29
+}

+ 9 - 279
src/main/java/com/armstrongconsulting/acprotasks/client/model/Item.java

@@ -8,293 +8,23 @@ import lombok.ToString;
8 8
 
9 9
 @JsonInclude(JsonInclude.Include.NON_NULL)
10 10
 @JsonPropertyOrder({
11
-    "actualHours",
12
-    "attachments",
13
-    "created",
14
-    "createdBy",
15
-    "createdBy_firstname",
16
-    "createdBy_lastname",
17
-    "description",
18
-    "estimateHours",
19
-    "id",
20
-    "lastChanged",
21
-    "lastChangedBy",
22
-    "lastChangedBy_firstname",
23
-    "lastChangedBy_lastname",
24
-    "project",
25
-    "project_name",
26
-    "status",
27
-    "title",
28
-    "unreadByAssignee",
29
-    "urgency"
11
+    "item"
30 12
 })
31 13
 @ToString
32 14
 public class Item
33 15
 {
34
-    @JsonProperty("actualHours")
35
-    private Integer actualHours;
36
-    @JsonProperty("attachments")
37
-    private Integer attachments;
38
-    @JsonProperty("created")
39
-    private String created;
40
-    @JsonProperty("createdBy")
41
-    private Integer createdBy;
42
-    @JsonProperty("createdBy_firstname")
43
-    private String createdByFirstname;
44
-    @JsonProperty("createdBy_lastname")
45
-    private String createdByLastname;
46
-    @JsonProperty("description")
47
-    private String description;
48
-    @JsonProperty("estimateHours")
49
-    private Integer estimateHours;
50
-    @JsonProperty("id")
51
-    private Integer id;
52
-    @JsonProperty("lastChanged")
53
-    private String lastChanged;
54
-    @JsonProperty("lastChangedBy")
55
-    private Integer lastChangedBy;
56
-    @JsonProperty("lastChangedBy_firstname")
57
-    private String lastChangedByFirstname;
58
-    @JsonProperty("lastChangedBy_lastname")
59
-    private String lastChangedByLastname;
60
-    @JsonProperty("project")
61
-    private Integer project;
62
-    @JsonProperty("project_name")
63
-    private String projectName;
64
-    @JsonProperty("status")
65
-    private String status;
66
-    @JsonProperty("title")
67
-    private String title;
68
-    @JsonProperty("unreadByAssignee")
69
-    private Boolean unreadByAssignee;
70
-    @JsonProperty("urgency")
71
-    private Integer urgency;
16
+    @JsonProperty("item")
17
+    private ItemData itemData;
72 18
 
73
-    @JsonProperty("actualHours")
74
-    public Integer getActualHours()
19
+    @JsonProperty("item")
20
+    public ItemData getItemData()
75 21
     {
76
-        return actualHours;
22
+        return itemData;
77 23
     }
78 24
 
79
-    @JsonProperty("actualHours")
80
-    public void setActualHours(Integer actualHours)
25
+    @JsonProperty("item")
26
+    public void setItemData(ItemData itemData)
81 27
     {
82
-        this.actualHours = actualHours;
83
-    }
84
-
85
-    @JsonProperty("attachments")
86
-    public Integer getAttachments()
87
-    {
88
-        return attachments;
89
-    }
90
-
91
-    @JsonProperty("attachments")
92
-    public void setAttachments(Integer attachments)
93
-    {
94
-        this.attachments = attachments;
95
-    }
96
-
97
-    @JsonProperty("created")
98
-    public String getCreated()
99
-    {
100
-        return created;
101
-    }
102
-
103
-    @JsonProperty("created")
104
-    public void setCreated(String created)
105
-    {
106
-        this.created = created;
107
-    }
108
-
109
-    @JsonProperty("createdBy")
110
-    public Integer getCreatedBy()
111
-    {
112
-        return createdBy;
113
-    }
114
-
115
-    @JsonProperty("createdBy")
116
-    public void setCreatedBy(Integer createdBy)
117
-    {
118
-        this.createdBy = createdBy;
119
-    }
120
-
121
-    @JsonProperty("createdBy_firstname")
122
-    public String getCreatedByFirstname()
123
-    {
124
-        return createdByFirstname;
125
-    }
126
-
127
-    @JsonProperty("createdBy_firstname")
128
-    public void setCreatedByFirstname(String createdByFirstname)
129
-    {
130
-        this.createdByFirstname = createdByFirstname;
131
-    }
132
-
133
-    @JsonProperty("createdBy_lastname")
134
-    public String getCreatedByLastname()
135
-    {
136
-        return createdByLastname;
137
-    }
138
-
139
-    @JsonProperty("createdBy_lastname")
140
-    public void setCreatedByLastname(String createdByLastname)
141
-    {
142
-        this.createdByLastname = createdByLastname;
143
-    }
144
-
145
-    @JsonProperty("description")
146
-    public String getDescription()
147
-    {
148
-        return description;
149
-    }
150
-
151
-    @JsonProperty("description")
152
-    public void setDescription(String description)
153
-    {
154
-        this.description = description;
155
-    }
156
-
157
-    @JsonProperty("estimateHours")
158
-    public Integer getEstimateHours()
159
-    {
160
-        return estimateHours;
161
-    }
162
-
163
-    @JsonProperty("estimateHours")
164
-    public void setEstimateHours(Integer estimateHours)
165
-    {
166
-        this.estimateHours = estimateHours;
167
-    }
168
-
169
-    @JsonProperty("id")
170
-    public Integer getId()
171
-    {
172
-        return id;
173
-    }
174
-
175
-    @JsonProperty("id")
176
-    public void setId(Integer id)
177
-    {
178
-        this.id = id;
179
-    }
180
-
181
-    @JsonProperty("lastChanged")
182
-    public String getLastChanged()
183
-    {
184
-        return lastChanged;
185
-    }
186
-
187
-    @JsonProperty("lastChanged")
188
-    public void setLastChanged(String lastChanged)
189
-    {
190
-        this.lastChanged = lastChanged;
191
-    }
192
-
193
-    @JsonProperty("lastChangedBy")
194
-    public Integer getLastChangedBy()
195
-    {
196
-        return lastChangedBy;
197
-    }
198
-
199
-    @JsonProperty("lastChangedBy")
200
-    public void setLastChangedBy(Integer lastChangedBy)
201
-    {
202
-        this.lastChangedBy = lastChangedBy;
203
-    }
204
-
205
-    @JsonProperty("lastChangedBy_firstname")
206
-    public String getLastChangedByFirstname()
207
-    {
208
-        return lastChangedByFirstname;
209
-    }
210
-
211
-    @JsonProperty("lastChangedBy_firstname")
212
-    public void setLastChangedByFirstname(String lastChangedByFirstname)
213
-    {
214
-        this.lastChangedByFirstname = lastChangedByFirstname;
215
-    }
216
-
217
-    @JsonProperty("lastChangedBy_lastname")
218
-    public String getLastChangedByLastname()
219
-    {
220
-        return lastChangedByLastname;
221
-    }
222
-
223
-    @JsonProperty("lastChangedBy_lastname")
224
-    public void setLastChangedByLastname(String lastChangedByLastname)
225
-    {
226
-        this.lastChangedByLastname = lastChangedByLastname;
227
-    }
228
-
229
-    @JsonProperty("project")
230
-    public Integer getProject()
231
-    {
232
-        return project;
233
-    }
234
-
235
-    @JsonProperty("project")
236
-    public void setProject(Integer project)
237
-    {
238
-        this.project = project;
239
-    }
240
-
241
-    @JsonProperty("project_name")
242
-    public String getProjectName()
243
-    {
244
-        return projectName;
245
-    }
246
-
247
-    @JsonProperty("project_name")
248
-    public void setProjectName(String projectName)
249
-    {
250
-        this.projectName = projectName;
251
-    }
252
-
253
-    @JsonProperty("status")
254
-    public String getStatus()
255
-    {
256
-        return status;
257
-    }
258
-
259
-    @JsonProperty("status")
260
-    public void setStatus(String status)
261
-    {
262
-        this.status = status;
263
-    }
264
-
265
-    @JsonProperty("title")
266
-    public String getTitle()
267
-    {
268
-        return title;
269
-    }
270
-
271
-    @JsonProperty("title")
272
-    public void setTitle(String title)
273
-    {
274
-        this.title = title;
275
-    }
276
-
277
-    @JsonProperty("unreadByAssignee")
278
-    public Boolean getUnreadByAssignee()
279
-    {
280
-        return unreadByAssignee;
281
-    }
282
-
283
-    @JsonProperty("unreadByAssignee")
284
-    public void setUnreadByAssignee(Boolean unreadByAssignee)
285
-    {
286
-        this.unreadByAssignee = unreadByAssignee;
287
-    }
288
-
289
-    @JsonProperty("urgency")
290
-    public Integer getUrgency()
291
-    {
292
-        return urgency;
293
-    }
294
-
295
-    @JsonProperty("urgency")
296
-    public void setUrgency(Integer urgency)
297
-    {
298
-        this.urgency = urgency;
28
+        this.itemData = itemData;
299 29
     }
300 30
 }

+ 302 - 0
src/main/java/com/armstrongconsulting/acprotasks/client/model/ItemData.java

@@ -0,0 +1,302 @@
1
+package com.armstrongconsulting.acprotasks.client.model;
2
+
3
+import java.util.Date;
4
+
5
+import com.fasterxml.jackson.annotation.JsonInclude;
6
+import com.fasterxml.jackson.annotation.JsonProperty;
7
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
8
+
9
+import lombok.ToString;
10
+
11
+@JsonInclude(JsonInclude.Include.NON_NULL)
12
+@JsonPropertyOrder({
13
+    "actualHours",
14
+    "attachments",
15
+    "created",
16
+    "createdBy",
17
+    "createdBy_firstname",
18
+    "createdBy_lastname",
19
+    "description",
20
+    "estimateHours",
21
+    "id",
22
+    "lastChanged",
23
+    "lastChangedBy",
24
+    "lastChangedBy_firstname",
25
+    "lastChangedBy_lastname",
26
+    "project",
27
+    "project_name",
28
+    "status",
29
+    "title",
30
+    "unreadByAssignee",
31
+    "urgency"
32
+})
33
+@ToString
34
+public class ItemData
35
+{
36
+    @JsonProperty("actualHours")
37
+    private Integer actualHours;
38
+    @JsonProperty("attachments")
39
+    private Integer attachments;
40
+    @JsonProperty("created")
41
+    private Date created;
42
+    @JsonProperty("createdBy")
43
+    private Integer createdBy;
44
+    @JsonProperty("createdBy_firstname")
45
+    private String createdByFirstname;
46
+    @JsonProperty("createdBy_lastname")
47
+    private String createdByLastname;
48
+    @JsonProperty("description")
49
+    private String description;
50
+    @JsonProperty("estimateHours")
51
+    private Integer estimateHours;
52
+    @JsonProperty("id")
53
+    private Integer id;
54
+    @JsonProperty("lastChanged")
55
+    private Date lastChanged;
56
+    @JsonProperty("lastChangedBy")
57
+    private Integer lastChangedBy;
58
+    @JsonProperty("lastChangedBy_firstname")
59
+    private String lastChangedByFirstname;
60
+    @JsonProperty("lastChangedBy_lastname")
61
+    private String lastChangedByLastname;
62
+    @JsonProperty("project")
63
+    private Integer project;
64
+    @JsonProperty("project_name")
65
+    private String projectName;
66
+    @JsonProperty("status")
67
+    private String status;
68
+    @JsonProperty("title")
69
+    private String title;
70
+    @JsonProperty("unreadByAssignee")
71
+    private Boolean unreadByAssignee;
72
+    @JsonProperty("urgency")
73
+    private Integer urgency;
74
+
75
+    @JsonProperty("actualHours")
76
+    public Integer getActualHours()
77
+    {
78
+        return actualHours;
79
+    }
80
+
81
+    @JsonProperty("actualHours")
82
+    public void setActualHours(Integer actualHours)
83
+    {
84
+        this.actualHours = actualHours;
85
+    }
86
+
87
+    @JsonProperty("attachments")
88
+    public Integer getAttachments()
89
+    {
90
+        return attachments;
91
+    }
92
+
93
+    @JsonProperty("attachments")
94
+    public void setAttachments(Integer attachments)
95
+    {
96
+        this.attachments = attachments;
97
+    }
98
+
99
+    @JsonProperty("created")
100
+    public Date getCreated()
101
+    {
102
+        return created;
103
+    }
104
+
105
+    @JsonProperty("created")
106
+    public void setCreated(Date created)
107
+    {
108
+        this.created = created;
109
+    }
110
+
111
+    @JsonProperty("createdBy")
112
+    public Integer getCreatedBy()
113
+    {
114
+        return createdBy;
115
+    }
116
+
117
+    @JsonProperty("createdBy")
118
+    public void setCreatedBy(Integer createdBy)
119
+    {
120
+        this.createdBy = createdBy;
121
+    }
122
+
123
+    @JsonProperty("createdBy_firstname")
124
+    public String getCreatedByFirstname()
125
+    {
126
+        return createdByFirstname;
127
+    }
128
+
129
+    @JsonProperty("createdBy_firstname")
130
+    public void setCreatedByFirstname(String createdByFirstname)
131
+    {
132
+        this.createdByFirstname = createdByFirstname;
133
+    }
134
+
135
+    @JsonProperty("createdBy_lastname")
136
+    public String getCreatedByLastname()
137
+    {
138
+        return createdByLastname;
139
+    }
140
+
141
+    @JsonProperty("createdBy_lastname")
142
+    public void setCreatedByLastname(String createdByLastname)
143
+    {
144
+        this.createdByLastname = createdByLastname;
145
+    }
146
+
147
+    @JsonProperty("description")
148
+    public String getDescription()
149
+    {
150
+        return description;
151
+    }
152
+
153
+    @JsonProperty("description")
154
+    public void setDescription(String description)
155
+    {
156
+        this.description = description;
157
+    }
158
+
159
+    @JsonProperty("estimateHours")
160
+    public Integer getEstimateHours()
161
+    {
162
+        return estimateHours;
163
+    }
164
+
165
+    @JsonProperty("estimateHours")
166
+    public void setEstimateHours(Integer estimateHours)
167
+    {
168
+        this.estimateHours = estimateHours;
169
+    }
170
+
171
+    @JsonProperty("id")
172
+    public Integer getId()
173
+    {
174
+        return id;
175
+    }
176
+
177
+    @JsonProperty("id")
178
+    public void setId(Integer id)
179
+    {
180
+        this.id = id;
181
+    }
182
+
183
+    @JsonProperty("lastChanged")
184
+    public Date getLastChanged()
185
+    {
186
+        return lastChanged;
187
+    }
188
+
189
+    @JsonProperty("lastChanged")
190
+    public void setLastChanged(Date lastChanged)
191
+    {
192
+        this.lastChanged = lastChanged;
193
+    }
194
+
195
+    @JsonProperty("lastChangedBy")
196
+    public Integer getLastChangedBy()
197
+    {
198
+        return lastChangedBy;
199
+    }
200
+
201
+    @JsonProperty("lastChangedBy")
202
+    public void setLastChangedBy(Integer lastChangedBy)
203
+    {
204
+        this.lastChangedBy = lastChangedBy;
205
+    }
206
+
207
+    @JsonProperty("lastChangedBy_firstname")
208
+    public String getLastChangedByFirstname()
209
+    {
210
+        return lastChangedByFirstname;
211
+    }
212
+
213
+    @JsonProperty("lastChangedBy_firstname")
214
+    public void setLastChangedByFirstname(String lastChangedByFirstname)
215
+    {
216
+        this.lastChangedByFirstname = lastChangedByFirstname;
217
+    }
218
+
219
+    @JsonProperty("lastChangedBy_lastname")
220
+    public String getLastChangedByLastname()
221
+    {
222
+        return lastChangedByLastname;
223
+    }
224
+
225
+    @JsonProperty("lastChangedBy_lastname")
226
+    public void setLastChangedByLastname(String lastChangedByLastname)
227
+    {
228
+        this.lastChangedByLastname = lastChangedByLastname;
229
+    }
230
+
231
+    @JsonProperty("project")
232
+    public Integer getProject()
233
+    {
234
+        return project;
235
+    }
236
+
237
+    @JsonProperty("project")
238
+    public void setProject(Integer project)
239
+    {
240
+        this.project = project;
241
+    }
242
+
243
+    @JsonProperty("project_name")
244
+    public String getProjectName()
245
+    {
246
+        return projectName;
247
+    }
248
+
249
+    @JsonProperty("project_name")
250
+    public void setProjectName(String projectName)
251
+    {
252
+        this.projectName = projectName;
253
+    }
254
+
255
+    @JsonProperty("status")
256
+    public String getStatus()
257
+    {
258
+        return status;
259
+    }
260
+
261
+    @JsonProperty("status")
262
+    public void setStatus(String status)
263
+    {
264
+        this.status = status;
265
+    }
266
+
267
+    @JsonProperty("title")
268
+    public String getTitle()
269
+    {
270
+        return title;
271
+    }
272
+
273
+    @JsonProperty("title")
274
+    public void setTitle(String title)
275
+    {
276
+        this.title = title;
277
+    }
278
+
279
+    @JsonProperty("unreadByAssignee")
280
+    public Boolean getUnreadByAssignee()
281
+    {
282
+        return unreadByAssignee;
283
+    }
284
+
285
+    @JsonProperty("unreadByAssignee")
286
+    public void setUnreadByAssignee(Boolean unreadByAssignee)
287
+    {
288
+        this.unreadByAssignee = unreadByAssignee;
289
+    }
290
+
291
+    @JsonProperty("urgency")
292
+    public Integer getUrgency()
293
+    {
294
+        return urgency;
295
+    }
296
+
297
+    @JsonProperty("urgency")
298
+    public void setUrgency(Integer urgency)
299
+    {
300
+        this.urgency = urgency;
301
+    }
302
+}

+ 5 - 5
src/main/java/com/armstrongconsulting/acprotasks/client/model/Items.java

@@ -28,7 +28,7 @@ public class Items
28 28
     @JsonProperty("@totalNumRows")
29 29
     private String totalNumRows;
30 30
     @JsonProperty("item")
31
-    private List<Item> item = null;
31
+    private List<ItemData> itemData = null;
32 32
 
33 33
     @JsonProperty("@rows")
34 34
     public String getRows()
@@ -79,14 +79,14 @@ public class Items
79 79
     }
80 80
 
81 81
     @JsonProperty("item")
82
-    public List<Item> getItem()
82
+    public List<ItemData> getItemData()
83 83
     {
84
-        return item;
84
+        return itemData;
85 85
     }
86 86
 
87 87
     @JsonProperty("item")
88
-    public void setItem(List<Item> item)
88
+    public void setItemData(List<ItemData> itemData)
89 89
     {
90
-        this.item = item;
90
+        this.itemData = itemData;
91 91
     }
92 92
 }