Skip to content

Commit 1f896c4

Browse files
authored
[AppConfig] Adding autorest customization supports for KeyValueFilter and KeyValueFields (Azure#34020)
1 parent 086e281 commit 1f896c4

File tree

12 files changed

+368
-222
lines changed

12 files changed

+368
-222
lines changed

sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationAsyncClient.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import com.azure.data.appconfiguration.implementation.SyncTokenPolicy;
2020
import com.azure.data.appconfiguration.implementation.models.GetKeyValueHeaders;
2121
import com.azure.data.appconfiguration.implementation.models.KeyValue;
22-
import com.azure.data.appconfiguration.implementation.models.KeyValueFields;
2322
import com.azure.data.appconfiguration.models.ConfigurationSetting;
2423
import com.azure.data.appconfiguration.models.FeatureFlagConfigurationSetting;
2524
import com.azure.data.appconfiguration.models.SecretReferenceConfigurationSetting;
25+
import com.azure.data.appconfiguration.models.SettingFields;
2626
import com.azure.data.appconfiguration.models.SettingSelector;
2727
import reactor.core.publisher.Mono;
2828

@@ -38,7 +38,7 @@
3838
import static com.azure.data.appconfiguration.implementation.Utility.addTracingNamespace;
3939
import static com.azure.data.appconfiguration.implementation.Utility.getEtag;
4040
import static com.azure.data.appconfiguration.implementation.Utility.toKeyValue;
41-
import static com.azure.data.appconfiguration.implementation.Utility.toKeyValueFieldsList;
41+
import static com.azure.data.appconfiguration.implementation.Utility.toSettingFieldsList;
4242
import static com.azure.data.appconfiguration.implementation.Utility.validateSettingAsync;
4343

4444
/**
@@ -772,16 +772,15 @@ public PagedFlux<ConfigurationSetting> listConfigurationSettings(SettingSelector
772772
final String keyFilter = selector == null ? null : selector.getKeyFilter();
773773
final String labelFilter = selector == null ? null : selector.getLabelFilter();
774774
final String acceptDateTime = selector == null ? null : selector.getAcceptDateTime();
775-
final List<KeyValueFields> keyValueFields = selector == null ? null
776-
: toKeyValueFieldsList(selector.getFields());
775+
final List<SettingFields> settingFields = selector == null ? null : toSettingFieldsList(selector.getFields());
777776
return new PagedFlux<>(
778777
() -> withContext(
779778
context -> serviceClient.getKeyValuesSinglePageAsync(
780779
keyFilter,
781780
labelFilter,
782781
null,
783782
acceptDateTime,
784-
keyValueFields,
783+
settingFields,
785784
null,
786785
addTracingNamespace(context))
787786
.map(pagedResponse -> toConfigurationSettingWithPagedResponse(pagedResponse))),
@@ -825,16 +824,15 @@ public PagedFlux<ConfigurationSetting> listRevisions(SettingSelector selector) {
825824
final String keyFilter = selector == null ? null : selector.getKeyFilter();
826825
final String labelFilter = selector == null ? null : selector.getLabelFilter();
827826
final String acceptDateTime = selector == null ? null : selector.getAcceptDateTime();
828-
final List<KeyValueFields> keyValueFields = selector == null ? null
829-
: toKeyValueFieldsList(selector.getFields());
827+
final List<SettingFields> settingFields = selector == null ? null : toSettingFieldsList(selector.getFields());
830828
return new PagedFlux<>(
831829
() -> withContext(
832830
context -> serviceClient.getRevisionsSinglePageAsync(
833831
keyFilter,
834832
labelFilter,
835833
null,
836834
acceptDateTime,
837-
keyValueFields,
835+
settingFields,
838836
addTracingNamespace(context))
839837
.map(pagedResponse -> toConfigurationSettingWithPagedResponse(pagedResponse))),
840838
nextLink -> withContext(

sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import static com.azure.data.appconfiguration.implementation.Utility.enableSyncRestProxy;
3939
import static com.azure.data.appconfiguration.implementation.Utility.getEtag;
4040
import static com.azure.data.appconfiguration.implementation.Utility.toKeyValue;
41-
import static com.azure.data.appconfiguration.implementation.Utility.toKeyValueFieldsList;
41+
import static com.azure.data.appconfiguration.implementation.Utility.toSettingFieldsList;
4242
import static com.azure.data.appconfiguration.implementation.Utility.validateSetting;
4343

4444
/**
@@ -808,7 +808,7 @@ public PagedIterable<ConfigurationSetting> listConfigurationSettings(SettingSele
808808
selector == null ? null : selector.getLabelFilter(),
809809
null,
810810
selector == null ? null : selector.getAcceptDateTime(),
811-
selector == null ? null : toKeyValueFieldsList(selector.getFields()),
811+
selector == null ? null : toSettingFieldsList(selector.getFields()),
812812
null,
813813
enableSyncRestProxy(addTracingNamespace(context)));
814814
return toConfigurationSettingWithPagedResponse(pagedResponse);
@@ -895,7 +895,7 @@ public PagedIterable<ConfigurationSetting> listRevisions(SettingSelector selecto
895895
selector == null ? null : selector.getLabelFilter(),
896896
null,
897897
acceptDateTime,
898-
selector == null ? null : toKeyValueFieldsList(selector.getFields()),
898+
selector == null ? null : toSettingFieldsList(selector.getFields()),
899899
enableSyncRestProxy(addTracingNamespace(context)));
900900
return toConfigurationSettingWithPagedResponse(pagedResponse);
901901
},

0 commit comments

Comments
 (0)