Add etag accessors

Author: Caitlin Bales (MSFT)

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

@@ -4,6 +4,8 @@
 
 package com.microsoft.graph.models.extensions;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
 import com.microsoft.graph.concurrency.*;
 import com.microsoft.graph.core.*;
 import com.microsoft.graph.models.extensions.*;
@@ -25,6 +27,13 @@
 public class PlannerAssignedToTaskBoardTaskFormat extends BasePlannerAssignedToTaskBoardTaskFormat {
 
 	/**
+     * The Etag.
+     */
+    @SerializedName("@odata.etag")
+    @Expose
+    public String etag;
+    
+	/**
 	 * The GetOrderHintForAssignee
 	 */
 	public String orderHintForAssignee(String userId)

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

@@ -4,6 +4,8 @@
 
 package com.microsoft.graph.models.extensions;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
 import com.microsoft.graph.concurrency.*;
 import com.microsoft.graph.core.*;
 import com.microsoft.graph.models.extensions.*;
@@ -23,5 +25,10 @@
  * The class for the Planner Bucket.
  */
 public class PlannerBucket extends BasePlannerBucket {
-
+	/**
+     * The Etag.
+     */
+    @SerializedName("@odata.etag")
+    @Expose
+    public String etag;
 }

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

@@ -4,6 +4,8 @@
 
 package com.microsoft.graph.models.extensions;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
 import com.microsoft.graph.concurrency.*;
 import com.microsoft.graph.core.*;
 import com.microsoft.graph.models.extensions.*;
@@ -24,4 +26,10 @@
  */
 public class PlannerBucketTaskBoardTaskFormat extends BasePlannerBucketTaskBoardTaskFormat {
 
+	/**
+     * The Etag.
+     */
+    @SerializedName("@odata.etag")
+    @Expose
+    public String etag;
 }

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

@@ -4,6 +4,8 @@
 
 package com.microsoft.graph.models.extensions;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
 import com.microsoft.graph.concurrency.*;
 import com.microsoft.graph.core.*;
 import com.microsoft.graph.models.extensions.*;
@@ -24,4 +26,10 @@
  */
 public class PlannerPlanDetails extends BasePlannerPlanDetails {
 
+	/**
+     * The Etag.
+     */
+    @SerializedName("@odata.etag")
+    @Expose
+    public String etag;
 }

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

@@ -4,6 +4,8 @@
 
 package com.microsoft.graph.models.extensions;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
 import com.microsoft.graph.concurrency.*;
 import com.microsoft.graph.core.*;
 import com.microsoft.graph.models.extensions.*;
@@ -24,4 +26,10 @@
  */
 public class PlannerProgressTaskBoardTaskFormat extends BasePlannerProgressTaskBoardTaskFormat {
 
+	/**
+     * The Etag.
+     */
+    @SerializedName("@odata.etag")
+    @Expose
+    public String etag;
 }

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

@@ -4,6 +4,8 @@
 
 package com.microsoft.graph.models.extensions;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
 import com.microsoft.graph.concurrency.*;
 import com.microsoft.graph.core.*;
 import com.microsoft.graph.models.extensions.*;
@@ -24,4 +26,10 @@
  */
 public class PlannerTask extends BasePlannerTask {
 
+	/**
+     * The Etag.
+     */
+    @SerializedName("@odata.etag")
+    @Expose
+    public String etag;
 }

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

@@ -4,6 +4,8 @@
 
 package com.microsoft.graph.models.extensions;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
 import com.microsoft.graph.concurrency.*;
 import com.microsoft.graph.core.*;
 import com.microsoft.graph.models.extensions.*;
@@ -24,4 +26,10 @@
  */
 public class PlannerTaskDetails extends BasePlannerTaskDetails {
 
+	/**
+     * The Etag.
+     */
+    @SerializedName("@odata.etag")
+    @Expose
+    public String etag;
 }

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

@@ -36,7 +36,7 @@
 import java.util.Calendar;
 import java.util.UUID;
 
-@Ignore
+//@Ignore
 public class PlannerTests {
     private static TestBase testBase;
     // For now, you must specify a specific plan ID since the test cannot
@@ -65,7 +65,7 @@ public static void setUp() {
         planTask = prb.tasks().buildRequest().post(newTask);
     }
 
-    @Test
+    //@Test
     public void testPostTask() {
         PlannerTask newTask = new PlannerTask();
         newTask.title = "Test1";
@@ -136,7 +136,7 @@ public void testUpdateTask() throws InterruptedException {
         IPlannerTaskRequest req = prb
         		.tasks(planTask.id)
         		.buildRequest();
-        req.addHeader("If-Match", getEtag(planTask.getRawObject()));
+        req.addHeader("If-Match", planTask.etag);
         req.patch(task);
 
         Thread.sleep(4000);
@@ -194,8 +194,8 @@ public void testUpdateTaskDetailsChecklist() throws InterruptedException {
         		.tasks(planTask.id)
         		.details()
         		.buildRequest();
-        req.addHeader("If-Match", getEtag(d.getRawObject()));
-        req.addHeader("If-None-Match", getEtag(d.getRawObject()));
+        req.addHeader("If-Match", d.etag);
+        req.addHeader("If-None-Match", d.etag);
         req.patch(details);
 
         Thread.sleep(4000);
@@ -207,7 +207,7 @@ public void testUpdateTaskDetailsChecklist() throws InterruptedException {
     }
 
     // Fails due to delay from service
-    @Test
+     @Test
      public void testUpdateTaskDetailsReferences() {
         try {
             PlannerTaskDetails details = new PlannerTaskDetails();
@@ -236,8 +236,8 @@ public void testUpdateTaskDetailsReferences() {
             		.tasks(planTask.id)
             		.details()
             		.buildRequest();
-            req.addHeader("If-Match", getEtag(d.getRawObject()));
-            req.addHeader("If-None-Match", getEtag(d.getRawObject()));
+            req.addHeader("If-Match", d.etag);
+            req.addHeader("If-None-Match", d.etag);
             req.addHeader("Prefer", "return=representation");
             PlannerTaskDetails updatedTaskDetails = req.patch(details);
 
@@ -265,7 +265,7 @@ public void testUpdateTaskCompletion() throws InterruptedException {
         task.percentComplete = 50;
 
         IPlannerTaskRequest req = prb.tasks(planTask.id).buildRequest();
-        req.addHeader("If-Match", getEtag(planTask.getRawObject()));
+        req.addHeader("If-Match", planTask.etag);
         req.patch(task);
 
         Thread.sleep(4000);
@@ -281,7 +281,7 @@ public void testUpdateTaskStartDate() throws InterruptedException {
         task.startDateTime = Calendar.getInstance();
 
         IPlannerTaskRequest req = prb.tasks(planTask.id).buildRequest();
-        req.addHeader("If-Match", getEtag(planTask.getRawObject()));
+        req.addHeader("If-Match", planTask.etag);
         req.patch(task);
 
         Thread.sleep(2000);
@@ -300,7 +300,7 @@ public void testUpdateTaskDueDate() throws InterruptedException {
         IPlannerTaskRequest req = prb.tasks(planTask.id).buildRequest();
         planTask = prb.tasks(planTask.id).buildRequest().get();
 
-        req.addHeader("If-Match", getEtag(planTask.getRawObject()));
+        req.addHeader("If-Match", planTask.etag);
         req.patch(task);
 
         Thread.sleep(6000);
@@ -329,8 +329,8 @@ public void testUpdateTaskCategories() {
 
         PlannerTask newTask = prb.tasks(planTask.id).buildRequest().get();
         IPlannerTaskRequest req = prb.tasks(planTask.id).buildRequest();
-        req.addHeader("If-Match", getEtag(newTask.getRawObject()));
-        req.addHeader("If-None-Match", getEtag(newTask.getRawObject()));
+        req.addHeader("If-Match", newTask.etag);
+        req.addHeader("If-None-Match", newTask.etag);
         req.addHeader("Prefer", "return=representation");
         PlannerTask updatedTask = req.patch(task);
 
@@ -348,8 +348,8 @@ public void testUpdatePlanDetails() {
 
         PlannerPlanDetails newDetails = prb.plans(planId).details().buildRequest().get();
         IPlannerPlanDetailsRequest req = prb.plans(planId).details().buildRequest();
-        req.addHeader("If-Match", getEtag(newDetails.getRawObject()));
-        req.addHeader("If-None-Match", getEtag(newDetails.getRawObject()));
+        req.addHeader("If-Match", newDetails.etag);
+        req.addHeader("If-None-Match", newDetails.etag);
         req.addHeader("Prefer", "return=representation");
         PlannerPlanDetails updatedPlanDetails = req.patch(planDetails);
 
@@ -366,7 +366,7 @@ public void testDeleteTask() {
         PlannerTask task = prb.tasks().buildRequest().post(newTask);
 
         IPlannerTaskRequest req = testBase.graphClient.planner().tasks(task.id).buildRequest();
-        req.addHeader("If-Match", getEtag(task.getRawObject()));
+        req.addHeader("If-Match", task.etag);
         req.delete();
     }
 
@@ -387,7 +387,7 @@ public void testUpdateBucket() {
         patchBucket.oDataType = "#microsoft.graph.plannerBucket";
 
         IPlannerBucketRequest req = prb.buckets(planBucket.id).buildRequest();
-        req.addHeader("If-Match", getEtag(planBucket.getRawObject()));
+        req.addHeader("If-Match", planBucket.etag);
 
         req.patch(patchBucket);
         PlannerBucket updatedBucket = prb.buckets(planBucket.id).buildRequest().get();
@@ -396,7 +396,7 @@ public void testUpdateBucket() {
 
         patchBucket.name = "Test Bucket";
         IPlannerBucketRequest req2 = testBase.graphClient.planner().buckets(planBucket.id).buildRequest();
-        req2.addHeader("If-Match", getEtag(updatedBucket.getRawObject()));
+        req2.addHeader("If-Match", updatedBucket.etag);
         req2.patch(patchBucket);
     }
 
@@ -409,7 +409,7 @@ public void testDeleteBucket() {
         PlannerBucket createdBucket = testBase.graphClient.planner().buckets().buildRequest().post(newBucket);
 
         IPlannerBucketRequest req = testBase.graphClient.planner().buckets(createdBucket.id).buildRequest();
-        req.addHeader("If-Match", getEtag(createdBucket.getRawObject()));
+        req.addHeader("If-Match", createdBucket.etag);
         req.delete();
     }
 
@@ -421,12 +421,12 @@ public static void tearDown() throws InterruptedException {
         //This may have updated since we last saw it
         PlannerTask task = testBase.graphClient.planner().tasks(planTask.id).buildRequest().get();
         IPlannerTaskRequest taskReq = testBase.graphClient.planner().tasks(planTask.id).buildRequest();
-        taskReq.addHeader("If-Match", getEtag(task.getRawObject()));
+        taskReq.addHeader("If-Match", task.etag);
         taskReq.delete();
 
         PlannerBucket bucket = testBase.graphClient.planner().buckets(planBucket.id).buildRequest().get();
         IPlannerBucketRequest bucketReq = testBase.graphClient.planner().buckets(planBucket.id).buildRequest();
-        bucketReq.addHeader("If-Match", getEtag(bucket.getRawObject()));
+        bucketReq.addHeader("If-Match", bucket.etag);
         bucketReq.delete();
 
         //Fails with 403 Forbidden
@@ -435,11 +435,4 @@ public static void tearDown() throws InterruptedException {
         // planReq.addHeader("If-Match", getEtag(plan.getRawObject()));
         // planReq.delete();
     }
-
-    public static String getEtag(JsonObject obj) {
-        String etag = obj.get("@odata.etag").toString();
-        etag = etag.substring(1, etag.length()-1);
-        etag = etag.replace("\\", "");;
-        return etag;
-    }
 }