mgmt, regen to sync appservice to service spec bug fix (#41451)

Azure · Aug 7, 2024 · 1df9a5d · 1df9a5d
1 parent 0ad196e
commit 1df9a5d
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 112 deletions.
diff --git a/eng/code-quality-reports/src/main/resources/revapi/revapi.json b/eng/code-quality-reports/src/main/resources/revapi/revapi.json
@@ -267,34 +267,6 @@
           "new": "method java.lang.String com.azure.spring.cloud.core.provider.AzureProfileOptionsProvider.AzureEnvironmentOptions::getServiceBusDomainName()",
           "justification": "support configuration of Service Bus domain name."
         },
-        {
-          "code": "java.method.removed",
-          "old": "method com.azure.resourcemanager.compute.models.VirtualMachineScaleSetIpConfiguration com.azure.resourcemanager.compute.models.VirtualMachineScaleSetIpConfiguration::withId(java.lang.String)",
-          "justification": "Break by service. 'id' is previously not used in runtime."
-        },
-        {
-          "code": "java.class.noLongerInheritsFromClass",
-          "old": "class com.azure.resourcemanager.compute.models.VirtualMachineScaleSetIpConfiguration",
-          "new": "class com.azure.resourcemanager.compute.models.VirtualMachineScaleSetIpConfiguration",
-          "justification": "Break by service. 'id' is previously not used in runtime. And customer unlikely to use this class as subclass of 'SubResource'."
-        },
-        {
-          "code": "java.method.removed",
-          "old": "method com.azure.resourcemanager.compute.models.VirtualMachineScaleSetNetworkConfiguration com.azure.resourcemanager.compute.models.VirtualMachineScaleSetNetworkConfiguration::withId(java.lang.String)",
-          "justification": "Break by service. 'id' is previously not used in runtime."
-        },
-        {
-          "code": "java.class.noLongerInheritsFromClass",
-          "old": "class com.azure.resourcemanager.compute.models.VirtualMachineScaleSetNetworkConfiguration",
-          "new": "class com.azure.resourcemanager.compute.models.VirtualMachineScaleSetNetworkConfiguration",
-          "justification": "Break by service. 'id' is previously not used in runtime. And customer unlikely to use this class as subclass of 'SubResource'."
-        },
-        {
-          "code": "java.class.nowFinal",
-          "old": "class com.azure.resourcemanager.network.models.ManagedServiceIdentity",
-          "new": "class com.azure.resourcemanager.network.models.ManagedServiceIdentity",
-          "justification": "Make the class final. User is unlikely to inherit from this class."
-        },
         {
           "ignore": true,
           "code": "java.field.constantValueChanged",
@@ -472,36 +444,6 @@
           "old": ".*? com\\.azure\\.communication\\.messages\\.models.*",
           "justification": "Jackson annotation changed."
         },
-        {
-          "code": "java.method.removed",
-          "old": "method java.lang.Integer com.azure.resourcemanager.cosmos.models.ServiceResourceCreateUpdateParameters::instanceCount()",
-          "justification": "The property flatten disabled due to model changed to polymorphic."
-        },
-        {
-          "code": "java.method.removed",
-          "old": "method com.azure.resourcemanager.cosmos.models.ServiceSize com.azure.resourcemanager.cosmos.models.ServiceResourceCreateUpdateParameters::instanceSize()",
-          "justification": "The property flatten disabled due to model changed to polymorphic."
-        },
-        {
-          "code": "java.method.removed",
-          "old": "method com.azure.resourcemanager.cosmos.models.ServiceType com.azure.resourcemanager.cosmos.models.ServiceResourceCreateUpdateParameters::serviceType()",
-          "justification": "The property flatten disabled due to model changed to polymorphic."
-        },
-        {
-          "code": "java.method.removed",
-          "old": "method com.azure.resourcemanager.cosmos.models.ServiceResourceCreateUpdateParameters com.azure.resourcemanager.cosmos.models.ServiceResourceCreateUpdateParameters::withInstanceCount(java.lang.Integer)",
-          "justification": "The property flatten disabled due to model changed to polymorphic."
-        },
-        {
-          "code": "java.method.removed",
-          "old": "method com.azure.resourcemanager.cosmos.models.ServiceResourceCreateUpdateParameters com.azure.resourcemanager.cosmos.models.ServiceResourceCreateUpdateParameters::withInstanceSize(com.azure.resourcemanager.cosmos.models.ServiceSize)",
-          "justification": "The property flatten disabled due to model changed to polymorphic."
-        },
-        {
-          "code": "java.method.removed",
-          "old": "method com.azure.resourcemanager.cosmos.models.ServiceResourceCreateUpdateParameters com.azure.resourcemanager.cosmos.models.ServiceResourceCreateUpdateParameters::withServiceType(com.azure.resourcemanager.cosmos.models.ServiceType)",
-          "justification": "The property flatten disabled due to model changed to polymorphic."
-        },
         {
           "regex": true,
           "code" : "java\\.annotation\\.removed",
@@ -565,33 +507,6 @@
           "new" : "class com.azure.resourcemanager.(eventhubs|servicebus).models.UserAssignedIdentity",
           "justification": "Class is now final."
         },
