diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index cfcf2df5e1ff9..28837135a2764 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -393,7 +393,7 @@ com.azure.resourcemanager:azure-resourcemanager-dataprotection;1.3.0;1.4.0-beta. com.azure.resourcemanager:azure-resourcemanager-desktopvirtualization;1.2.0;1.3.0-beta.1 com.azure.resourcemanager:azure-resourcemanager-loadtesting;1.1.0;1.2.0-beta.1 com.azure.resourcemanager:azure-resourcemanager-automanage;1.0.0-beta.2;1.0.0-beta.3 -com.azure.resourcemanager:azure-resourcemanager-edgeorder;1.0.0-beta.2;1.0.0-beta.3 +com.azure.resourcemanager:azure-resourcemanager-edgeorder;1.0.0-beta.2;1.0.0 com.azure.resourcemanager:azure-resourcemanager-securityinsights;1.0.0-beta.5;1.0.0-beta.6 com.azure.resourcemanager:azure-resourcemanager-oep;1.0.0-beta.2;1.0.0-beta.3 com.azure.resourcemanager:azure-resourcemanager-dnsresolver;1.0.0;1.1.0-beta.1 diff --git a/sdk/edgeorder/azure-resourcemanager-edgeorder/CHANGELOG.md b/sdk/edgeorder/azure-resourcemanager-edgeorder/CHANGELOG.md index 25c79cac907f4..a13b4f120f654 100644 --- a/sdk/edgeorder/azure-resourcemanager-edgeorder/CHANGELOG.md +++ b/sdk/edgeorder/azure-resourcemanager-edgeorder/CHANGELOG.md @@ -1,14 +1,20 @@ # Release History -## 1.0.0-beta.3 (Unreleased) +## 1.0.0 (2025-01-02) -### Features Added +- Azure Resource Manager EdgeOrder client library for Java. This package contains Microsoft Azure SDK for EdgeOrder Management SDK. Edge Order API's. Package tag package-2021-12. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt). ### Breaking Changes -### Bugs Fixed +#### `models.Pav2MeterDetails` was modified + +* `chargingType()` was removed +* `multiplier()` was removed + +#### `models.PurchaseMeterDetails` was modified -### Other Changes +* `chargingType()` was removed +* `multiplier()` was removed ## 1.0.0-beta.2 (2024-10-06) diff --git a/sdk/edgeorder/azure-resourcemanager-edgeorder/README.md b/sdk/edgeorder/azure-resourcemanager-edgeorder/README.md index 7c5f8933648b4..c12305be7feb5 100644 --- a/sdk/edgeorder/azure-resourcemanager-edgeorder/README.md +++ b/sdk/edgeorder/azure-resourcemanager-edgeorder/README.md @@ -32,7 +32,7 @@ Various documentation is available to help you get started com.azure.resourcemanager azure-resourcemanager-edgeorder - 1.0.0-beta.2 + 1.0.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/edgeorder/azure-resourcemanager-edgeorder/pom.xml b/sdk/edgeorder/azure-resourcemanager-edgeorder/pom.xml index d87e92b84f39f..42c5cceeb22b4 100644 --- a/sdk/edgeorder/azure-resourcemanager-edgeorder/pom.xml +++ b/sdk/edgeorder/azure-resourcemanager-edgeorder/pom.xml @@ -14,7 +14,7 @@ com.azure.resourcemanager azure-resourcemanager-edgeorder - 1.0.0-beta.3 + 1.0.0 jar Microsoft Azure SDK for EdgeOrder Management @@ -45,7 +45,7 @@ UTF-8 0 0 - true + false diff --git a/sdk/edgeorder/azure-resourcemanager-edgeorder/src/main/java/com/azure/resourcemanager/edgeorder/EdgeOrderManager.java b/sdk/edgeorder/azure-resourcemanager-edgeorder/src/main/java/com/azure/resourcemanager/edgeorder/EdgeOrderManager.java index 18e93cd5fb665..fb3e4d5d8df32 100644 --- a/sdk/edgeorder/azure-resourcemanager-edgeorder/src/main/java/com/azure/resourcemanager/edgeorder/EdgeOrderManager.java +++ b/sdk/edgeorder/azure-resourcemanager-edgeorder/src/main/java/com/azure/resourcemanager/edgeorder/EdgeOrderManager.java @@ -11,6 +11,7 @@ import com.azure.core.http.HttpPipelinePosition; import com.azure.core.http.policy.AddDatePolicy; import com.azure.core.http.policy.AddHeadersFromContextPolicy; +import com.azure.core.http.policy.BearerTokenAuthenticationPolicy; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.http.policy.HttpLoggingPolicy; import com.azure.core.http.policy.HttpPipelinePolicy; @@ -19,7 +20,6 @@ import com.azure.core.http.policy.RetryOptions; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.http.policy.UserAgentPolicy; -import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy; import com.azure.core.management.profile.AzureProfile; import com.azure.core.util.Configuration; import com.azure.core.util.logging.ClientLogger; @@ -205,7 +205,7 @@ public EdgeOrderManager authenticate(TokenCredential credential, AzureProfile pr .append("-") .append("com.azure.resourcemanager.edgeorder") .append("/") - .append("1.0.0-beta.2"); + .append("1.0.0"); if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) { userAgentBuilder.append(" (") .append(Configuration.getGlobalConfiguration().get("java.version")) @@ -238,7 +238,7 @@ public EdgeOrderManager authenticate(TokenCredential credential, AzureProfile pr HttpPolicyProviders.addBeforeRetryPolicies(policies); policies.add(retryPolicy); policies.add(new AddDatePolicy()); - policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0]))); + policies.add(new BearerTokenAuthenticationPolicy(credential, scopes.toArray(new String[0]))); policies.addAll(this.policies.stream() .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) .collect(Collectors.toList())); diff --git a/sdk/edgeorder/azure-resourcemanager-edgeorder/src/main/java/com/azure/resourcemanager/edgeorder/models/Pav2MeterDetails.java b/sdk/edgeorder/azure-resourcemanager-edgeorder/src/main/java/com/azure/resourcemanager/edgeorder/models/Pav2MeterDetails.java index e45a44732efb7..eef8c19fae127 100644 --- a/sdk/edgeorder/azure-resourcemanager-edgeorder/src/main/java/com/azure/resourcemanager/edgeorder/models/Pav2MeterDetails.java +++ b/sdk/edgeorder/azure-resourcemanager-edgeorder/src/main/java/com/azure/resourcemanager/edgeorder/models/Pav2MeterDetails.java @@ -25,16 +25,6 @@ public final class Pav2MeterDetails extends MeterDetails { */ private String meterGuid; - /* - * Charging type. - */ - private ChargingType chargingType; - - /* - * Billing unit applicable for Pav2 billing - */ - private Double multiplier; - /** * Creates an instance of Pav2MeterDetails class. */ @@ -60,26 +50,6 @@ public String meterGuid() { return this.meterGuid; } - /** - * Get the chargingType property: Charging type. - * - * @return the chargingType value. - */ - @Override - public ChargingType chargingType() { - return this.chargingType; - } - - /** - * Get the multiplier property: Billing unit applicable for Pav2 billing. - * - * @return the multiplier value. - */ - @Override - public Double multiplier() { - return this.multiplier; - } - /** * Validates the instance. * @@ -115,9 +85,9 @@ public static Pav2MeterDetails fromJson(JsonReader jsonReader) throws IOExceptio reader.nextToken(); if ("multiplier".equals(fieldName)) { - deserializedPav2MeterDetails.multiplier = reader.getNullable(JsonReader::getDouble); + deserializedPav2MeterDetails.withMultiplier(reader.getNullable(JsonReader::getDouble)); } else if ("chargingType".equals(fieldName)) { - deserializedPav2MeterDetails.chargingType = ChargingType.fromString(reader.getString()); + deserializedPav2MeterDetails.withChargingType(ChargingType.fromString(reader.getString())); } else if ("billingType".equals(fieldName)) { deserializedPav2MeterDetails.billingType = BillingType.fromString(reader.getString()); } else if ("meterGuid".equals(fieldName)) { diff --git a/sdk/edgeorder/azure-resourcemanager-edgeorder/src/main/java/com/azure/resourcemanager/edgeorder/models/PurchaseMeterDetails.java b/sdk/edgeorder/azure-resourcemanager-edgeorder/src/main/java/com/azure/resourcemanager/edgeorder/models/PurchaseMeterDetails.java index f71a2ae423e8c..e533f3a7c10e0 100644 --- a/sdk/edgeorder/azure-resourcemanager-edgeorder/src/main/java/com/azure/resourcemanager/edgeorder/models/PurchaseMeterDetails.java +++ b/sdk/edgeorder/azure-resourcemanager-edgeorder/src/main/java/com/azure/resourcemanager/edgeorder/models/PurchaseMeterDetails.java @@ -35,16 +35,6 @@ public final class PurchaseMeterDetails extends MeterDetails { */ private String termId; - /* - * Charging type. - */ - private ChargingType chargingType; - - /* - * Billing unit applicable for Pav2 billing - */ - private Double multiplier; - /** * Creates an instance of PurchaseMeterDetails class. */ @@ -88,26 +78,6 @@ public String termId() { return this.termId; } - /** - * Get the chargingType property: Charging type. - * - * @return the chargingType value. - */ - @Override - public ChargingType chargingType() { - return this.chargingType; - } - - /** - * Get the multiplier property: Billing unit applicable for Pav2 billing. - * - * @return the multiplier value. - */ - @Override - public Double multiplier() { - return this.multiplier; - } - /** * Validates the instance. * @@ -143,9 +113,9 @@ public static PurchaseMeterDetails fromJson(JsonReader jsonReader) throws IOExce reader.nextToken(); if ("multiplier".equals(fieldName)) { - deserializedPurchaseMeterDetails.multiplier = reader.getNullable(JsonReader::getDouble); + deserializedPurchaseMeterDetails.withMultiplier(reader.getNullable(JsonReader::getDouble)); } else if ("chargingType".equals(fieldName)) { - deserializedPurchaseMeterDetails.chargingType = ChargingType.fromString(reader.getString()); + deserializedPurchaseMeterDetails.withChargingType(ChargingType.fromString(reader.getString())); } else if ("billingType".equals(fieldName)) { deserializedPurchaseMeterDetails.billingType = BillingType.fromString(reader.getString()); } else if ("productId".equals(fieldName)) {