Merge pull request #59 from microsoftgraph/bugfix

Update models for r1 metadata

Author: Caitlin Bales (MSFT)

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

@@ -63,7 +63,7 @@ public void testGetFindMeetingTimes() {
             tenantUser = users.getCurrentPage().get(1);
         }
 
-        List<AttendeeBase> attendees = new ArrayList<>();
+        ArrayList<AttendeeBase> attendees = new ArrayList<AttendeeBase>();
         AttendeeBase attendeeBase = new AttendeeBase();
         EmailAddress email = new EmailAddress();
         email.address = tenantUser.mail;

graphsdk/src/main/java/com/microsoft/graph/extensions/DriveItemCreateLinkRequestBuilder.java

@@ -29,7 +29,7 @@ public class DriveItemCreateLinkRequestBuilder extends BaseDriveItemCreateLinkRe
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public DriveItemCreateLinkRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<Option> requestOptions, final String scope, final String type) {
-        super(requestUrl, client, requestOptions, scope, type);
+    public DriveItemCreateLinkRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<Option> requestOptions, final String type, final String scope) {
+        super(requestUrl, client, requestOptions, type, scope);
     }
 }

graphsdk/src/main/java/com/microsoft/graph/generated/BaseDriveItemCreateLinkBody.java

@@ -26,20 +26,20 @@
 public class BaseDriveItemCreateLinkBody {
 
     /**
-     * The scope.
+     * The type.
 	 * 
      */
-    @SerializedName("scope")
+    @SerializedName("type")
     @Expose
-    public String scope;
+    public String type;
 
     /**
-     * The type.
+     * The scope.
 	 * 
      */
-    @SerializedName("type")
+    @SerializedName("scope")
     @Expose
-    public String type;
+    public String scope;
 
 
     /**

graphsdk/src/main/java/com/microsoft/graph/generated/BaseDriveItemCreateLinkRequestBuilder.java

@@ -28,10 +28,10 @@ public class BaseDriveItemCreateLinkRequestBuilder extends BaseActionRequestBuil
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public BaseDriveItemCreateLinkRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<Option> requestOptions, final String scope, final String type) {
+    public BaseDriveItemCreateLinkRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<Option> requestOptions, final String type, final String scope) {
         super(requestUrl, client, requestOptions);
-        mBodyParams.put("scope", scope);
         mBodyParams.put("type", type);
+        mBodyParams.put("scope", scope);
     }
 
     /**
@@ -56,14 +56,14 @@ public IDriveItemCreateLinkRequest buildRequest(final java.util.List<Option> req
                 requestOptions
         );
 
-        if (hasParameter("scope")) {
-            request.mBody.scope = getParameter("scope");
-        }
-
         if (hasParameter("type")) {
             request.mBody.type = getParameter("type");
         }
 
+        if (hasParameter("scope")) {
+            request.mBody.scope = getParameter("scope");
+        }
+
         return request;
     }
 }

graphsdk/src/main/java/com/microsoft/graph/generated/BaseDriveItemRequestBuilder.java

@@ -84,15 +84,15 @@ public IDriveItemCopyRequestBuilder getCopy(final String name, final ItemReferen
         return new DriveItemCopyRequestBuilder(getRequestUrlWithAdditionalSegment("microsoft.graph.copy"), getClient(), null, name, parentReference);
     }
 
-    public IDriveItemCreateLinkRequestBuilder getCreateLink(final String scope, final String type) {
-        return new DriveItemCreateLinkRequestBuilder(getRequestUrlWithAdditionalSegment("microsoft.graph.createLink"), getClient(), null, scope, type);
+    public IDriveItemCreateLinkRequestBuilder getCreateLink(final String type, final String scope) {
+        return new DriveItemCreateLinkRequestBuilder(getRequestUrlWithAdditionalSegment("microsoft.graph.createLink"), getClient(), null, type, scope);
     }
 
     public IDriveItemCreateUploadSessionRequestBuilder getCreateUploadSession(final DriveItemUploadableProperties item) {
         return new DriveItemCreateUploadSessionRequestBuilder(getRequestUrlWithAdditionalSegment("microsoft.graph.createUploadSession"), getClient(), null, item);
     }
 
-    public IDriveItemInviteCollectionRequestBuilder getInvite(final String message, final java.util.List<DriveRecipient> recipients, final Boolean requireSignIn, final java.util.List<String> roles, final Boolean sendInvitation) {
+    public IDriveItemInviteCollectionRequestBuilder getInvite(final Boolean requireSignIn, final java.util.List<String> roles, final Boolean sendInvitation, final String message, final java.util.List<DriveRecipient> recipients) {
         return new DriveItemInviteCollectionRequestBuilder(getRequestUrlWithAdditionalSegment("microsoft.graph.invite"), getClient(), null, message, recipients, requireSignIn, roles, sendInvitation);
     }
 

graphsdk/src/main/java/com/microsoft/graph/generated/BaseOnenotePageRequestBuilder.java

@@ -62,12 +62,8 @@ public INotebookRequestBuilder getParentNotebook() {
         return new NotebookRequestBuilder(getRequestUrlWithAdditionalSegment("parentNotebook"), getClient(), null);
     }
 
-    public IOnenotePageStreamRequestBuilder getMsgraph_Content() {
-        return new OnenotePageStreamRequestBuilder(getRequestUrlWithAdditionalSegment("content"), getClient(), null);
-    }
-
     public IOnenotePageStreamRequestBuilder getContent() {
-        return new OnenotePageStreamRequestBuilder(getRequestUrlWithAdditionalSegment("$value"), getClient(), null);
+        return new OnenotePageStreamRequestBuilder(getRequestUrlWithAdditionalSegment("content"), getClient(), null);
     }
 
     public IOnenotePageOnenotePatchContentRequestBuilder getOnenotePatchContent(final java.util.List<OnenotePatchContentCommand> commands) {

graphsdk/src/main/java/com/microsoft/graph/generated/BaseOnenotePageStreamRequestBuilder.java

@@ -23,7 +23,7 @@
 public class BaseOnenotePageStreamRequestBuilder extends BaseRequestBuilder implements IBaseOnenotePageStreamRequestBuilder {
 
     /**
-     * The request builder for the OnenotePage
+     * The request builder for the OnenotePageStream
      *
      * @param requestUrl The request url
      * @param client The service client
@@ -41,41 +41,10 @@ public IOnenotePageStreamRequest buildRequest() {
     }
 
     /**
-     * Creates the request with specific options instead of the existing options
+     * Creates the request with specific requestOptions instead of the existing requestOptions
      */
     public IOnenotePageStreamRequest buildRequest(final java.util.List<Option> requestOptions) {
         return new OnenotePageStreamRequest(getRequestUrl(), getClient(), requestOptions);
     }
 
-    /**
-     * Gets the request builder for OnenoteSection.
-     */
-    public IOnenoteSectionRequestBuilder getParentSection() {
-        return new OnenoteSectionRequestBuilder(getRequestUrlWithAdditionalSegment("parentSection"), getClient(), null);
-    }
-
-    /**
-     * Gets the request builder for Notebook.
-     */
-    public INotebookRequestBuilder getParentNotebook() {
-        return new NotebookRequestBuilder(getRequestUrlWithAdditionalSegment("parentNotebook"), getClient(), null);
-    }
-
-    public IOnenotePageStreamRequestBuilder getContent() {
-        return new OnenotePageStreamRequestBuilder(getRequestUrlWithAdditionalSegment("content"), getClient(), null);
-    }
-
-
-
-    public IOnenotePageOnenotePatchContentRequestBuilder getOnenotePatchContent(final java.util.List<OnenotePatchContentCommand> commands) {
-        return new OnenotePageOnenotePatchContentRequestBuilder(getRequestUrlWithAdditionalSegment("microsoft.graph.onenotePatchContent"), getClient(), null, commands);
-    }
-
-    public IOnenotePageCopyToSectionRequestBuilder getCopyToSection(final String id, final String groupId) {
-        return new OnenotePageCopyToSectionRequestBuilder(getRequestUrlWithAdditionalSegment("microsoft.graph.copyToSection"), getClient(), null, id, groupId);
-    }
-
-    public IOnenotePagePreviewRequestBuilder getPreview() {
-        return new OnenotePagePreviewRequestBuilder(getRequestUrlWithAdditionalSegment("microsoft.graph.preview"), getClient(), null);
-    }
 }

