diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index b14dc0edb5f5..8b9e11157b7c 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -546,6 +546,7 @@ io.clientcore:optional-dependency-tests;1.0.0-beta.1;1.0.0-beta.1 unreleased_com.azure.v2:azure-core;2.0.0-beta.1 unreleased_com.azure.v2:azure-identity;2.0.0-beta.1 +unreleased_com.azure.v2:azure-data-appconfiguration;2.0.0-beta.1 unreleased_io.clientcore:http-netty4;1.0.0-beta.1 # Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current diff --git a/sdk/tools/azure-openrewrite/pom.xml b/sdk/tools/azure-openrewrite/pom.xml index 4bb75c2a56bd..60e54bec9e05 100644 --- a/sdk/tools/azure-openrewrite/pom.xml +++ b/sdk/tools/azure-openrewrite/pom.xml @@ -168,15 +168,15 @@ - com.fasterxml.jackson.core - jackson-core - 2.18.4.1 + com.fasterxml.jackson.core + jackson-core + 2.18.4.1 - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - 2.18.4 + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + 2.18.4 com.fasterxml.jackson.core @@ -276,6 +276,12 @@ 2.0.0-beta.1 test + + com.azure.v2 + azure-data-appconfiguration + 2.0.0-beta.1 + test + @@ -372,6 +378,12 @@ 2.0.0-beta.1 provided + + com.azure.v2 + azure-data-appconfiguration + 2.0.0-beta.1 + provided + diff --git a/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/LibraryMigration.yml b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/LibraryMigration.yml new file mode 100644 index 000000000000..0d50f2c529a5 --- /dev/null +++ b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/LibraryMigration.yml @@ -0,0 +1,13 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. +# -------------------------------------------------------------------- +# Migration Recipes for Azure appconfiguration Library +# -------------------------------------------------------------------- +type: specs.openrewrite.org/v1beta/recipe +name: com.azure.openrewrite.migration.data.appconfiguration +displayName: Migrate from azure-appconfiguration to next generation stack +description: This recipe migrates the Azure appconfiguration library to the next generation stack. +recipeList: + + - com.azure.openrewrite.recipe.azure.data.appconfiguration + - com.azure.openrewrite.recipe.azure.data.appconfiguration.models diff --git a/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/com.azure.data.appconfiguration.models.yml b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/com.azure.data.appconfiguration.models.yml new file mode 100644 index 000000000000..b0d28d8e1a49 --- /dev/null +++ b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/com.azure.data.appconfiguration.models.yml @@ -0,0 +1,126 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. +# -------------------------------------------------------------------- +# Migration Recipes for azure.core.credential +# -------------------------------------------------------------------- +type: specs.openrewrite.org/v1beta/recipe +name: com.azure.openrewrite.recipe.azure.data.appconfiguration.models +displayName: Migrate from azure.data.appconfiguration.models to next generation stack +description: This recipe migrates the azure.data.appconfiguration.models package to the next generation stack. +recipeList: + + # -------------------------------------------------------------------- + # ConfigurationAudience + # -------------------------------------------------------------------- + + + + # -------------------------------------------------------------------- + # ConfigurationSetting + # -------------------------------------------------------------------- + + - org.openrewrite.java.ChangeType: + oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.ConfigurationSetting + newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.ConfigurationSetting + + # -------------------------------------------------------------------- + # SettingLabelSelector + # -------------------------------------------------------------------- + + - org.openrewrite.java.ChangeType: + oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.SettingLabelSelector + newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.SettingLabelSelector + + # -------------------------------------------------------------------- + # ConfigurationSettingsFilter + # -------------------------------------------------------------------- + + - org.openrewrite.java.ChangeType: + oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.ConfigurationSettingsFilter + newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.ConfigurationSettingsFilter + + # -------------------------------------------------------------------- + # ConfigurationSnapshot + # -------------------------------------------------------------------- + + - org.openrewrite.java.ChangeType: + oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.ConfigurationSnapshot + newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.ConfigurationSnapshot + + # -------------------------------------------------------------------- + # ConfigurationSnapshotStatus + # -------------------------------------------------------------------- + + + + # -------------------------------------------------------------------- + # FeatureFlagConfigurationSetting + # -------------------------------------------------------------------- + + - org.openrewrite.java.ChangeType: + oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.FeatureFlagConfigurationSetting + newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.FeatureFlagConfigurationSetting + + # -------------------------------------------------------------------- + # FeatureFlagFilter + # -------------------------------------------------------------------- + + - org.openrewrite.java.ChangeType: + oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.FeatureFlagFilter + newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.FeatureFlagFilter + + # -------------------------------------------------------------------- + # SecretReferenceConfigurationSetting + # -------------------------------------------------------------------- + + - org.openrewrite.java.ChangeType: + oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.SecretReferenceConfigurationSetting + newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.SecretReferenceConfigurationSetting + + # -------------------------------------------------------------------- + # SettingFields + # -------------------------------------------------------------------- + + + + # -------------------------------------------------------------------- + # SettingLabel + # -------------------------------------------------------------------- + + + + # -------------------------------------------------------------------- + # SettingLabelFields + # -------------------------------------------------------------------- + + + + # -------------------------------------------------------------------- + # SettingLabelSelector + # -------------------------------------------------------------------- + + + + # -------------------------------------------------------------------- + # SettingSelector + # -------------------------------------------------------------------- + + - org.openrewrite.java.ChangeType: + oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.SettingSelector + newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.SettingSelector + + # -------------------------------------------------------------------- + # SnapshotComposition + # -------------------------------------------------------------------- + + + + # -------------------------------------------------------------------- + # SnapshotFields + # -------------------------------------------------------------------- + + + + # -------------------------------------------------------------------- + # SnapshotSelector + # -------------------------------------------------------------------- diff --git a/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/com.azure.data.appconfiguration.yml b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/com.azure.data.appconfiguration.yml new file mode 100644 index 000000000000..c00b5cef2259 --- /dev/null +++ b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/com.azure.data.appconfiguration.yml @@ -0,0 +1,41 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. +type: specs.openrewrite.org/v1beta/recipe +name: com.azure.openrewrite.recipe.azure.data.appconfiguration +displayName: Migrate from azure.data.appconfiguration to next generation stack +description: This recipe migrates the azure.data.appconfiguration package to the next generation stack. +recipeList: + + + + # -------------------------------------------------------------------- + # ConfigurationAsyncClient + # -------------------------------------------------------------------- + + + + + + # -------------------------------------------------------------------- + # ConfigurationClient + # -------------------------------------------------------------------- + + - org.openrewrite.java.ChangeType: + oldFullyQualifiedTypeName: com.azure.data.appconfiguration.ConfigurationClient + newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.ConfigurationClient + + + # -------------------------------------------------------------------- + # ConfigurationClientBuilder + # -------------------------------------------------------------------- + + - org.openrewrite.java.ChangeType: + oldFullyQualifiedTypeName: com.azure.data.appconfiguration.ConfigurationClientBuilder + newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.ConfigurationClientBuilder + + + # -------------------------------------------------------------------- + # ConfigurationServiceVersion + # -------------------------------------------------------------------- + + diff --git a/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/rewrite.yml b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/rewrite.yml index e8b0f81fa909..305abd7f08e2 100644 --- a/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/rewrite.yml +++ b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/rewrite.yml @@ -12,6 +12,7 @@ recipeList: # Code Migration Recipes - com.azure.openrewrite.migration.core - com.azure.openrewrite.migration.identity + - com.azure.openrewrite.migration.data.appconfiguration # Code Styling recipes - org.openrewrite.java.OrderImports: diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v1/AadAuthentication.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v1/AadAuthentication.java index 3f52b14050b4..75645b5969ac 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v1/AadAuthentication.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v1/AadAuthentication.java @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - +import com.azure.data.appconfiguration.ConfigurationClient; +import com.azure.data.appconfiguration.ConfigurationClientBuilder; import com.azure.data.appconfiguration.models.ConfigurationSetting; import com.azure.identity.DefaultAzureCredential; import com.azure.identity.DefaultAzureCredentialBuilder; diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v2/AadAuthentication.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v2/AadAuthentication.java index 3f52b14050b4..2958c4d5e3ae 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v2/AadAuthentication.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v2/AadAuthentication.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - -import com.azure.data.appconfiguration.models.ConfigurationSetting; -import com.azure.identity.DefaultAzureCredential; -import com.azure.identity.DefaultAzureCredentialBuilder; +import com.azure.v2.data.appconfiguration.ConfigurationClient; +import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder; +import com.azure.v2.data.appconfiguration.models.ConfigurationSetting; +import com.azure.v2.identity.DefaultAzureCredential; +import com.azure.v2.identity.DefaultAzureCredentialBuilder; /** * Sample demonstrates how to use AAD token to build a configuration client. diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v1/ConditionalRequest.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v1/ConditionalRequest.java index b6aafadcc407..f4376911ccba 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v1/ConditionalRequest.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v1/ConditionalRequest.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - import com.azure.core.http.rest.Response; import com.azure.core.util.Context; import com.azure.data.appconfiguration.models.ConfigurationSetting; +import com.azure.data.appconfiguration.ConfigurationClient; +import com.azure.data.appconfiguration.ConfigurationClientBuilder; /** * Sample demonstrates how to add, get, and delete a configuration setting by conditional request. diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v2/ConditionalRequest.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v2/ConditionalRequest.java index b6aafadcc407..bdbd44c6875d 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v2/ConditionalRequest.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v2/ConditionalRequest.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - -import com.azure.core.http.rest.Response; -import com.azure.core.util.Context; -import com.azure.data.appconfiguration.models.ConfigurationSetting; +import com.azure.v2.data.appconfiguration.ConfigurationClient; +import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder; +import com.azure.v2.data.appconfiguration.models.ConfigurationSetting; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; /** * Sample demonstrates how to add, get, and delete a configuration setting by conditional request. @@ -31,21 +31,21 @@ public static void main(String[] args) { // given setting matches the one in the service, then the setting is updated. Otherwise, it is // not updated. // If the given setting is not exist in the service, the setting will be added to the service. - Response settingResponse = client.setConfigurationSettingWithResponse(setting, true, Context.NONE); + Response settingResponse = client.setConfigurationSettingWithResponse(setting, true, RequestContext.none()); System.out.printf("Status code: %s, Key: %s, Value: %s", settingResponse.getStatusCode(), settingResponse.getValue().getKey(), settingResponse.getValue().getValue()); // If you want to conditionally retrieve the setting, set `ifChanged` to true. If the ETag of the // given setting matches the one in the service, then 304 status code with null value returned in the response. // Otherwise, a setting with new ETag returned, which is the latest setting retrieved from the service. - settingResponse = client.getConfigurationSettingWithResponse(setting, null, true, Context.NONE); + settingResponse = client.getConfigurationSettingWithResponse(setting, null, true, RequestContext.none()); System.out.printf("Status code: %s, Key: %s, Value: %s", settingResponse.getStatusCode(), settingResponse.getValue().getKey(), settingResponse.getValue().getValue()); // If you want to conditionally delete the setting, set `ifUnchanged` to true. If the ETag of the // given setting matches the one in the service, then the setting is deleted. Otherwise, it is // not deleted. - client.deleteConfigurationSettingWithResponse(settingResponse.getValue(), true, Context.NONE); + client.deleteConfigurationSettingWithResponse(settingResponse.getValue(), true, RequestContext.none()); System.out.printf("Status code: %s, Key: %s, Value: %s", settingResponse.getStatusCode(), settingResponse.getValue().getKey(), settingResponse.getValue().getValue()); } diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v1/ConditionalRequestForSettingsPagination.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v1/ConditionalRequestForSettingsPagination.java index 104ec65ab2b6..a73ee3b73ed2 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v1/ConditionalRequestForSettingsPagination.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v1/ConditionalRequestForSettingsPagination.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - import com.azure.core.http.HttpHeaderName; import com.azure.core.http.MatchConditions; import com.azure.core.http.rest.PagedIterable; import com.azure.core.util.Configuration; import com.azure.data.appconfiguration.models.ConfigurationSetting; import com.azure.data.appconfiguration.models.SettingSelector; +import com.azure.data.appconfiguration.ConfigurationClient; +import com.azure.data.appconfiguration.ConfigurationClientBuilder; import java.util.List; import java.util.stream.Collectors; diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v2/ConditionalRequestForSettingsPagination.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v2/ConditionalRequestForSettingsPagination.java index 104ec65ab2b6..eab7c792394a 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v2/ConditionalRequestForSettingsPagination.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v2/ConditionalRequestForSettingsPagination.java @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - -import com.azure.core.http.HttpHeaderName; -import com.azure.core.http.MatchConditions; -import com.azure.core.http.rest.PagedIterable; -import com.azure.core.util.Configuration; -import com.azure.data.appconfiguration.models.ConfigurationSetting; -import com.azure.data.appconfiguration.models.SettingSelector; +import com.azure.v2.data.appconfiguration.ConfigurationClient; +import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder; +import com.azure.v2.data.appconfiguration.models.ConfigurationSetting; +import com.azure.v2.data.appconfiguration.models.SettingSelector; +import io.clientcore.core.http.models.HttpHeaderName; +import io.clientcore.core.http.models.HttpMatchConditions; +import io.clientcore.core.http.paging.PagedIterable; +import io.clientcore.core.utils.configuration.Configuration; import java.util.List; import java.util.stream.Collectors; @@ -32,20 +32,20 @@ public static void main(String[] args) { // Instantiate a client that will be used to call the service. ConfigurationClient client = new ConfigurationClientBuilder() - .connectionString(connectionString) - .buildClient(); + .connectionString(connectionString) + .buildClient(); // list all settings and get their page ETags - List matchConditionsList = client.listConfigurationSettings(null) - .streamByPage() - .collect(Collectors.toList()) - .stream() - .map(pagedResponse -> new MatchConditions().setIfNoneMatch( - pagedResponse.getHeaders().getValue(HttpHeaderName.ETAG))) - .collect(Collectors.toList()); + List matchConditionsList = client.listConfigurationSettings(null) + .streamByPage() + .collect(Collectors.toList()) + .stream() + .map(pagedResponse -> new HttpMatchConditions().setIfNoneMatch( + pagedResponse.getHeaders().getValue(HttpHeaderName.ETAG))) + .collect(Collectors.toList()); PagedIterable settings = client.listConfigurationSettings( - new SettingSelector().setMatchConditions(matchConditionsList)); + new SettingSelector().setMatchConditions(matchConditionsList)); settings.iterableByPage().forEach(pagedResponse -> { int statusCode = pagedResponse.getStatusCode(); diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v1/FeatureFlagConfigurationSettingSample.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v1/FeatureFlagConfigurationSettingSample.java index 0e2805e9a75f..7b16c9999745 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v1/FeatureFlagConfigurationSettingSample.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v1/FeatureFlagConfigurationSettingSample.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - import com.azure.core.http.rest.PagedIterable; import com.azure.data.appconfiguration.models.ConfigurationSetting; import com.azure.data.appconfiguration.models.FeatureFlagConfigurationSetting; import com.azure.data.appconfiguration.models.FeatureFlagFilter; import com.azure.data.appconfiguration.models.SettingSelector; +import com.azure.data.appconfiguration.ConfigurationClient; +import com.azure.data.appconfiguration.ConfigurationClientBuilder; import java.util.Arrays; import java.util.List; diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v2/FeatureFlagConfigurationSettingSample.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v2/FeatureFlagConfigurationSettingSample.java index 0e2805e9a75f..b4038f4bc926 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v2/FeatureFlagConfigurationSettingSample.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v2/FeatureFlagConfigurationSettingSample.java @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - -import com.azure.core.http.rest.PagedIterable; -import com.azure.data.appconfiguration.models.ConfigurationSetting; -import com.azure.data.appconfiguration.models.FeatureFlagConfigurationSetting; -import com.azure.data.appconfiguration.models.FeatureFlagFilter; -import com.azure.data.appconfiguration.models.SettingSelector; +import com.azure.v2.data.appconfiguration.ConfigurationClient; +import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder; +import com.azure.v2.data.appconfiguration.models.ConfigurationSetting; +import com.azure.v2.data.appconfiguration.models.FeatureFlagConfigurationSetting; +import com.azure.v2.data.appconfiguration.models.FeatureFlagFilter; +import com.azure.v2.data.appconfiguration.models.SettingSelector; +import io.clientcore.core.http.paging.PagedIterable; import java.util.Arrays; import java.util.List; @@ -28,8 +28,8 @@ public static void main(String[] args) { // and navigating to "Access Keys" page under the "Settings" section. String connectionString = "endpoint={endpoint_value};id={id_value};secret={secret_value}"; final ConfigurationClient client = new ConfigurationClientBuilder() - .connectionString(connectionString) - .buildClient(); + .connectionString(connectionString) + .buildClient(); // Name of the key to add to the configuration service. final String key = "hello"; @@ -37,7 +37,7 @@ public static void main(String[] args) { System.out.println("Beginning of synchronous sample..."); FeatureFlagFilter percentageFilter = new FeatureFlagFilter("Microsoft.Percentage") - .addParameter("Value", 30); + .addParameter("Value", 30); FeatureFlagConfigurationSetting featureFlagConfigurationSetting = new FeatureFlagConfigurationSetting(key, true) .setClientFilters(Arrays.asList(percentageFilter)); diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v1/HelloWorld.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v1/HelloWorld.java index 536fcae286a0..63fa2eebcc55 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v1/HelloWorld.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v1/HelloWorld.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - import com.azure.data.appconfiguration.models.ConfigurationSetting; +import com.azure.data.appconfiguration.ConfigurationClient; +import com.azure.data.appconfiguration.ConfigurationClientBuilder; /** * Sample demonstrates how to add, get, and delete a configuration setting. diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v2/HelloWorld.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v2/HelloWorld.java index 536fcae286a0..ab68288f5794 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v2/HelloWorld.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v2/HelloWorld.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - -import com.azure.data.appconfiguration.models.ConfigurationSetting; +import com.azure.v2.data.appconfiguration.ConfigurationClient; +import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder; +import com.azure.v2.data.appconfiguration.models.ConfigurationSetting; /** * Sample demonstrates how to add, get, and delete a configuration setting. diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v1/ListLabels.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v1/ListLabels.java index 23dd670f19d6..de10f2a683f4 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v1/ListLabels.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v1/ListLabels.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - import com.azure.core.util.Configuration; import com.azure.core.util.Context; import com.azure.data.appconfiguration.models.ConfigurationSetting; import com.azure.data.appconfiguration.models.SettingLabelSelector; +import com.azure.data.appconfiguration.ConfigurationClient; +import com.azure.data.appconfiguration.ConfigurationClientBuilder; /** * A sample demonstrate how to list labels. diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v2/ListLabels.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v2/ListLabels.java index 23dd670f19d6..d13866767f3e 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v2/ListLabels.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v2/ListLabels.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - -import com.azure.core.util.Configuration; -import com.azure.core.util.Context; -import com.azure.data.appconfiguration.models.ConfigurationSetting; -import com.azure.data.appconfiguration.models.SettingLabelSelector; +import com.azure.v2.data.appconfiguration.ConfigurationClient; +import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder; +import com.azure.v2.data.appconfiguration.models.ConfigurationSetting; +import com.azure.v2.data.appconfiguration.models.SettingLabelSelector; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.utils.configuration.Configuration; /** * A sample demonstrate how to list labels. @@ -23,8 +23,8 @@ public static void main(String[] args) { String connectionString = Configuration.getGlobalConfiguration().get("AZURE_APPCONFIG_CONNECTION_STRING"); final ConfigurationClient client = new ConfigurationClientBuilder() - .connectionString(connectionString) - .buildClient(); + .connectionString(connectionString) + .buildClient(); // Prepare three settings with different labels, prod1, prod2, prod3 ConfigurationSetting setting = client.setConfigurationSetting("prod:prod1", "prod1", "prod1"); @@ -38,15 +38,15 @@ public static void main(String[] args) { // If you want to list labels by exact match, use the exact label name as the filter. // If you want to list all labels by wildcard, pass wildcard where AppConfig supports, such as "prod*", System.out.println("List all labels:"); - client.listLabels(null, Context.NONE) - .forEach(label -> System.out.println("\tLabel name = " + label.getName())); + client.listLabels(null, RequestContext.none()) + .forEach(label -> System.out.println("\tLabel name = " + label.getName())); System.out.println("List label by exact match:"); - client.listLabels(new SettingLabelSelector().setNameFilter("prod2"), Context.NONE) - .forEach(label -> System.out.println("\tLabel name = " + label.getName())); + client.listLabels(new SettingLabelSelector().setNameFilter("prod2"), RequestContext.none()) + .forEach(label -> System.out.println("\tLabel name = " + label.getName())); System.out.println("List labels by wildcard:"); - client.listLabels(new SettingLabelSelector().setNameFilter("prod*"), Context.NONE) - .forEach(label -> System.out.println("\tLabel name = " + label.getName())); + client.listLabels(new SettingLabelSelector().setNameFilter("prod*"), RequestContext.none()) + .forEach(label -> System.out.println("\tLabel name = " + label.getName())); } } diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v1/ListSettingsWithTagsFilter.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v1/ListSettingsWithTagsFilter.java index c7754a0376a1..5c2d7bf24ae3 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v1/ListSettingsWithTagsFilter.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v1/ListSettingsWithTagsFilter.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - import com.azure.core.http.rest.PagedIterable; import com.azure.core.util.Configuration; import com.azure.data.appconfiguration.models.ConfigurationSetting; import com.azure.data.appconfiguration.models.SettingSelector; +import com.azure.data.appconfiguration.ConfigurationClient; +import com.azure.data.appconfiguration.ConfigurationClientBuilder; import javax.net.ssl.SSLException; import java.util.HashMap; diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v2/ListSettingsWithTagsFilter.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v2/ListSettingsWithTagsFilter.java index c7754a0376a1..5c2d7bf24ae3 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v2/ListSettingsWithTagsFilter.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v2/ListSettingsWithTagsFilter.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - import com.azure.core.http.rest.PagedIterable; import com.azure.core.util.Configuration; import com.azure.data.appconfiguration.models.ConfigurationSetting; import com.azure.data.appconfiguration.models.SettingSelector; +import com.azure.data.appconfiguration.ConfigurationClient; +import com.azure.data.appconfiguration.ConfigurationClientBuilder; import javax.net.ssl.SSLException; import java.util.HashMap; diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v1/ReadOnlySample.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v1/ReadOnlySample.java index 45e82d78e838..f95e2b21b087 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v1/ReadOnlySample.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v1/ReadOnlySample.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - import com.azure.data.appconfiguration.models.ConfigurationSetting; +import com.azure.data.appconfiguration.ConfigurationClient; +import com.azure.data.appconfiguration.ConfigurationClientBuilder; /** * Sample demonstrates how to set and clear read-only a configuration setting. diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v2/ReadOnlySample.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v2/ReadOnlySample.java index 45e82d78e838..5d49c3eae176 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v2/ReadOnlySample.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v2/ReadOnlySample.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - -import com.azure.data.appconfiguration.models.ConfigurationSetting; +import com.azure.v2.data.appconfiguration.ConfigurationClient; +import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder; +import com.azure.v2.data.appconfiguration.models.ConfigurationSetting; /** * Sample demonstrates how to set and clear read-only a configuration setting. diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v1/ReadRevisionHistoryWIthTagsFilter.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v1/ReadRevisionHistoryWIthTagsFilter.java index b13bcecf5e13..f10d23221390 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v1/ReadRevisionHistoryWIthTagsFilter.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v1/ReadRevisionHistoryWIthTagsFilter.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - import com.azure.core.http.rest.PagedIterable; import com.azure.core.util.Configuration; import com.azure.data.appconfiguration.models.ConfigurationSetting; import com.azure.data.appconfiguration.models.SettingSelector; +import com.azure.data.appconfiguration.ConfigurationClient; +import com.azure.data.appconfiguration.ConfigurationClientBuilder; import javax.net.ssl.SSLException; import java.util.HashMap; diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v2/ReadRevisionHistoryWIthTagsFilter.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v2/ReadRevisionHistoryWIthTagsFilter.java index b13bcecf5e13..f10d23221390 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v2/ReadRevisionHistoryWIthTagsFilter.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v2/ReadRevisionHistoryWIthTagsFilter.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - import com.azure.core.http.rest.PagedIterable; import com.azure.core.util.Configuration; import com.azure.data.appconfiguration.models.ConfigurationSetting; import com.azure.data.appconfiguration.models.SettingSelector; +import com.azure.data.appconfiguration.ConfigurationClient; +import com.azure.data.appconfiguration.ConfigurationClientBuilder; import javax.net.ssl.SSLException; import java.util.HashMap; diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v1/SecretReferenceConfigurationSettingSample.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v1/SecretReferenceConfigurationSettingSample.java index 62e05464111b..b77bc7f241d1 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v1/SecretReferenceConfigurationSettingSample.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v1/SecretReferenceConfigurationSettingSample.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - import com.azure.core.http.rest.PagedIterable; import com.azure.data.appconfiguration.models.ConfigurationSetting; import com.azure.data.appconfiguration.models.SecretReferenceConfigurationSetting; import com.azure.data.appconfiguration.models.SettingSelector; +import com.azure.data.appconfiguration.ConfigurationClient; +import com.azure.data.appconfiguration.ConfigurationClientBuilder; /** * Sample demonstrates how to add, get, list, and delete a secret reference configuration setting. diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v2/SecretReferenceConfigurationSettingSample.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v2/SecretReferenceConfigurationSettingSample.java index 62e05464111b..2bafcf096b75 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v2/SecretReferenceConfigurationSettingSample.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v2/SecretReferenceConfigurationSettingSample.java @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - -import com.azure.core.http.rest.PagedIterable; -import com.azure.data.appconfiguration.models.ConfigurationSetting; -import com.azure.data.appconfiguration.models.SecretReferenceConfigurationSetting; -import com.azure.data.appconfiguration.models.SettingSelector; +import com.azure.v2.data.appconfiguration.ConfigurationClient; +import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder; +import com.azure.v2.data.appconfiguration.models.ConfigurationSetting; +import com.azure.v2.data.appconfiguration.models.SecretReferenceConfigurationSetting; +import com.azure.v2.data.appconfiguration.models.SettingSelector; +import io.clientcore.core.http.paging.PagedIterable; /** * Sample demonstrates how to add, get, list, and delete a secret reference configuration setting. @@ -23,8 +23,8 @@ public static void main(String[] args) { // and navigating to "Access Keys" page under the "Settings" section. String connectionString = "endpoint={endpoint_value};id={id_value};secret={secret_value}"; final ConfigurationClient client = new ConfigurationClientBuilder() - .connectionString(connectionString) - .buildClient(); + .connectionString(connectionString) + .buildClient(); // Name of the key to add to the configuration service. final String key = "hello"; diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v1/WatchFeature.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v1/WatchFeature.java index 11f1061af724..65343144f584 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v1/WatchFeature.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v1/WatchFeature.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - import com.azure.data.appconfiguration.models.ConfigurationSetting; +import com.azure.data.appconfiguration.ConfigurationClient; +import com.azure.data.appconfiguration.ConfigurationClientBuilder; import java.util.Arrays; import java.util.List; diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v2/WatchFeature.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v2/WatchFeature.java index 11f1061af724..6eb36f877341 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v2/WatchFeature.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v2/WatchFeature.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration; - -import com.azure.data.appconfiguration.models.ConfigurationSetting; +import com.azure.v2.data.appconfiguration.ConfigurationClient; +import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder; +import com.azure.v2.data.appconfiguration.models.ConfigurationSetting; import java.util.Arrays; import java.util.List; @@ -22,8 +22,8 @@ public static void main(String[] args) { // Instantiate a client that will be used to call the service. ConfigurationClient client = new ConfigurationClientBuilder() - .connectionString(connectionString) - .buildClient(); + .connectionString(connectionString) + .buildClient(); // Prepare a list of watching settings and update one same setting value to the service. String prodDBConnectionKey = "prodDBConnection"; @@ -74,24 +74,24 @@ public static void main(String[] args) { * @return a list of updated settings that doesn't match previous ETag value. */ private static List refresh(ConfigurationClient client, - List watchSettings) { + List watchSettings) { return watchSettings - .stream() - .filter(setting -> { - ConfigurationSetting retrievedSetting = client.getConfigurationSetting(setting.getKey(), - setting.getLabel()); - String latestETag = retrievedSetting.getETag(); - String watchingETag = setting.getETag(); - if (!latestETag.equals(watchingETag)) { - System.out.printf( - "Some keys in watching key store matching the key [%s] and label [%s] is updated, " - + "preview ETag value [%s] not equals to current value [%s].%n", - retrievedSetting.getKey(), retrievedSetting.getLabel(), watchingETag, latestETag); - setting.setETag(latestETag).setValue(retrievedSetting.getValue()); - return true; - } - return false; - }) - .collect(Collectors.toList()); + .stream() + .filter(setting -> { + ConfigurationSetting retrievedSetting = client.getConfigurationSetting(setting.getKey(), + setting.getLabel()); + String latestETag = retrievedSetting.getETag(); + String watchingETag = setting.getETag(); + if (!latestETag.equals(watchingETag)) { + System.out.printf( + "Some keys in watching key store matching the key [%s] and label [%s] is updated, " + + "preview ETag value [%s] not equals to current value [%s].%n", + retrievedSetting.getKey(), retrievedSetting.getLabel(), watchingETag, latestETag); + setting.setETag(latestETag).setValue(retrievedSetting.getValue()); + return true; + } + return false; + }) + .collect(Collectors.toList()); } } diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v1/ComplexConfiguration.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v1/ComplexConfiguration.java index 544d2cea3686..c606ee153546 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v1/ComplexConfiguration.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v1/ComplexConfiguration.java @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration.models; - import com.azure.json.JsonReader; import com.azure.json.JsonSerializable; import com.azure.json.JsonToken; diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v2/ComplexConfiguration.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v2/ComplexConfiguration.java index 544d2cea3686..c606ee153546 100644 --- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v2/ComplexConfiguration.java +++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v2/ComplexConfiguration.java @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.data.appconfiguration.models; - import com.azure.json.JsonReader; import com.azure.json.JsonSerializable; import com.azure.json.JsonToken; diff --git a/sdk/tools/openrewrite-sample-compiler-ci.yml b/sdk/tools/openrewrite-sample-compiler-ci.yml index 6cdce5e84d29..c831c95ae975 100644 --- a/sdk/tools/openrewrite-sample-compiler-ci.yml +++ b/sdk/tools/openrewrite-sample-compiler-ci.yml @@ -45,6 +45,7 @@ extends: - "/sdk/tools/" - "/sdk/core-v2/" - "/sdk/identity-v2/" + - "/sdk/appconfiguration-v2/" - "/eng/" - "/common/perf-test-core/" - "**/*.xml" @@ -55,7 +56,7 @@ extends: displayName: 'Build and Install Necesssary Dependencies' inputs: goals: 'install' - options: '-pl com.azure.v2:azure-core,com.azure.v2:azure-identity,com.azure:perf-test-core,com.azure:azure-openrewrite-compiler-maven-plugin -am -T 1C -Dcheckstyle.skip -Dgpg.skip -Dmaven.javadoc.skip -Drevapi.skip -DskipTests -Dspotbugs.skip -Djacoco.skip -Dspotless.skip --no-transfer-progress' + options: '-pl com.azure.v2:azure-core,com.azure.v2:azure-identity,com.azure.v2:azure-data-appconfiguration,com.azure:perf-test-core,com.azure:azure-openrewrite-compiler-maven-plugin -am -T 1C -Dcheckstyle.skip -Dgpg.skip -Dmaven.javadoc.skip -Drevapi.skip -DskipTests -Dspotbugs.skip -Djacoco.skip -Dspotless.skip --no-transfer-progress' javaHomeOption: 'JDKVersion' jdkVersionOption: '1.8'