Planner External References

Author: Caitlin Bales (MSFT)

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

@@ -4,24 +4,93 @@
 
 package com.microsoft.graph.models.extensions;
 
-import com.microsoft.graph.concurrency.*;
-import com.microsoft.graph.core.*;
-import com.microsoft.graph.models.extensions.*;
+import com.google.gson.JsonElement;
 import com.microsoft.graph.models.generated.*;
-import com.microsoft.graph.http.*;
-import com.microsoft.graph.requests.extensions.*;
-import com.microsoft.graph.requests.generated.*;
-import com.microsoft.graph.options.*;
 import com.microsoft.graph.serializer.*;
 
-import java.util.Arrays;
-import java.util.EnumSet;
-
+import java.security.InvalidParameterException;
 // This file is available for extending, afterwards please submit a pull request.
 
 /**
  * The class for the Planner External References.
  */
 public class PlannerExternalReferences extends BasePlannerExternalReferences {
-
+	/*
+	 * Specifies the character - encoding pairs to apply on the external reference URLs
+	 */
+	private static String[][] conversions = { { "%", "%25" }, { "@", "%40" }, { ".", "%2E" }, { ":", "%3A" } };
+	
+	/**
+	 * Gets external reference data for a given reference URL
+	 * @param url The external reference URL
+	 * @return The external reference
+	 */
+	public PlannerExternalReference reference(String url) {
+		if (url == null || url.isEmpty()) {
+			throw new InvalidParameterException("URL cannot be empty");
+		}
+		if (this.additionalDataManager().containsKey(encode(url))) {
+			JsonElement refObject = this.additionalDataManager().get(encode(url));
+			ISerializer serializer = this.getSerializer();
+			return serializer.deserializeObject(
+					refObject.getAsString(), 
+					PlannerExternalReference.class
+				);
+		} else {
+			return null;
+		}
+	}
+	
+	/**
+	 * Adds a new external reference with the given URL and short name
+	 * @param url URL of the external reference
+	 * @param alias Short name for the external reference
+	 * @return The created external reference
+	 */
+	public PlannerExternalReference addReference(String url, String alias) {
+		if (url == null || url.isEmpty()) {
+			throw new InvalidParameterException("URL cannot be empty");
+		}
+		if (alias == null || alias.isEmpty()) {
+			throw new InvalidParameterException("Alias cannot be empty");
+		}
+		
+		PlannerExternalReference plannerExternalReference = new PlannerExternalReference();
+		plannerExternalReference.alias = alias;
+		this.additionalDataManager().put(encode(url), plannerExternalReference.getRawObject());
+		return plannerExternalReference;
+	}
+	
+	/**
+	 * Encodes the URL of an external reference to be compatible with OData property naming requirements
+	 * @param externalReferenceUrl URL to encode
+	 * @return Encoded URL
+	 */
+	private static String encode(String externalReferenceUrl) {
+		if (externalReferenceUrl == null || externalReferenceUrl.isEmpty()) {
+			throw new InvalidParameterException("URL cannot be empty");
+		}
+		
+		for (int i = 0; i < conversions.length; i++)
+		{
+			externalReferenceUrl = externalReferenceUrl.replace(conversions[i][0], conversions[i][1]);
+		}
+		return externalReferenceUrl;
+	}
+	
+	/**
+	 * Decodes an encoded URL of an external reference
+	 * @param externalReferenceUrl URL to encode
+	 * @return Decoded URL
+	 */
+	private static String decode(String externalReferenceUrl) {
+		if (externalReferenceUrl == null || externalReferenceUrl.isEmpty()) {
+			throw new InvalidParameterException("URL cannot be empty");
+		}
+		
+		for (int i = conversions.length - 1; i >= 0; i--) {
+			externalReferenceUrl = externalReferenceUrl.replace(conversions[i][1], conversions[i][0]);
+		}
+		return externalReferenceUrl;
+	}
 }

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

@@ -12,6 +12,7 @@
 import com.microsoft.graph.requests.extensions.IPlannerTaskRequest;
 import com.microsoft.graph.models.extensions.PlannerAssignedToTaskBoardTaskFormat;
 import com.microsoft.graph.models.extensions.PlannerAssignment;
+import com.microsoft.graph.models.extensions.PlannerAssignments;
 import com.microsoft.graph.models.extensions.PlannerBucket;
 import com.microsoft.graph.models.extensions.PlannerBucketTaskBoardTaskFormat;
 import com.microsoft.graph.models.extensions.PlannerCategoryDescriptions;
@@ -33,7 +34,7 @@
 import java.util.Calendar;
 import java.util.UUID;
 
-@Ignore
+//@Ignore
 public class PlannerTests {
     private TestBase testBase;
     // For now, you must specify a specific plan ID since the test cannot
@@ -104,17 +105,19 @@ public void testUpdateTask() throws InterruptedException {
 
         PlannerAssignment assignment = new PlannerAssignment();
         assignment.orderHint = " !";
+        AdditionalDataManager assignmentAdditionalData = assignment.additionalDataManager();
+        assignmentAdditionalData.put("@odata.Type", new JsonPrimitive("#microsoft.graph.plannerAssignment"));
         assignment.oDataType = "#microsoft.graph.plannerAssignment";
-        assignment.additionalDataManager().put("@odata.type", new JsonPrimitive("#microsoft.graph.plannerAssignment"));
 
-        AdditionalDataManager dataManager = task.additionalDataManager();
-        task.oDataType = "#microsoft.graph.plannerTask";
+        PlannerAssignments a2 = new PlannerAssignments();
+        a2.put(me.id, assignment);
+        task.assignments = a2;
 
-        JsonObject assignments = new JsonObject();
-        Gson gson = new Gson();
-        JsonElement assignmentJson = gson.toJsonTree(assignment);
-        assignments.add(me.id, assignmentJson);
-        dataManager.put("assignments", assignments);
+//        JsonObject assignments = new JsonObject();
+//        Gson gson = new Gson();
+//        JsonElement assignmentJson = gson.toJsonTree(assignment);
+//        assignments.add(me.id, assignmentJson);
+//        dataManager.put("assignments", assignments);
 
         IPlannerTaskRequest req = testBase.graphClient.planner().tasks(planTask.id).buildRequest();
         req.addHeader("If-Match", getEtag(planTask.getRawObject()));