-        {
-          "code" : "java.method.returnTypeTypeParametersChanged",
-          "old" : "method java.util.List<com.azure.resourcemanager.compute.fluent.models.VirtualMachineExtensionInner> com.azure.resourcemanager.compute.models.SecurityPostureReference::excludeExtensions()",
-          "new" : "method java.util.List<java.lang.String> com.azure.resourcemanager.compute.models.SecurityPostureReference::excludeExtensions()",
-          "justification": "Service breaks but no customer onboard."
-        },
-        {
-          "code" : "java.method.parameterTypeParameterChanged",
-          "old" : "parameter com.azure.resourcemanager.compute.models.SecurityPostureReference com.azure.resourcemanager.compute.models.SecurityPostureReference::withExcludeExtensions(===java.util.List<com.azure.resourcemanager.compute.fluent.models.VirtualMachineExtensionInner>===)",
-          "new" : "parameter com.azure.resourcemanager.compute.models.SecurityPostureReference com.azure.resourcemanager.compute.models.SecurityPostureReference::withExcludeExtensions(===java.util.List<java.lang.String>===)",
-          "justification": "Service breaks but no customer onboard."
-        },
-        {
-          "code" : "java.class.removed",
-          "old" : "class com.azure.resourcemanager.containerservice.models.OSOptionProperty",
-          "justification": "Removed non-functional API `getOsOptions` and related models `OSOptionProperty`"
-        },
-        {
-          "code": "java.method.removed",
-          "old" : "method com.azure.resourcemanager.network.models.FirewallPacketCaptureParameters com.azure.resourcemanager.network.models.FirewallPacketCaptureParameters::withId(java.lang.String)",
-          "justification": "service bug fix."
-        },
-        {
-          "code": "java.missing.oldSuperType",
-          "old": "class com.azure.resourcemanager.network.models.FirewallPacketCaptureParameters",
-          "justification": "service bug fix."
-        },
         {
           "ignore": true,
           "code": "java.annotation.removed",
@@ -623,6 +538,66 @@
           "code": "java\\.annotation\\.removed",
           "old": ".*? com\\.azure\\.compute\\.batch\\.models.*",
           "justification": "Removing Jackson annotations from Azure Batch in transition to stream-style."
+        },
+        {
+          "ignore": true,
+          "code": "java.method.returnTypeChanged",
+          "old": "method java.lang.Float com.azure.resourcemanager.appservice.models.FunctionsAlwaysReadyConfig::instanceCount()",
+          "new": "method java.lang.Integer com.azure.resourcemanager.appservice.models.FunctionsAlwaysReadyConfig::instanceCount()",
+          "justification": "Service bug fix."
+        },
+        {
+          "ignore": true,
+          "code": "java.method.parameterTypeChanged",
+          "old": "parameter com.azure.resourcemanager.appservice.models.FunctionsAlwaysReadyConfig com.azure.resourcemanager.appservice.models.FunctionsAlwaysReadyConfig::withInstanceCount(===java.lang.Float===)",
+          "new": "parameter com.azure.resourcemanager.appservice.models.FunctionsAlwaysReadyConfig com.azure.resourcemanager.appservice.models.FunctionsAlwaysReadyConfig::withInstanceCount(===java.lang.Integer===)",
+          "parameterIndex": "0",
+          "justification": "Service bug fix."
+        },
+        {
+          "ignore": true,
+          "code": "java.method.returnTypeChanged",
+          "old": "method java.lang.Float com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrency::instanceMemoryMB()",
+          "new": "method java.lang.Integer com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrency::instanceMemoryMB()",
+          "justification": "Service bug fix."
+        },
+        {
+          "ignore": true,
+          "code": "java.method.returnTypeChanged",
+          "old": "method java.lang.Float com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrency::maximumInstanceCount()",
+          "new": "method java.lang.Integer com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrency::maximumInstanceCount()",
+          "justification": "Service bug fix."
+        },
+        {
+          "ignore": true,
+          "code": "java.method.parameterTypeChanged",
+          "old": "parameter com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrency com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrency::withInstanceMemoryMB(===java.lang.Float===)",
+          "new": "parameter com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrency com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrency::withInstanceMemoryMB(===java.lang.Integer===)",
+          "parameterIndex": "0",
+          "justification": "Service bug fix."
+        },
+        {
+          "ignore": true,
+          "code": "java.method.parameterTypeChanged",
+          "old": "parameter com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrency com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrency::withMaximumInstanceCount(===java.lang.Float===)",
+          "new": "parameter com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrency com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrency::withMaximumInstanceCount(===java.lang.Integer===)",
+          "parameterIndex": "0",
+          "justification": "Service bug fix."
+        },
+        {
+          "ignore": true,
+          "code": "java.method.returnTypeChanged",
+          "old": "method java.lang.Float com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrencyTriggersHttp::perInstanceConcurrency()",
+          "new": "method java.lang.Integer com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrencyTriggersHttp::perInstanceConcurrency()",
+          "justification": "Service bug fix."
+        },
+        {
+          "ignore": true,
+          "code": "java.method.parameterTypeChanged",
+          "old": "parameter com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrencyTriggersHttp com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrencyTriggersHttp::withPerInstanceConcurrency(===java.lang.Float===)",
+          "new": "parameter com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrencyTriggersHttp com.azure.resourcemanager.appservice.models.FunctionsScaleAndConcurrencyTriggersHttp::withPerInstanceConcurrency(===java.lang.Integer===)",
+          "parameterIndex": "0",
+          "justification": "Service bug fix."
         }
       ]
     }

diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/CHANGELOG.md b/sdk/resourcemanager/azure-resourcemanager-appservice/CHANGELOG.md
@@ -2,11 +2,11 @@
 
 ## 2.42.0-beta.1 (Unreleased)
 
-### Features Added
-
 ### Breaking Changes
 
-### Bugs Fixed
+- Type changed from `Float` to `Integer`, on `maximumInstanceCount` and `instanceMemoryMB` property in `FunctionsScaleAndConcurrency` class. 
+- Type changed from `Float` to `Integer`, on `instanceCount` property in `FunctionsAlwaysReadyConfig` class.
+- Type changed from `Float` to `Integer`, on `perInstanceConcurrency` property in `FunctionsScaleAndConcurrencyTriggersHttp` class.
 
 ### Other Changes
 

diff --git a/...src/main/java/com/azure/resourcemanager/appservice/models/FunctionsAlwaysReadyConfig.java b/...src/main/java/com/azure/resourcemanager/appservice/models/FunctionsAlwaysReadyConfig.java
@@ -26,7 +26,7 @@ public final class FunctionsAlwaysReadyConfig implements JsonSerializable<Functi
      * Sets the number of 'Always Ready' instances for a given function group or a specific function. For additional
      * information see https://aka.ms/flexconsumption/alwaysready.
      */
-    private Float instanceCount;
+    private Integer instanceCount;
 
     /**
      * Creates an instance of FunctionsAlwaysReadyConfig class.
@@ -62,7 +62,7 @@ public FunctionsAlwaysReadyConfig withName(String name) {
      * 
      * @return the instanceCount value.
      */