graphsdk/src/main/java/com/microsoft/graph/generated/BaseOnenoteResourceStreamRequestBuilder.java

@@ -23,7 +23,7 @@
 public class BaseOnenoteResourceStreamRequestBuilder extends BaseRequestBuilder implements IBaseOnenoteResourceStreamRequestBuilder {
 
     /**
-     * The request builder for the OnenoteResource
+     * The request builder for the OnenoteResourceStream
      *
      * @param requestUrl The request url
      * @param client The service client
@@ -41,15 +41,10 @@ public IOnenoteResourceStreamRequest buildRequest() {
     }
 
     /**
-     * Creates the request with specific options instead of the existing options
+     * Creates the request with specific requestOptions instead of the existing requestOptions
      */
     public IOnenoteResourceStreamRequest buildRequest(final java.util.List<Option> requestOptions) {
         return new OnenoteResourceStreamRequest(getRequestUrl(), getClient(), requestOptions);
     }
 
-    public IOnenoteResourceStreamRequestBuilder getContent() {
-        return new OnenoteResourceStreamRequestBuilder(getRequestUrlWithAdditionalSegment("content"), getClient(), null);
-    }
-
-
 }

graphsdk/src/main/java/com/microsoft/graph/generated/IBaseDriveItemRequestBuilder.java

