Merge remote-tracking branch 'refs/remotes/origin/dev' into caitbal/working

Author: Caitlin Bales (MSFT)

README.md

@@ -87,6 +87,8 @@ For a more detailed documentation see:
 * [Handling Open Types, PATCH support with `null` values](docs/opentypes.md)
 * [Collections](docs/collections.md)
 * [Errors](docs/errors.md)
+* [Making Custom Requests](docs/custom-queries.md)
+* [Known Issues](docs/known-issues.md)
 * [Contributions](docs/contributions.md)
 
 ## 5. Issues

docs/custom-queries.md

@@ -1,6 +1,6 @@
 # Making Custom Calls to Graph
 
-The Graph SDK attempts to enable all available scenarios through Microsoft Graph. There are times, however, through errors or custom Graph functionality, that makes calling the desired endpoint is not possible through the provided requests and builders.
+The Graph SDK attempts to enable all available scenarios through Microsoft Graph. There are times, however, through errors or custom Graph functionality, that makes calling the desired endpoint not possible through the provided requests and builders.
 
 ## Creating a custom request
 You can extend BaseRequest to create a custom request:

docs/known-issues.md

@@ -1,5 +1,5 @@
 # Known Issues
-Because of our close partnership with workload teams who surface API functionality through Graph, it is not always appropriate or feasible to introduce fixes to missing or broken functionality.
+The Graph library is a snapshot of the Microsoft Graph and may not be in sync with the current service. Because this library is generated, the generator may fail to address all potential scenarios in the Graph. Furthermore, service behavior changes may not be reflected in the library as the development of the library and the Microsoft Graph are loosely coupled.
 
 ## No Annotation Support
 [OData](http://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/part3-csdl/odata-v4.0-errata03-os-part3-csdl-complete.html#_Toc453752630) allows workloads to specify additional information about their API surface including both functional and non-functional stipulations. We currently do not support these annotations in the [Generator](https://github.com/microsoftgraph/MSGraph-SDK-Code-Generator), due to hierarchical inheritance issues regarding said annotations. Therefore, there may be methods that do not produce valid queries to Graph. Please refer to the [Graph Docs](https://developer.microsoft.com/en-us/graph/docs/concepts/overview) as the source of truth in these discrepancies.

graphsdk/src/androidTest/java/com/microsoft/graph/functional/OutlookTests.java

@@ -10,6 +10,16 @@
 
 import org.junit.Test;
 
+//import com.microsoft.graph.extensions.IDirectoryDeletedItemsCollectionPage;
+import com.microsoft.graph.extensions.*;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
+import java.lang.reflect.Array;
+
 import java.util.ArrayList;
 
 @Suppress
@@ -38,4 +48,34 @@ public void testSendMail() {
         message.toRecipients = recipients;
         testBase.graphClient.getMe().getSendMail(message, true).buildRequest().post();
     }
+
+    @Test
+    public void testGetFindMeetingTimes() {
+        TestBase testBase = new TestBase();
+
+        // Get the first user in the tenant
+        User me = testBase.graphClient.getMe().buildRequest().get();
+        IUserCollectionPage users = testBase.graphClient.getUsers().buildRequest().get();
+        User tenantUser = users.getCurrentPage().get(0);
+
+        //Ensure that the user grabbed is not the logged-in user
+        if (tenantUser.mail.equals(me.mail)) {
+            tenantUser = users.getCurrentPage().get(1);
+        }
+
+        List<AttendeeBase> attendees = new ArrayList<>();
+        AttendeeBase attendeeBase = new AttendeeBase();
+        EmailAddress email = new EmailAddress();
+        email.address = tenantUser.mail;
+        attendeeBase.emailAddress = email;
+        attendees.add(attendeeBase);
+        try {
+            Duration duration = DatatypeFactory.newInstance().newDuration("PT30M");
+            MeetingTimeSuggestionsResult result = testBase.graphClient.getMe().getFindMeetingTimes(attendees, null, null, duration, 10, true, false, 10.0).buildRequest().post();
+            assertNotNull(result);
+        } catch (Exception e) {
+            Assert.fail("Duration could not be created from String");
+        }
+
+    }
 }

graphsdk/src/androidTest/java/com/microsoft/graph/serializer/DurationTests.java

@@ -2,17 +2,18 @@
 
 import android.test.AndroidTestCase;
 
+import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.Duration;
 
 public class DurationTests extends AndroidTestCase {
 
     public void testDurationSerializer() throws Exception {
-        String strDuration = org.apache.xerces.jaxp.datatype.DatatypeFactoryImpl.newInstance().newDurationDayTime(true, 0, 2, 30, 0).toString();
+        String strDuration = DatatypeFactory.newInstance().newDurationDayTime(true, 0, 2, 30, 0).toString();
         assertEquals("P0DT2H30M0S", strDuration);
     }
 
     public void testDurationDeserializer() throws Exception {
-        Duration duration = org.apache.xerces.jaxp.datatype.DatatypeFactoryImpl.newInstance().newDurationDayTime(true, 0, 1, 30, 45);
+        Duration duration = DatatypeFactory.newInstance().newDurationDayTime(true, 0, 1, 30, 45);
         assertEquals(0, duration.getMonths());
         assertEquals(0, duration.getDays());
         assertEquals(1, duration.getHours());

graphsdk/src/main/java/com/microsoft/graph/http/DefaultHttpProvider.java

@@ -302,6 +302,7 @@ private <Result, Body, DeserializeType> Result sendRequestInternal(final IHttpRe
 
                 if (connection.getResponseCode() == HttpResponseCode.HTTP_ACCEPTED) {
                     mLogger.logDebug("Handling accepted response");
+                    return null;
                 }
 
                 in = new BufferedInputStream(connection.getInputStream());

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

@@ -40,6 +40,9 @@
 import java.util.EnumSet;
 import java.util.GregorianCalendar;
 
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
+
 /**
  * Produce Gson instances that can parse http responses.
  */
@@ -183,6 +186,28 @@ public EnumSet deserialize(final JsonElement json,
             }
         };
 
+        final JsonSerializer<Duration> durationJsonSerializer = new JsonSerializer<Duration>() {
+            @Override
+            public JsonElement serialize(final Duration src,
+                                         final Type typeOfSrc,
+                                         final JsonSerializationContext context) {
+                return new JsonPrimitive(src.toString());
+            }
+        };
+
+        final JsonDeserializer<Duration> durationJsonDeserializer = new JsonDeserializer<Duration>() {
+            @Override
+            public Duration deserialize(final JsonElement json,
+                                       final Type typeOfT,
+                                       final JsonDeserializationContext context) throws JsonParseException {
+                try {
+                    return DatatypeFactory.newInstance().newDuration(json.toString());
+                } catch (Exception e) {
+                    return null;
+                }
+            }
+        };
+
         return new GsonBuilder()
                 .excludeFieldsWithoutExposeAnnotation()
                 .registerTypeAdapter(Calendar.class, calendarJsonSerializer)
@@ -195,6 +220,8 @@ public EnumSet deserialize(final JsonElement json,
                 .registerTypeAdapter(DateOnly.class, dateJsonDeserializer)
                 .registerTypeAdapter(EnumSet.class, enumSetJsonSerializer)
                 .registerTypeAdapter(EnumSet.class, enumSetJsonDeserializer)
+                .registerTypeAdapter(Duration.class, durationJsonSerializer)
+                .registerTypeAdapter(Duration.class, durationJsonDeserializer)
                 .registerTypeAdapterFactory(new FallBackEnumTypeAdapter())
                 .create();
     }