Attachment serializers, tests and @expose attachments attribute.

Author: Nakul Sabharwal

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

@@ -4,13 +4,18 @@
 
 package com.microsoft.graph.models.extensions;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
 import com.microsoft.graph.models.generated.BaseEvent;
+import com.microsoft.graph.requests.extensions.AttachmentCollectionPage;
 
 // This file is available for extending, afterwards please submit a pull request.
 
 /**
  * The class for the Event.
  */
 public class Event extends BaseEvent {
-
+	@SerializedName("attachments")
+    @Expose
+	public AttachmentCollectionPage attachments;
 }

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

@@ -4,13 +4,19 @@
 
 package com.microsoft.graph.models.extensions;
 
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
 import com.microsoft.graph.models.generated.BaseMessage;
+import com.microsoft.graph.requests.extensions.AttachmentCollectionPage;
 
 // This file is available for extending, afterwards please submit a pull request.
 
 /**
  * The class for the Message.
  */
 public class Message extends BaseMessage {
+	@SerializedName("attachments")
+	@Expose
+    public AttachmentCollectionPage attachments;
 
 }

src/main/java/com/microsoft/graph/serializer/AttachmentCollectionPageSerializer.java

@@ -0,0 +1,104 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2017 Microsoft Corporation
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.serializer;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.List;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.models.extensions.Attachment;
+import com.microsoft.graph.models.extensions.Contact;
+import com.microsoft.graph.models.extensions.Event;
+import com.microsoft.graph.models.extensions.FileAttachment;
+import com.microsoft.graph.models.extensions.ItemAttachment;
+import com.microsoft.graph.models.extensions.Message;
+import com.microsoft.graph.models.extensions.ReferenceAttachment;
+import com.microsoft.graph.requests.extensions.AttachmentCollectionPage;
+import com.microsoft.graph.requests.generated.BaseAttachmentCollectionResponse;
+
+public class AttachmentCollectionPageSerializer {
+
+	private static JsonParser parser;
+	private static DefaultSerializer serializer;
+
+	/**
+	 * Not available for instantiation
+	 */
+	private AttachmentCollectionPageSerializer() {
+	}
+
+	/**
+     * Serializes an AttachmentCollectionPage
+     * 
+     * @param src the AttachmentCollectionPage variable for serialization
+     * @param logger the logger
+     * @return       JsonElement of AttachmentCollectionPage
+     */
+	public static JsonElement serialize(final AttachmentCollectionPage src, final ILogger logger) {
+		if(src == null) {
+			return null;
+		}
+		JsonArray jsonArray = new JsonArray();
+		List<Attachment> attachments = src.getCurrentPage();
+		serializer = new DefaultSerializer(logger);
+		String json;
+		JsonObject jsonObject;
+		parser = new JsonParser();
+		for(Attachment attachment : attachments) {
+			jsonObject = new JsonObject();
+			json = serializer.serializeObject(attachment);
+			jsonObject = (JsonObject)parser.parse(json);
+			jsonArray.add(jsonObject);
+		}
+		return jsonArray;
+	}
+
+	/**
+     * Deserializes the JsonElement
+     *
+     * @param json the source AttachmentCollectionPage's Json
+     * @param logger the logger
+     * @throws JsonParseException the parse exception
+     * @return    the deserialized AttachmentCollectionPage
+     */
+	public static AttachmentCollectionPage deserialize(final JsonElement json, final ILogger logger) throws JsonParseException {
+		if (json == null) {
+			return null;
+		}
+		final BaseAttachmentCollectionResponse response = new BaseAttachmentCollectionResponse();
+		serializer = new DefaultSerializer(logger);
+		final JsonObject[] sourceArray = serializer.deserializeObject(json.toString(), JsonObject[].class);
+		final Attachment[] array = new Attachment[sourceArray.length];
+		for (int i = 0; i < sourceArray.length; i++) {
+			array[i] = serializer.deserializeObject(sourceArray[i].toString(), Attachment.class);
+			array[i].setRawObject(serializer, sourceArray[i]);
+		}
+		response.value = Arrays.asList(array);
+		return new AttachmentCollectionPage(response, null);
+	}
+}

src/main/java/com/microsoft/graph/serializer/GsonFactory.java

@@ -33,6 +33,7 @@
 import com.google.gson.JsonSerializer;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.models.extensions.DateOnly;
+import com.microsoft.graph.requests.extensions.AttachmentCollectionPage;
 
 import java.lang.reflect.Type;
 import java.text.ParseException;
