Skip to content

Commit 88f0cb6

Browse files
author
Caitlin Bales (MSFT)
committed
Add default oDataTypes to Planner models
1 parent 12f6b8e commit 88f0cb6

File tree

7 files changed

+26
-17
lines changed

7 files changed

+26
-17
lines changed

src/main/java/com/microsoft/graph/models/extensions/PlannerAssignment.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,7 @@
2323
* The class for the Planner Assignment.
2424
*/
2525
public class PlannerAssignment extends BasePlannerAssignment {
26-
26+
public PlannerAssignment() {
27+
oDataType = "#microsoft.graph.plannerAssignment";
28+
}
2729
}

src/main/java/com/microsoft/graph/models/extensions/PlannerBucket.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,8 @@ public class PlannerBucket extends BasePlannerBucket {
3131
@SerializedName("@odata.etag")
3232
@Expose
3333
public String etag;
34+
35+
public PlannerBucket() {
36+
oDataType = "#microsoft.graph.plannerBucket";
37+
}
3438
}

src/main/java/com/microsoft/graph/models/extensions/PlannerChecklistItem.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@
2323
* The class for the Planner Checklist Item.
2424
*/
2525
public class PlannerChecklistItem extends BasePlannerChecklistItem {
26-
26+
27+
public PlannerChecklistItem() {
28+
oDataType = "#microsoft.graph.plannerChecklistItem";
29+
}
2730
}

src/main/java/com/microsoft/graph/models/extensions/PlannerExternalReference.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,7 @@
2323
* The class for the Planner External Reference.
2424
*/
2525
public class PlannerExternalReference extends BasePlannerExternalReference {
26-
26+
public PlannerExternalReference() {
27+
oDataType = "#microsoft.graph.plannerExternalReference";
28+
}
2729
}

src/main/java/com/microsoft/graph/models/extensions/PlannerTask.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,8 @@ public class PlannerTask extends BasePlannerTask {
3232
@SerializedName("@odata.etag")
3333
@Expose
3434
public String etag;
35+
36+
public PlannerTask() {
37+
oDataType = "#microsoft.graph.plannerTask";
38+
}
3539
}

src/main/java/com/microsoft/graph/models/extensions/PlannerTaskDetails.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,15 @@
2525
* The class for the Planner Task Details.
2626
*/
2727
public class PlannerTaskDetails extends BasePlannerTaskDetails {
28-
28+
2929
/**
3030
* The Etag.
3131
*/
3232
@SerializedName("@odata.etag")
3333
@Expose
3434
public String etag;
35+
36+
public PlannerTaskDetails() {
37+
oDataType = "#microsoft.graph.plannerTaskDetails";
38+
}
3539
}

src/test/java/com/microsoft/graph/functional/PlannerTests.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,6 @@ public void testUpdateTask() throws InterruptedException {
125125

126126
PlannerAssignment assignment = new PlannerAssignment();
127127
assignment.orderHint = " !";
128-
AdditionalDataManager assignmentAdditionalData = assignment.additionalDataManager();
129-
assignmentAdditionalData.put("@odata.type", new JsonPrimitive("#microsoft.graph.plannerAssignment"));
130-
//assignment.oDataType = "#microsoft.graph.plannerAssignment";
131-
132128
PlannerAssignments a2 = new PlannerAssignments();
133129
a2.put(me.id, assignment);
134130
task.assignments = a2;
@@ -157,32 +153,30 @@ public void testUpdateTaskDetailsChecklist() throws InterruptedException {
157153
JsonObject data = new JsonObject();
158154
Gson gson = new Gson();
159155

156+
Thread.sleep(2000);
157+
160158
PlannerChecklistItem checklistItem1 = new PlannerChecklistItem();
161159
checklistItem1.orderHint = " !!";
162160
checklistItem1.isChecked = true;
163161
checklistItem1.title = "C1";
164-
checklistItem1.additionalDataManager().put("@odata.type", new JsonPrimitive("microsoft.graph.plannerChecklistItem"));
165162
JsonElement checklist1Json = gson.toJsonTree(checklistItem1);
166163
data.add(uuid, checklist1Json);
167164

168165
PlannerChecklistItem checklistItem2 = new PlannerChecklistItem();
169166
checklistItem2.orderHint = " !";
170167
checklistItem2.isChecked = false;
171168
checklistItem2.title = "C2";
172-
checklistItem2.additionalDataManager().put("@odata.type", new JsonPrimitive("microsoft.graph.plannerChecklistItem"));
173169
JsonElement checklist2Json = gson.toJsonTree(checklistItem2);
174170
data.add(UUID.randomUUID().toString(), checklist2Json);
175171

176172
PlannerChecklistItem checklistItem3 = new PlannerChecklistItem();
177173
checklistItem3.orderHint = " !!!";
178174
checklistItem3.isChecked = false;
179175
checklistItem3.title = "C3";
180-
checklistItem3.additionalDataManager().put("@odata.type", new JsonPrimitive("microsoft.graph.plannerChecklistItem"));
181176
JsonElement checklist3Json = gson.toJsonTree(checklistItem3);
182177
data.add(UUID.randomUUID().toString(), checklist3Json);
183178

184179
AdditionalDataManager dataManager = details.additionalDataManager();
185-
details.oDataType = "#microsoft.graph.plannerTaskDetails";
186180
dataManager.put("checklist", data);
187181

188182
PlannerTaskDetails d = prb
@@ -198,7 +192,7 @@ public void testUpdateTaskDetailsChecklist() throws InterruptedException {
198192
req.addHeader("If-None-Match", d.etag);
199193
req.patch(details);
200194

201-
Thread.sleep(4000);
195+
Thread.sleep(2000);
202196

203197
PlannerTask updatedTask = prb.tasks(planTask.id).buildRequest().get();
204198
int checklistItemCount = updatedTask.getRawObject().get("checklistItemCount").getAsInt();
@@ -215,7 +209,6 @@ public void testUpdateTaskDetailsReferences() {
215209
JsonObject data = new JsonObject();
216210
PlannerExternalReference reference = new PlannerExternalReference();
217211

218-
reference.additionalDataManager().put("@odata.type", new JsonPrimitive("microsoft.graph.plannerExternalReference"));
219212
reference.alias = "Msn";
220213
reference.previewPriority = " !";
221214
reference.type = "Other";
@@ -224,7 +217,6 @@ public void testUpdateTaskDetailsReferences() {
224217
data.add("http%3A//www%2Emsn%2Ecom", referenceJson);
225218

226219
AdditionalDataManager dataManager = details.additionalDataManager();
227-
details.oDataType = "#microsoft.graph.plannerTaskDetails";
228220
dataManager.put("references", data);
229221

230222
PlannerTaskDetails d = prb
@@ -324,7 +316,6 @@ public void testUpdateTaskCategories() {
324316
data.add("category6", new JsonPrimitive(false));
325317

326318
AdditionalDataManager dataManager = task.additionalDataManager();
327-
task.oDataType = "#microsoft.graph.plannerTask";
328319
dataManager.put("appliedCategories", data);
329320

330321
PlannerTask newTask = prb.tasks(planTask.id).buildRequest().get();
@@ -384,7 +375,6 @@ public void testCreateBucket() {
384375
public void testUpdateBucket() {
385376
PlannerBucket patchBucket = new PlannerBucket();
386377
patchBucket.name = "RenamedBucket";
387-
patchBucket.oDataType = "#microsoft.graph.plannerBucket";
388378

389379
IPlannerBucketRequest req = prb.buckets(planBucket.id).buildRequest();
390380
req.addHeader("If-Match", planBucket.etag);

0 commit comments

Comments
 (0)