[AppConfig-Customization] getEtag to getETag (#35814)

mssfang · web-flow · commit fd5cbfe23a81 · 2023-07-11T09:07:48.000-07:00
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationAsyncClient.java b/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationAsyncClient.java
@@ -44,7 +44,7 @@
 import static com.azure.data.appconfiguration.implementation.ConfigurationSettingDeserializationHelper.toConfigurationSettingWithResponse;
 import static com.azure.data.appconfiguration.implementation.Utility.ETAG_ANY;
 import static com.azure.data.appconfiguration.implementation.Utility.addTracingNamespace;
-import static com.azure.data.appconfiguration.implementation.Utility.getEtag;
+import static com.azure.data.appconfiguration.implementation.Utility.getETag;
 import static com.azure.data.appconfiguration.implementation.Utility.iterableToList;
 import static com.azure.data.appconfiguration.implementation.Utility.toKeyValue;
 import static com.azure.data.appconfiguration.implementation.Utility.toSettingFieldsList;
@@ -568,7 +568,7 @@ public Mono<Response<ConfigurationSetting>> setConfigurationSettingWithResponse(
         return withContext(
             context -> validateSettingAsync(setting).flatMap(
                 settingInternal -> serviceClient.putKeyValueWithResponseAsync(settingInternal.getKey(),
-                    settingInternal.getLabel(), getEtag(ifUnchanged, settingInternal), null,
+                    settingInternal.getLabel(), getETag(ifUnchanged, settingInternal), null,
                     toKeyValue(settingInternal), addTracingNamespace(context))
                                        .map(response -> toConfigurationSettingWithResponse(response))));
     }
@@ -716,7 +716,7 @@ public Mono<Response<ConfigurationSetting>> getConfigurationSettingWithResponse(
                 settingInternal ->
                     serviceClient.getKeyValueWithResponseAsync(settingInternal.getKey(), settingInternal.getLabel(),
                         acceptDateTime == null ? null : acceptDateTime.toString(), null,
-                        getEtag(ifChanged, settingInternal), null, addTracingNamespace(context))
+                        getETag(ifChanged, settingInternal), null, addTracingNamespace(context))
                         .onErrorResume(
                             HttpResponseException.class,
                             (Function<Throwable, Mono<ResponseBase<GetKeyValueHeaders, KeyValue>>>) throwable -> {
@@ -850,7 +850,7 @@ public Mono<Response<ConfigurationSetting>> deleteConfigurationSettingWithRespon
         boolean ifUnchanged) {
         return withContext(context -> validateSettingAsync(setting).flatMap(
             settingInternal -> serviceClient.deleteKeyValueWithResponseAsync(settingInternal.getKey(),
-                settingInternal.getLabel(), getEtag(ifUnchanged, settingInternal), addTracingNamespace(context))
+                settingInternal.getLabel(), getETag(ifUnchanged, settingInternal), addTracingNamespace(context))
                                    .map(response -> toConfigurationSettingWithResponse(response))));
     }
 
@@ -1311,7 +1311,7 @@ public Mono<ConfigurationSettingSnapshot> archiveSnapshot(String name) {
      * <!-- end com.azure.data.appconfiguration.configurationasyncclient.archiveSnapshotMaxOverload -->
      *
      * @param snapshot The snapshot to be archived.
-     * @param ifUnchanged Flag indicating if the {@code snapshot} {@link ConfigurationSettingSnapshot#getEtag ETag} is
+     * @param ifUnchanged Flag indicating if the {@code snapshot} {@link ConfigurationSettingSnapshot#getETag ETag} is
      * used as a IF-MATCH header.
      * @return A {@link Mono} of {@link ConfigurationSettingSnapshot}.
      */
@@ -1365,7 +1365,7 @@ public Mono<ConfigurationSettingSnapshot> recoverSnapshot(String name) {
      * <!-- end com.azure.data.appconfiguration.configurationasyncclient.recoverSnapshotMaxOverload -->
      *
      * @param snapshot The snapshot to be archived.
-     * @param ifUnchanged Flag indicating if the {@code snapshot} {@link ConfigurationSettingSnapshot#getEtag()} ETag}
+     * @param ifUnchanged Flag indicating if the {@code snapshot} {@link ConfigurationSettingSnapshot#getETag()} ETag}
      *                    is used as an IF-MATCH header.
      * @return A {@link Mono} of {@link ConfigurationSettingSnapshot}.
      */
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationClient.java b/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationClient.java
@@ -43,7 +43,7 @@
 import static com.azure.data.appconfiguration.implementation.Utility.ETAG_ANY;
 import static com.azure.data.appconfiguration.implementation.Utility.addTracingNamespace;
 import static com.azure.data.appconfiguration.implementation.Utility.enableSyncRestProxy;
-import static com.azure.data.appconfiguration.implementation.Utility.getEtag;
+import static com.azure.data.appconfiguration.implementation.Utility.getETag;
 import static com.azure.data.appconfiguration.implementation.Utility.iterableToList;
 import static com.azure.data.appconfiguration.implementation.Utility.toKeyValue;
 import static com.azure.data.appconfiguration.implementation.Utility.toSettingFieldsList;
@@ -573,7 +573,7 @@ public Response<ConfigurationSetting> setConfigurationSettingWithResponse(Config
         validateSetting(setting);
         final ResponseBase<PutKeyValueHeaders, KeyValue> response =
             serviceClient.putKeyValueWithResponse(setting.getKey(), setting.getLabel(),
-                getEtag(ifUnchanged, setting), null, toKeyValue(setting),
+                getETag(ifUnchanged, setting), null, toKeyValue(setting),
                 enableSyncRestProxy(addTracingNamespace(context)));
         return toConfigurationSettingWithResponse(response);
     }
@@ -720,7 +720,7 @@ public Response<ConfigurationSetting> getConfigurationSettingWithResponse(Config
             final ResponseBase<GetKeyValueHeaders, KeyValue> response =
                 serviceClient.getKeyValueWithResponse(setting.getKey(), setting.getLabel(),
                     acceptDateTime == null ? null : acceptDateTime.toString(), null,
-                    getEtag(ifChanged, setting), null, enableSyncRestProxy(addTracingNamespace(context)));
+                    getETag(ifChanged, setting), null, enableSyncRestProxy(addTracingNamespace(context)));
             return toConfigurationSettingWithResponse(response);
         } catch (HttpResponseException ex) {
             final HttpResponse httpResponse = ex.getResponse();
@@ -846,7 +846,7 @@ public Response<ConfigurationSetting> deleteConfigurationSettingWithResponse(Con
         validateSetting(setting);
         final ResponseBase<DeleteKeyValueHeaders, KeyValue> response =
             serviceClient.deleteKeyValueWithResponse(setting.getKey(), setting.getLabel(),
-                getEtag(ifUnchanged, setting), enableSyncRestProxy(addTracingNamespace(context)));
+                getETag(ifUnchanged, setting), enableSyncRestProxy(addTracingNamespace(context)));
         return toConfigurationSettingWithResponse(response);
     }
 
@@ -1358,7 +1358,7 @@ public ConfigurationSettingSnapshot archiveSnapshot(String name) {
      * <!-- end com.azure.data.appconfiguration.configurationclient.archiveSnapshotByNameMaxOverload -->
      *
      * @param snapshot The snapshot to be archived.
-     * @param ifUnchanged Flag indicating if the {@code snapshot} {@link ConfigurationSettingSnapshot#getEtag ETag} is
+     * @param ifUnchanged Flag indicating if the {@code snapshot} {@link ConfigurationSettingSnapshot#getETag ETag} is
      * used as a IF-MATCH header.
      * @param context Additional context that is passed through the Http pipeline during the service call.
      * @return A {@link Response} of {@link ConfigurationSettingSnapshot}.
@@ -1408,7 +1408,7 @@ public ConfigurationSettingSnapshot recoverSnapshot(String name) {
      * <!-- end com.azure.data.appconfiguration.configurationclient.recoverSnapshotMaxOverload -->
      *
      * @param snapshot The snapshot to be archived.
-     * @param ifUnchanged Flag indicating if the {@code snapshot} {@link ConfigurationSettingSnapshot#getEtag()} ETag}
+     * @param ifUnchanged Flag indicating if the {@code snapshot} {@link ConfigurationSettingSnapshot#getETag()} ETag}
      *                    is used as an IF-MATCH header.
      * @param context Additional context that is passed through the Http pipeline during the service call.
      * @return A {@link Response} of {@link ConfigurationSettingSnapshot}.
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/implementation/Utility.java b/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/implementation/Utility.java
@@ -105,16 +105,16 @@ private static String getETagValue(String etag) {
      * Get HTTP header value, if-match or if-none-match.. Used to perform an operation only if the targeted resource's
      * etag matches the value provided.
      */
-    public static String getEtag(boolean isEtagRequired, ConfigurationSetting setting) {
-        return isEtagRequired ? getETagValue(setting.getETag()) : null;
+    public static String getETag(boolean isETagRequired, ConfigurationSetting setting) {
+        return isETagRequired ? getETagValue(setting.getETag()) : null;
     }
 
-    public static String getEtagSnapshot(boolean isEtagRequired, ConfigurationSettingSnapshot snapshot) {
-        if (!isEtagRequired) {
+    public static String getETagSnapshot(boolean isETagRequired, ConfigurationSettingSnapshot snapshot) {
+        if (!isETagRequired) {
             return null;
         }
         Objects.requireNonNull(snapshot);
-        return getETagValue(snapshot.getEtag());
+        return getETagValue(snapshot.getETag());
     }
 
     /*
@@ -166,7 +166,7 @@ public static Response<ConfigurationSettingSnapshot> updateSnapshotSync(String s
         final ResponseBase<UpdateSnapshotHeaders, ConfigurationSettingSnapshot> response =
             serviceClient.updateSnapshotWithResponse(snapshotName,
                 new SnapshotUpdateParameters().setStatus(status),
-                getEtagSnapshot(ifUnchanged, snapshot), null, context);
+                getETagSnapshot(ifUnchanged, snapshot), null, context);
         return new SimpleResponse<>(response, response.getValue());
     }
 
@@ -175,7 +175,7 @@ public static Mono<Response<ConfigurationSettingSnapshot>> updateSnapshotAsync(S
         AzureAppConfigurationImpl serviceClient) {
         return serviceClient.updateSnapshotWithResponseAsync(snapshotName,
                 new SnapshotUpdateParameters().setStatus(status),
-                getEtagSnapshot(ifUnchanged, snapshot),
+                getETagSnapshot(ifUnchanged, snapshot),
                 null)
             .map(response -> new SimpleResponse<>(response, response.getValue()));
     }
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/models/ConfigurationSettingSnapshot.java b/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/models/ConfigurationSettingSnapshot.java
@@ -77,7 +77,7 @@ public final class ConfigurationSettingSnapshot implements JsonSerializable<Conf
     /*
      * A value representing the current state of the snapshot.
      */
-    private String etag;
+    private String eTag;
 
     /**
      * Creates an instance of ConfigurationSettingSnapshot class.
@@ -223,12 +223,12 @@ public ConfigurationSettingSnapshot setTags(Map<String, String> tags) {
     }
 
     /**
-     * Get the etag property: A value representing the current state of the snapshot.
+     * Get the eTag property: A value representing the current state of the snapshot.
      *
-     * @return the etag value.
+     * @return the eTag value.
      */
-    public String getEtag() {
-        return this.etag;
+    public String getETag() {
+        return this.eTag;
     }
 
     @Override
@@ -244,7 +244,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeNumberField("size", this.size);
         jsonWriter.writeNumberField("items_count", this.itemCount);
         jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element));
-        jsonWriter.writeStringField("etag", this.etag);
+        jsonWriter.writeStringField("etag", this.eTag);
         return jsonWriter.writeEndObject();
     }
 
@@ -271,7 +271,7 @@ public static ConfigurationSettingSnapshot fromJson(JsonReader jsonReader) throw
                     Long size = null;
                     Long itemCount = null;
                     Map<String, String> tags = null;
-                    String etag = null;
+                    String eTag = null;
                     while (reader.nextToken() != JsonToken.END_OBJECT) {
                         String fieldName = reader.getFieldName();
                         reader.nextToken();
@@ -302,7 +302,7 @@ public static ConfigurationSettingSnapshot fromJson(JsonReader jsonReader) throw
                         } else if ("tags".equals(fieldName)) {
                             tags = reader.readMap(reader1 -> reader1.getString());
                         } else if ("etag".equals(fieldName)) {
-                            etag = reader.getString();
+                            eTag = reader.getString();
                         } else {
                             reader.skipChildren();
                         }
@@ -319,7 +319,7 @@ public static ConfigurationSettingSnapshot fromJson(JsonReader jsonReader) throw
                         deserializedConfigurationSettingSnapshot.size = size;
                         deserializedConfigurationSettingSnapshot.itemCount = itemCount;
                         deserializedConfigurationSettingSnapshot.tags = tags;
-                        deserializedConfigurationSettingSnapshot.etag = etag;
+                        deserializedConfigurationSettingSnapshot.eTag = eTag;
 
                         return deserializedConfigurationSettingSnapshot;
                     }
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationClientTestBase.java b/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationClientTestBase.java
@@ -819,7 +819,7 @@ void assertEqualsConfigurationSettingSnapshot(String name, SnapshotStatus snapsh
         assertNotNull(actualSnapshot.getCreatedAt());
         assertEquals(itemCount, actualSnapshot.getItemCount());
         assertNotNull(actualSnapshot.getSize());
-        assertNotNull(actualSnapshot.getEtag());
+        assertNotNull(actualSnapshot.getETag());
 
         if (!CoreUtils.isNullOrEmpty(tags)) {
             assertEquals(tags, actualSnapshot.getTags());
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/swagger/README.md b/sdk/appconfiguration/azure-data-appconfiguration/swagger/README.md
@@ -41,7 +41,7 @@ customization-class: src/main/java/AppConfigCustomization.java
 ```yaml
 output-folder: ..\
 java: true
-use: '@autorest/java@4.1.16'
+use: '@autorest/java@4.1.17'
 enable-sync-stack: true
 generate-client-interfaces: false
 generate-client-as-impl: true
@@ -65,6 +65,7 @@ directive:
     $["items_count"]["x-ms-client-name"] = "item_count";
     $["created"]["x-ms-client-name"] = "createdAt"; 
     $["expires"]["x-ms-client-name"] = "expiresAt";
+    $["etag"]["x-ms-client-name"] = "eTag";
 ```
 
 ### Renames