@@ -209,6 +210,25 @@ public Duration deserialize(final JsonElement json,
                 }
             }
         };
+        
+        final JsonSerializer<AttachmentCollectionPage> attachmentCollectionPageSerializer = new JsonSerializer<AttachmentCollectionPage>() {
+            @Override
+            public JsonElement serialize(final AttachmentCollectionPage src,
+                                         final Type typeOfSrc,
+                                         final JsonSerializationContext context) {
+            	return AttachmentCollectionPageSerializer.serialize(src, logger);
+            }
+        };
+
+        final JsonDeserializer<AttachmentCollectionPage> attachmentCollectionPageDeserializer = new JsonDeserializer<AttachmentCollectionPage>() {
+            @Override
+            public AttachmentCollectionPage deserialize(final JsonElement json,
+                                        final Type typeOfT,
+                                        final JsonDeserializationContext context) throws JsonParseException {
+                return AttachmentCollectionPageSerializer.deserialize(json, logger);
+            }
+        };
+        
         return new GsonBuilder()
                 .excludeFieldsWithoutExposeAnnotation()
                 .registerTypeAdapter(Calendar.class, calendarJsonSerializer)
@@ -223,6 +243,8 @@ public Duration deserialize(final JsonElement json,
                 .registerTypeAdapter(EnumSet.class, enumSetJsonDeserializer)
                 .registerTypeAdapter(Duration.class, durationJsonSerializer)
                 .registerTypeAdapter(Duration.class, durationJsonDeserializer)
+                .registerTypeAdapter(AttachmentCollectionPage.class, attachmentCollectionPageSerializer)
+                .registerTypeAdapter(AttachmentCollectionPage.class, attachmentCollectionPageDeserializer)
                 .registerTypeAdapterFactory(new FallbackTypeAdapterFactory(logger))
                 .create();
     }

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

@@ -3,7 +3,12 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.Duration;
@@ -12,16 +17,26 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
+import com.microsoft.graph.models.extensions.Attendee;
 //import com.microsoft.graph.extensions.IDirectoryDeletedItemsCollectionPage;
 import com.microsoft.graph.models.extensions.AttendeeBase;
+import com.microsoft.graph.models.extensions.Contact;
+import com.microsoft.graph.models.extensions.DateTimeTimeZone;
 import com.microsoft.graph.models.extensions.EmailAddress;
+import com.microsoft.graph.models.extensions.Event;
+import com.microsoft.graph.models.extensions.FileAttachment;
+import com.microsoft.graph.models.extensions.ItemAttachment;
+import com.microsoft.graph.models.extensions.ItemBody;
 import com.microsoft.graph.models.extensions.MeetingTimeSuggestionsResult;
 import com.microsoft.graph.models.extensions.Message;
 import com.microsoft.graph.models.extensions.Recipient;
 import com.microsoft.graph.models.extensions.User;
+import com.microsoft.graph.models.generated.BodyType;
 import com.microsoft.graph.options.QueryOption;
+import com.microsoft.graph.requests.extensions.AttachmentCollectionPage;
 import com.microsoft.graph.requests.extensions.IMessageCollectionPage;
 import com.microsoft.graph.requests.extensions.IUserCollectionPage;