@@ -50,10 +50,10 @@ public interface IBaseDriveItemRequestBuilder extends IRequestBuilder {
 
     IDriveItemStreamRequestBuilder getContent();
     IDriveItemCopyRequestBuilder getCopy(final String name, final ItemReference parentReference);
-    IDriveItemCreateLinkRequestBuilder getCreateLink(final String scope, final String type);
+    IDriveItemCreateLinkRequestBuilder getCreateLink(final String type, final String scope);
     IDriveItemCreateUploadSessionRequestBuilder getCreateUploadSession(final DriveItemUploadableProperties item);
 
-    IDriveItemInviteCollectionRequestBuilder getInvite(final String message, final java.util.List<DriveRecipient> recipients, final Boolean requireSignIn, final java.util.List<String> roles, final Boolean sendInvitation);
+    IDriveItemInviteCollectionRequestBuilder getInvite(final Boolean requireSignIn, final java.util.List<String> roles, final Boolean sendInvitation, final String message, final java.util.List<DriveRecipient> recipients);
 
     IDriveItemDeltaCollectionRequestBuilder getDelta(final String token);
 

graphsdk/src/main/java/com/microsoft/graph/generated/IBaseOnenotePageRequestBuilder.java

@@ -41,8 +41,6 @@ public interface IBaseOnenotePageRequestBuilder extends IRequestBuilder {
      */
     INotebookRequestBuilder getParentNotebook();
 
-    IOnenotePageStreamRequestBuilder getMsgraph_Content();
-
     IOnenotePageStreamRequestBuilder getContent();
     IOnenotePageOnenotePatchContentRequestBuilder getOnenotePatchContent(final java.util.List<OnenotePatchContentCommand> commands);
     IOnenotePageCopyToSectionRequestBuilder getCopyToSection(final String id, final String groupId);