-    public Float instanceCount() {
+    public Integer instanceCount() {
         return this.instanceCount;
     }
 
@@ -73,7 +73,7 @@ public Float instanceCount() {
      * @param instanceCount the instanceCount value to set.
      * @return the FunctionsAlwaysReadyConfig object itself.
      */
-    public FunctionsAlwaysReadyConfig withInstanceCount(Float instanceCount) {
+    public FunctionsAlwaysReadyConfig withInstanceCount(Integer instanceCount) {
         this.instanceCount = instanceCount;
         return this;
     }
@@ -115,7 +115,7 @@ public static FunctionsAlwaysReadyConfig fromJson(JsonReader jsonReader) throws
                 if ("name".equals(fieldName)) {
                     deserializedFunctionsAlwaysReadyConfig.name = reader.getString();
                 } else if ("instanceCount".equals(fieldName)) {
-                    deserializedFunctionsAlwaysReadyConfig.instanceCount = reader.getNullable(JsonReader::getFloat);
+                    deserializedFunctionsAlwaysReadyConfig.instanceCount = reader.getNullable(JsonReader::getInt);
                 } else {
                     reader.skipChildren();
                 }

diff --git a/...c/main/java/com/azure/resourcemanager/appservice/models/FunctionsScaleAndConcurrency.java b/...c/main/java/com/azure/resourcemanager/appservice/models/FunctionsScaleAndConcurrency.java
@@ -25,13 +25,13 @@ public final class FunctionsScaleAndConcurrency implements JsonSerializable<Func
     /*
      * The maximum number of instances for the function app.
      */
-    private Float maximumInstanceCount;
+    private Integer maximumInstanceCount;
 
     /*
      * Set the amount of memory allocated to each instance of the function app in MB. CPU and network bandwidth are
      * allocated proportionally.
      */
-    private Float instanceMemoryMB;
+    private Integer instanceMemoryMB;
 
     /*
      * Scale and concurrency settings for the function app triggers.
@@ -69,7 +69,7 @@ public FunctionsScaleAndConcurrency withAlwaysReady(List<FunctionsAlwaysReadyCon
      * 
      * @return the maximumInstanceCount value.
      */
-    public Float maximumInstanceCount() {
+    public Integer maximumInstanceCount() {
         return this.maximumInstanceCount;
     }
 
@@ -79,7 +79,7 @@ public Float maximumInstanceCount() {
      * @param maximumInstanceCount the maximumInstanceCount value to set.
      * @return the FunctionsScaleAndConcurrency object itself.
      */
-    public FunctionsScaleAndConcurrency withMaximumInstanceCount(Float maximumInstanceCount) {
+    public FunctionsScaleAndConcurrency withMaximumInstanceCount(Integer maximumInstanceCount) {
         this.maximumInstanceCount = maximumInstanceCount;
         return this;
     }
@@ -90,7 +90,7 @@ public FunctionsScaleAndConcurrency withMaximumInstanceCount(Float maximumInstan
      * 
      * @return the instanceMemoryMB value.
      */
-    public Float instanceMemoryMB() {
+    public Integer instanceMemoryMB() {
         return this.instanceMemoryMB;
     }
 
@@ -101,7 +101,7 @@ public Float instanceMemoryMB() {
      * @param instanceMemoryMB the instanceMemoryMB value to set.
      * @return the FunctionsScaleAndConcurrency object itself.
      */
-    public FunctionsScaleAndConcurrency withInstanceMemoryMB(Float instanceMemoryMB) {
+    public FunctionsScaleAndConcurrency withInstanceMemoryMB(Integer instanceMemoryMB) {
         this.instanceMemoryMB = instanceMemoryMB;
         return this;
     }
@@ -174,10 +174,9 @@ public static FunctionsScaleAndConcurrency fromJson(JsonReader jsonReader) throw
                     deserializedFunctionsScaleAndConcurrency.alwaysReady = alwaysReady;
                 } else if ("maximumInstanceCount".equals(fieldName)) {
                     deserializedFunctionsScaleAndConcurrency.maximumInstanceCount
-                        = reader.getNullable(JsonReader::getFloat);
+                        = reader.getNullable(JsonReader::getInt);
                 } else if ("instanceMemoryMB".equals(fieldName)) {
-                    deserializedFunctionsScaleAndConcurrency.instanceMemoryMB
-                        = reader.getNullable(JsonReader::getFloat);
+                    deserializedFunctionsScaleAndConcurrency.instanceMemoryMB = reader.getNullable(JsonReader::getInt);
                 } else if ("triggers".equals(fieldName)) {
                     deserializedFunctionsScaleAndConcurrency.triggers
                         = FunctionsScaleAndConcurrencyTriggers.fromJson(reader);

diff --git a/...com/azure/resourcemanager/appservice/models/FunctionsScaleAndConcurrencyTriggersHttp.java b/...com/azure/resourcemanager/appservice/models/FunctionsScaleAndConcurrencyTriggersHttp.java
@@ -20,7 +20,7 @@ public final class FunctionsScaleAndConcurrencyTriggersHttp
     /*
      * The maximum number of concurrent HTTP trigger invocations per instance.
      */
-    private Float perInstanceConcurrency;
+    private Integer perInstanceConcurrency;
 
     /**
      * Creates an instance of FunctionsScaleAndConcurrencyTriggersHttp class.
@@ -33,7 +33,7 @@ public FunctionsScaleAndConcurrencyTriggersHttp() {
      * 
      * @return the perInstanceConcurrency value.
      */
-    public Float perInstanceConcurrency() {
+    public Integer perInstanceConcurrency() {
         return this.perInstanceConcurrency;
     }
 
@@ -43,7 +43,7 @@ public Float perInstanceConcurrency() {
      * @param perInstanceConcurrency the perInstanceConcurrency value to set.
      * @return the FunctionsScaleAndConcurrencyTriggersHttp object itself.
      */
-    public FunctionsScaleAndConcurrencyTriggersHttp withPerInstanceConcurrency(Float perInstanceConcurrency) {
+    public FunctionsScaleAndConcurrencyTriggersHttp withPerInstanceConcurrency(Integer perInstanceConcurrency) {
         this.perInstanceConcurrency = perInstanceConcurrency;
         return this;
     }
@@ -84,7 +84,7 @@ public static FunctionsScaleAndConcurrencyTriggersHttp fromJson(JsonReader jsonR
 
                 if ("perInstanceConcurrency".equals(fieldName)) {
                     deserializedFunctionsScaleAndConcurrencyTriggersHttp.perInstanceConcurrency
-                        = reader.getNullable(JsonReader::getFloat);
+                        = reader.getNullable(JsonReader::getInt);
                 } else {
                     reader.skipChildren();
                 }