+import com.microsoft.graph.requests.generated.BaseAttachmentCollectionResponse;
 
 @Ignore
 public class OutlookTests {
@@ -105,4 +120,134 @@ public void testSendDraft() {
     	IMessageCollectionPage mcp = testBase.graphClient.me().messages().buildRequest(options).get();
     	assertFalse(mcp.getCurrentPage().isEmpty());
     }
+    
+    @Test
+    public void sendEmailWithAttachment() throws Exception{
+    	TestBase testBase = new TestBase();
+    	Message message = getMessage();
+    	message.hasAttachments = true;
+    	BaseAttachmentCollectionResponse response = new BaseAttachmentCollectionResponse();
+    	response.value = Arrays.asList(getFileAttachment(),getItemAttachmentWithEvent(),getItemAttachmentWithContact());
+		message.attachments = new AttachmentCollectionPage(response, null);
+		testBase.graphClient.me().sendMail(message, true).buildRequest().post();
+    }
+
+    @Test
+    public void uploadEmailAsDraftWithAttachmentThenSend() {
+    	TestBase testBase = new TestBase();
+    	Message message = getMessage();
+    	Message m = testBase.graphClient.me().messages().buildRequest().post(message);
+    	assertNotNull(m);
+		testBase.graphClient.me().messages(m.id).send().buildRequest().post();
+    }
+
+    @Test
+    public void sendEventWithAttachment() throws Exception{
+    	TestBase testBase = new TestBase();
+    	Event event = getEvent();
+		event.body = getItemBody();
+		event.hasAttachments = true;
+		BaseAttachmentCollectionResponse response = new BaseAttachmentCollectionResponse();
+		response.value = Arrays.asList(getFileAttachment(),getItemAttachmentWithContact());
+		event.attachments = new AttachmentCollectionPage(response, null); 
+		Event eventResponse = testBase.graphClient.me().events().buildRequest().post(event);
+		assertNotNull(eventResponse);
+    }
+
+    private ItemBody getItemBody() {
+    	ItemBody itemBody = new ItemBody();
+		itemBody.content = "<html><head></head><body> test body </body></html>";
+		itemBody.contentType = BodyType.HTML;
+		return itemBody;
+    }
+
+    public Message getMessage() {
+		Message message = new Message();
+		java.util.List<String> emails = Arrays.asList("test_email@test_domain.com");
+		java.util.List<Recipient> listReceipient = new ArrayList<>();
+		for(String email : emails) {
+			EmailAddress emailAddress = new EmailAddress();
+			emailAddress.address = email;
+			Recipient recipient = new Recipient();
+			recipient.emailAddress = emailAddress;
+			listReceipient.add(recipient);
+		}
+		message.body = getItemBody();
+		message.toRecipients = listReceipient;
+		message.subject = "Test Message";
+		message.id = "1234";
+		return message;
+	}
+
+    private FileAttachment getFileAttachment() throws Exception{
+		FileAttachment fileAttachment = new FileAttachment();
+		fileAttachment.name = "document.pdf";
+		File pdfFile = new File("src/test/resources/document.pdf");
+		InputStream fileStream = new FileInputStream(pdfFile);
+		fileAttachment.contentBytes = getByteArray(fileStream);
+		fileAttachment.oDataType = "#microsoft.graph.fileAttachment";
+		fileAttachment.id="54321";
+		return fileAttachment;
+	}
+
+	private ItemAttachment getItemAttachmentWithEvent() {
+		ItemAttachment itemAttachmentEvent = new ItemAttachment();
+		itemAttachmentEvent.oDataType = "#microsoft.graph.itemAttachment";
+		itemAttachmentEvent.name = "event name";
+		itemAttachmentEvent.item = getEvent();
+		itemAttachmentEvent.item.oDataType = "microsoft.graph.event";
+        return itemAttachmentEvent;
+	}
+
+	private ItemAttachment getItemAttachmentWithContact() {
+		Contact contact = new Contact();
+        contact.displayName = "displayname";
+        contact.mobilePhone="123456890";
+		ItemAttachment itemAttachmentContact = new ItemAttachment();
+        itemAttachmentContact.oDataType = "#microsoft.graph.itemAttachment";
+        itemAttachmentContact.name = "Attachment name";
+        itemAttachmentContact.item = contact;
+        itemAttachmentContact.item.oDataType = "microsoft.graph.contact";
+        return itemAttachmentContact;
+	}
+
+	private Event getEvent() {
+		Event event = new Event();
+		java.util.List<String> emails = Arrays.asList("test_email@test_domain.com");
+		java.util.List<Attendee> attendees = new ArrayList<>();
+		for(String email : emails) {
+			EmailAddress emailAddress = new EmailAddress();
+			emailAddress.address = email;
+			Attendee attendee = new Attendee();
+			attendee.emailAddress = emailAddress;
+			attendees.add(attendee);
+		}
+		DateTimeTimeZone start = new DateTimeTimeZone();
+		start.timeZone = "UTC";
+		start.dateTime = "2018-10-16T06:15:26.544Z";
+		DateTimeTimeZone end = new DateTimeTimeZone();
+		end.timeZone = "UTC";
+		end.dateTime = "2018-11-18T07:30:26.544Z";
+		event.start = start;
+		event.end = end;
+		event.subject = "Test Event Subject";
+		event.id = "1234";
+		return event;
+	}
+
+	public byte[] getByteArray(InputStream in) {
+		try {
+			ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+			int nRead;
+			byte[] data = new byte[16384];
+			while ((nRead = in.read(data, 0, data.length)) != -1) {
+				buffer.write(data, 0, nRead);
+			}
+			buffer.flush();
+			return buffer.toByteArray();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
 }