Generated from 25309e914a29c0a123aa603e611dce5deba3c974

Merge remote-tracking branch 'upstream/master' into datrM
AzureSDKAutomation · May 6, 2020 · 38f19fd · 38f19fd
1 parent 0649c57
commit 38f19fd
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 36 deletions.
diff --git a/...va/com/microsoft/azure/management/desktopvirtualization/v2019_01_23_preview/HostPool.java b/...va/com/microsoft/azure/management/desktopvirtualization/v2019_01_23_preview/HostPool.java
@@ -154,7 +154,7 @@ interface WithFriendlyName {
         interface WithHostPoolType {
             /**
              * Specifies hostPoolType.
-             * @param hostPoolType HostPool type for desktop. Possible values include: 'Personal', 'Shared'
+             * @param hostPoolType HostPool type for desktop. Possible values include: 'Personal', 'Pooled'
              * @return the next definition stage
              */
             WithCreate withHostPoolType(HostPoolType hostPoolType);

diff --git a/...om/microsoft/azure/management/desktopvirtualization/v2019_01_23_preview/HostPoolType.java b/...om/microsoft/azure/management/desktopvirtualization/v2019_01_23_preview/HostPoolType.java
@@ -19,8 +19,8 @@ public final class HostPoolType extends ExpandableStringEnum<HostPoolType> {
     /** Static value Personal for HostPoolType. */
     public static final HostPoolType PERSONAL = fromString("Personal");
 
-    /** Static value Shared for HostPoolType. */
-    public static final HostPoolType SHARED = fromString("Shared");
+    /** Static value Pooled for HostPoolType. */
+    public static final HostPoolType POOLED = fromString("Pooled");
 
     /**
      * Creates or finds a HostPoolType from its string representation.

diff --git a/...icrosoft/azure/management/desktopvirtualization/v2019_01_23_preview/RegistrationInfo.java b/...icrosoft/azure/management/desktopvirtualization/v2019_01_23_preview/RegistrationInfo.java
@@ -28,10 +28,11 @@ public class RegistrationInfo {
     private String token;
 
     /**
-     * Update registration token.
+     * The type of resetting the token. Possible values include: 'Delete',
+     * 'None', 'Update'.
      */
-    @JsonProperty(value = "resetToken")
-    private Boolean resetToken;
+    @JsonProperty(value = "registrationTokenOperation")
+    private RegistrationTokenOperation registrationTokenOperation;
 
     /**
      * Get expiration time of registration token.
@@ -74,22 +75,22 @@ public RegistrationInfo withToken(String token) {
     }
 
     /**
-     * Get update registration token.
+     * Get the type of resetting the token. Possible values include: 'Delete', 'None', 'Update'.
      *
-     * @return the resetToken value
+     * @return the registrationTokenOperation value
      */
-    public Boolean resetToken() {
-        return this.resetToken;
+    public RegistrationTokenOperation registrationTokenOperation() {
+        return this.registrationTokenOperation;
     }
 
     /**
-     * Set update registration token.
+     * Set the type of resetting the token. Possible values include: 'Delete', 'None', 'Update'.
      *
-     * @param resetToken the resetToken value to set
+     * @param registrationTokenOperation the registrationTokenOperation value to set
      * @return the RegistrationInfo object itself.
      */
-    public RegistrationInfo withResetToken(Boolean resetToken) {
-        this.resetToken = resetToken;
+    public RegistrationInfo withRegistrationTokenOperation(RegistrationTokenOperation registrationTokenOperation) {
+        this.registrationTokenOperation = registrationTokenOperation;
         return this;
     }
 

diff --git a/...oft/azure/management/desktopvirtualization/v2019_01_23_preview/RegistrationInfoPatch.java b/...oft/azure/management/desktopvirtualization/v2019_01_23_preview/RegistrationInfoPatch.java
@@ -15,28 +15,29 @@
  */
 public class RegistrationInfoPatch {
     /**
-     * Update registration token.
+     * The type of resetting the token. Possible values include: 'Delete',
+     * 'None', 'Update'.
      */
-    @JsonProperty(value = "resetToken")
-    private Boolean resetToken;
+    @JsonProperty(value = "registrationTokenOperation")
+    private RegistrationTokenOperation registrationTokenOperation;
 
     /**
-     * Get update registration token.
+     * Get the type of resetting the token. Possible values include: 'Delete', 'None', 'Update'.
      *
-     * @return the resetToken value
+     * @return the registrationTokenOperation value
      */
-    public Boolean resetToken() {
-        return this.resetToken;
+    public RegistrationTokenOperation registrationTokenOperation() {
+        return this.registrationTokenOperation;
     }
 
     /**
-     * Set update registration token.
+     * Set the type of resetting the token. Possible values include: 'Delete', 'None', 'Update'.
      *
-     * @param resetToken the resetToken value to set
+     * @param registrationTokenOperation the registrationTokenOperation value to set
      * @return the RegistrationInfoPatch object itself.
      */
-    public RegistrationInfoPatch withResetToken(Boolean resetToken) {
-        this.resetToken = resetToken;
+    public RegistrationInfoPatch withRegistrationTokenOperation(RegistrationTokenOperation registrationTokenOperation) {
+        this.registrationTokenOperation = registrationTokenOperation;
         return this;
     }
 

diff --git a/...zure/management/desktopvirtualization/v2019_01_23_preview/RegistrationTokenOperation.java b/...zure/management/desktopvirtualization/v2019_01_23_preview/RegistrationTokenOperation.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.desktopvirtualization.v2019_01_23_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for RegistrationTokenOperation.
+ */
+public final class RegistrationTokenOperation extends ExpandableStringEnum<RegistrationTokenOperation> {
+    /** Static value Delete for RegistrationTokenOperation. */
+    public static final RegistrationTokenOperation DELETE = fromString("Delete");
+
+    /** Static value None for RegistrationTokenOperation. */
+    public static final RegistrationTokenOperation NONE = fromString("None");
+
+    /** Static value Update for RegistrationTokenOperation. */
+    public static final RegistrationTokenOperation UPDATE = fromString("Update");
+
+    /**
+     * Creates or finds a RegistrationTokenOperation from its string representation.
+     * @param name a name to look for
+     * @return the corresponding RegistrationTokenOperation
+     */
+    @JsonCreator
+    public static RegistrationTokenOperation fromString(String name) {
+        return fromString(name, RegistrationTokenOperation.class);
+    }
+
+    /**
+     * @return known RegistrationTokenOperation values
+     */
+    public static Collection<RegistrationTokenOperation> values() {
+        return values(RegistrationTokenOperation.class);
+    }
+}
diff --git a/...ement/desktopvirtualization/v2019_01_23_preview/implementation/ApplicationGroupInner.java b/...ement/desktopvirtualization/v2019_01_23_preview/implementation/ApplicationGroupInner.java
@@ -11,14 +11,12 @@
 import com.microsoft.azure.management.desktopvirtualization.v2019_01_23_preview.ApplicationGroupType;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
-import com.microsoft.rest.SkipParentValidation;
 import com.microsoft.azure.Resource;
 
 /**
  * Represents a ApplicationGroup definition.
  */
 @JsonFlatten
-@SkipParentValidation
 public class ApplicationGroupInner extends Resource {
     /**
      * Description of ApplicationGroup.

diff --git a/...virtualization/v2019_01_23_preview/implementation/DesktopVirtualizationAPIClientImpl.java b/...virtualization/v2019_01_23_preview/implementation/DesktopVirtualizationAPIClientImpl.java
@@ -306,7 +306,7 @@ public DesktopVirtualizationAPIClientImpl(RestClient restClient) {
     }
 
     protected void initialize() {
-        this.apiVersion = "2019-01-23-preview";
+        this.apiVersion = "2019-12-10-preview";
         this.acceptLanguage = "en-US";
         this.longRunningOperationRetryTimeout = 30;
         this.generateClientRequestId = true;
@@ -331,6 +331,6 @@ protected void initialize() {
      */
     @Override
     public String userAgent() {
-        return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "DesktopVirtualizationAPIClient", "2019-01-23-preview");
+        return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "DesktopVirtualizationAPIClient", "2019-12-10-preview");
     }
 }
diff --git a/...re/management/desktopvirtualization/v2019_01_23_preview/implementation/HostPoolInner.java b/...re/management/desktopvirtualization/v2019_01_23_preview/implementation/HostPoolInner.java
@@ -15,14 +15,12 @@
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
-import com.microsoft.rest.SkipParentValidation;
 import com.microsoft.azure.Resource;
 
 /**
  * Represents a HostPool definition.
  */
 @JsonFlatten
-@SkipParentValidation
 public class HostPoolInner extends Resource {
     /**
      * Friendly name of HostPool.
@@ -38,7 +36,7 @@ public class HostPoolInner extends Resource {
 
     /**
      * HostPool type for desktop. Possible values include: 'Personal',
-     * 'Shared'.
+     * 'Pooled'.
      */
     @JsonProperty(value = "properties.hostPoolType")
     private HostPoolType hostPoolType;
@@ -146,7 +144,7 @@ public HostPoolInner withDescription(String description) {
     }
 
     /**
-     * Get hostPool type for desktop. Possible values include: 'Personal', 'Shared'.
+     * Get hostPool type for desktop. Possible values include: 'Personal', 'Pooled'.
      *
      * @return the hostPoolType value
      */
@@ -155,7 +153,7 @@ public HostPoolType hostPoolType() {
     }
 
     /**
-     * Set hostPool type for desktop. Possible values include: 'Personal', 'Shared'.
+     * Set hostPool type for desktop. Possible values include: 'Personal', 'Pooled'.
      *
      * @param hostPoolType the hostPoolType value to set
      * @return the HostPoolInner object itself.

diff --git a/...e/management/desktopvirtualization/v2019_01_23_preview/implementation/WorkspaceInner.java b/...e/management/desktopvirtualization/v2019_01_23_preview/implementation/WorkspaceInner.java
@@ -11,14 +11,12 @@
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
-import com.microsoft.rest.SkipParentValidation;
 import com.microsoft.azure.Resource;
 
 /**
  * Represents a Workspace definition.
  */
 @JsonFlatten
-@SkipParentValidation
 public class WorkspaceInner extends Resource {
     /**
      * Description of Workspace.