Skip to content

Commit 40baab9

Browse files
mssfangmssfang
authored
[AppConfig] Use the latest stable version 2023-10-01 and remove azure-core-experimental dependency (Azure#37472)
1 parent f1f1728 commit 40baab9

22 files changed

+91
-90
lines changed

‎eng/versioning/version_client.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ com.azure:azure-cosmos-encryption;2.6.0;2.7.0-beta.1
109109
com.azure:azure-cosmos-test;1.0.0-beta.6;1.0.0-beta.7
110110
com.azure:azure-cosmos-tests;1.0.0-beta.1;1.0.0-beta.1
111111
com.azure.cosmos.kafka:azure-cosmos-kafka-connect;1.0.0-beta.1;1.0.0-beta.1
112-
com.azure:azure-data-appconfiguration;1.4.10;1.5.0-beta.3
112+
com.azure:azure-data-appconfiguration;1.4.10;1.5.0
113113
com.azure:azure-data-appconfiguration-perf;1.0.0-beta.1;1.0.0-beta.1
114114
com.azure:azure-data-schemaregistry;1.4.0;1.5.0-beta.1
115115
com.azure:azure-data-schemaregistry-apacheavro;1.1.11;1.2.0-beta.2

‎sdk/appconfiguration/azure-data-appconfiguration-perf/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.azure</groupId>
3434
<artifactId>azure-data-appconfiguration</artifactId>
35-
<version>1.5.0-beta.3</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;current} -->
35+
<version>1.5.0</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;current} -->
3636
</dependency>
3737

3838
<dependency>

‎sdk/appconfiguration/azure-data-appconfiguration/CHANGELOG.md

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
11
# Release History
22

3-
## 1.5.0-beta.3 (Unreleased)
3+
## 1.5.0 (2023-11-08)
44

55
### Features Added
66

7+
- Added support for the `2023-10-01` service version.
8+
79
### Breaking Changes
810

9-
### Bugs Fixed
11+
Note: Below breaking changes only affect the version `1.5.0-beta.2`.
12+
13+
- Removed `azure-core-experimental` as a dependency and replaced usage of `PollResult` by `PollOperationDetails`.
1014

1115
### Other Changes
1216

17+
#### Dependency Updates
18+
19+
- Upgraded `azure-core` from `1.44.1` to version `1.45.0`.
20+
- Upgraded `azure-core-http-netty` from `1.13.9` to version `1.13.10`.
21+
1322
## 1.4.10 (2023-10-20)
1423

1524
### Other Changes

‎sdk/appconfiguration/azure-data-appconfiguration/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ add the direct dependency to your project as follows.
5555
<dependency>
5656
<groupId>com.azure</groupId>
5757
<artifactId>azure-data-appconfiguration</artifactId>
58-
<version>1.4.7</version>
58+
<version>1.5.0</version>
5959
</dependency>
6060
```
6161
[//]: # ({x-version-update-end})
@@ -461,7 +461,7 @@ String snapshotName = "{snapshotName}";
461461
List<ConfigurationSettingsFilter> filters = new ArrayList<>();
462462
// Key Name also supports RegExp but only support prefix end with "*", such as "k*" and is case-sensitive.
463463
filters.add(new ConfigurationSettingsFilter("Test*"));
464-
SyncPoller<PollResult, ConfigurationSnapshot> poller =
464+
SyncPoller<PollOperationDetails, ConfigurationSnapshot> poller =
465465
configurationClient.beginCreateSnapshot(snapshotName, new ConfigurationSnapshot(filters), Context.NONE);
466466
poller.setPollInterval(Duration.ofSeconds(10));
467467
poller.waitForCompletion();

‎sdk/appconfiguration/azure-data-appconfiguration/assets.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "java",
44
"TagPrefix": "java/appconfiguration/azure-data-appconfiguration",
5-
"Tag": "java/appconfiguration/azure-data-appconfiguration_b0d3480df4"
5+
"Tag": "java/appconfiguration/azure-data-appconfiguration_0d1870bb82"
66
}

‎sdk/appconfiguration/azure-data-appconfiguration/pom.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<groupId>com.azure</groupId>
1515
<artifactId>azure-data-appconfiguration</artifactId>
16-
<version>1.5.0-beta.3</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;current} -->
16+
<version>1.5.0</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;current} -->
1717

1818
<name>Microsoft Azure client library for App Configuration</name>
1919
<description>This package contains the Microsoft Azure App Configuration client library.</description>
@@ -63,11 +63,6 @@
6363
<artifactId>azure-core-http-netty</artifactId>
6464
<version>1.13.10</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
6565
</dependency>
66-
<dependency>
67-
<groupId>com.azure</groupId>
68-
<artifactId>azure-core-experimental</artifactId>
69-
<version>1.0.0-beta.46</version> <!-- {x-version-update;com.azure:azure-core-experimental;dependency} -->
70-
</dependency>
7166
<!-- Test dependencies -->
7267
<dependency>
7368
<groupId>com.azure</groupId>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.azure.core.exception.HttpResponseException;
1010
import com.azure.core.exception.ResourceModifiedException;
1111
import com.azure.core.exception.ResourceNotFoundException;
12-
import com.azure.core.experimental.models.PollResult;
1312
import com.azure.core.http.HttpResponse;
1413
import com.azure.core.http.MatchConditions;
1514
import com.azure.core.http.rest.PagedFlux;
@@ -18,6 +17,7 @@
1817
import com.azure.core.http.rest.SimpleResponse;
1918
import com.azure.core.util.Context;
2019
import com.azure.core.util.logging.ClientLogger;
20+
import com.azure.core.util.polling.PollOperationDetails;
2121
import com.azure.core.util.polling.PollerFlux;
2222
import com.azure.data.appconfiguration.implementation.AzureAppConfigurationImpl;
2323
import com.azure.data.appconfiguration.implementation.CreateSnapshotUtilClient;
@@ -1218,7 +1218,7 @@ public PagedFlux<ConfigurationSetting> listRevisions(SettingSelector selector) {
12181218
* has failed. The completed operation returns a {@link ConfigurationSnapshot}.
12191219
*/
12201220
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
1221-
public PollerFlux<PollResult, ConfigurationSnapshot> beginCreateSnapshot(
1221+
public PollerFlux<PollOperationDetails, ConfigurationSnapshot> beginCreateSnapshot(
12221222
String snapshotName, ConfigurationSnapshot snapshot) {
12231223
return createSnapshotUtilClient.beginCreateSnapshot(snapshotName, snapshot);
12241224
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.azure.core.exception.HttpResponseException;
1010
import com.azure.core.exception.ResourceModifiedException;
1111
import com.azure.core.exception.ResourceNotFoundException;
12-
import com.azure.core.experimental.models.PollResult;
1312
import com.azure.core.http.HttpResponse;
1413
import com.azure.core.http.MatchConditions;
1514
import com.azure.core.http.rest.PagedIterable;
@@ -19,6 +18,7 @@
1918
import com.azure.core.http.rest.SimpleResponse;
2019
import com.azure.core.util.Context;
2120
import com.azure.core.util.logging.ClientLogger;
21+
import com.azure.core.util.polling.PollOperationDetails;
2222
import com.azure.core.util.polling.SyncPoller;
2323
import com.azure.data.appconfiguration.implementation.AzureAppConfigurationImpl;
2424
import com.azure.data.appconfiguration.implementation.CreateSnapshotUtilClient;
@@ -1252,7 +1252,7 @@ public PagedIterable<ConfigurationSetting> listRevisions(SettingSelector selecto
12521252
* String snapshotName = &quot;&#123;snapshotName&#125;&quot;;
12531253
* Context ctx = new Context&#40;key2, value2&#41;;
12541254
*
1255-
* SyncPoller&lt;PollResult, ConfigurationSnapshot&gt; poller =
1255+
* SyncPoller&lt;PollOperationDetails, ConfigurationSnapshot&gt; poller =
12561256
* client.beginCreateSnapshot&#40;snapshotName,
12571257
* new ConfigurationSnapshot&#40;filters&#41;.setRetentionPeriod&#40;Duration.ofHours&#40;1&#41;&#41;, ctx&#41;;
12581258
* poller.setPollInterval&#40;Duration.ofSeconds&#40;10&#41;&#41;;
@@ -1270,7 +1270,7 @@ public PagedIterable<ConfigurationSetting> listRevisions(SettingSelector selecto
12701270
* has failed. The completed operation returns a {@link ConfigurationSnapshot}.
12711271
*/
12721272
@ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
1273-
public SyncPoller<PollResult, ConfigurationSnapshot> beginCreateSnapshot(
1273+
public SyncPoller<PollOperationDetails, ConfigurationSnapshot> beginCreateSnapshot(
12741274
String snapshotName, ConfigurationSnapshot snapshot, Context context) {
12751275
return createSnapshotUtilClient.beginCreateSnapshot(snapshotName, snapshot, context);
12761276
}

‎sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationServiceVersion.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ public enum ConfigurationServiceVersion implements ServiceVersion {
1515
V1_0("1.0"),
1616

1717
/**
18-
* Service version {@code 2022-11-01-preview}.
18+
* Service version {@code 2023-10-01}.
1919
*/
20-
V2022_11_01_PREVIEW("2022-11-01-preview");
20+
V2023_10_01("2023-10-01");
2121

2222
private final String version;
2323

@@ -39,6 +39,6 @@ public String getVersion() {
3939
* @return the latest {@link ConfigurationServiceVersion}
4040
*/
4141
public static ConfigurationServiceVersion getLatest() {
42-
return V2022_11_01_PREVIEW;
42+
return V2023_10_01;
4343
}
4444
}

‎sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/implementation/CreateSnapshotUtilClient.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
package com.azure.data.appconfiguration.implementation;
55

66

7-
import com.azure.core.experimental.models.PollResult;
87
import com.azure.core.http.rest.Response;
98
import com.azure.core.http.rest.ResponseBase;
109
import com.azure.core.util.BinaryData;
1110
import com.azure.core.util.Context;
1211
import com.azure.core.util.logging.ClientLogger;
1312
import com.azure.core.util.polling.LongRunningOperationStatus;
13+
import com.azure.core.util.polling.PollOperationDetails;
1414
import com.azure.core.util.polling.PollResponse;
1515
import com.azure.core.util.polling.PollerFlux;
1616
import com.azure.core.util.polling.PollingContext;
@@ -44,7 +44,7 @@ public CreateSnapshotUtilClient(AzureAppConfigurationImpl service) {
4444
this.service = service;
4545
}
4646

47-
public PollerFlux<PollResult, ConfigurationSnapshot> beginCreateSnapshot(String name,
47+
public PollerFlux<PollOperationDetails, ConfigurationSnapshot> beginCreateSnapshot(String name,
4848
ConfigurationSnapshot snapshot) {
4949
try {
5050
return new PollerFlux<>(
@@ -54,7 +54,7 @@ public PollerFlux<PollResult, ConfigurationSnapshot> beginCreateSnapshot(String
5454
.map(response -> {
5555
final Map<String, String> pollResponse = new HashMap<>();
5656
pollResponse.put("id", response.getDeserializedHeaders().getOperationLocation());
57-
return BinaryData.fromObject(pollResponse).toObject(PollResult.class);
57+
return BinaryData.fromObject(pollResponse).toObject(PollOperationDetails.class);
5858
})),
5959
pollingOperation(
6060
operationId -> service.getOperationDetailsWithResponseAsync(name, Context.NONE)),
@@ -70,7 +70,7 @@ public PollerFlux<PollResult, ConfigurationSnapshot> beginCreateSnapshot(String
7070
}
7171
}
7272

73-
public SyncPoller<PollResult, ConfigurationSnapshot> beginCreateSnapshot(String name,
73+
public SyncPoller<PollOperationDetails, ConfigurationSnapshot> beginCreateSnapshot(String name,
7474
ConfigurationSnapshot snapshot, Context context) {
7575
try {
7676
final Context finalContext = getNotNullContext(context);
@@ -93,8 +93,8 @@ public SyncPoller<PollResult, ConfigurationSnapshot> beginCreateSnapshot(String
9393
}
9494

9595
// Activation operation
96-
private Function<PollingContext<PollResult>, Mono<PollResult>>
97-
activationOperation(Mono<PollResult> operationResult) {
96+
private Function<PollingContext<PollOperationDetails>, Mono<PollOperationDetails>>
97+
activationOperation(Mono<PollOperationDetails> operationResult) {
9898
return pollingContext -> {
9999
try {
100100
return operationResult;
@@ -104,7 +104,7 @@ public SyncPoller<PollResult, ConfigurationSnapshot> beginCreateSnapshot(String
104104
};
105105
}
106106

107-
private Function<PollingContext<PollResult>, PollResult>
107+
private Function<PollingContext<PollOperationDetails>, PollOperationDetails>
108108
activationOperationSync(String name, ConfigurationSnapshot snapshot, Context context) {
109109
return pollingContext -> {
110110
try {
@@ -113,19 +113,19 @@ public SyncPoller<PollResult, ConfigurationSnapshot> beginCreateSnapshot(String
113113
service.createSnapshotWithResponse(name, snapshot, finalContext);
114114
final Map<String, String> pollResponse = new HashMap<>();
115115
pollResponse.put("id", snapshotWithResponse.getDeserializedHeaders().getOperationLocation());
116-
return BinaryData.fromObject(pollResponse).toObject(PollResult.class);
116+
return BinaryData.fromObject(pollResponse).toObject(PollOperationDetails.class);
117117
} catch (RuntimeException ex) {
118118
throw LOGGER.logExceptionAsError(ex);
119119
}
120120
};
121121
}
122122

123123
// Polling operation
124-
private Function<PollingContext<PollResult>, Mono<PollResponse<PollResult>>>
124+
private Function<PollingContext<PollOperationDetails>, Mono<PollResponse<PollOperationDetails>>>
125125
pollingOperation(Function<String, Mono<Response<OperationDetails>>> pollingFunction) {
126126
return pollingContext -> {
127127
try {
128-
final PollResponse<PollResult> pollResponse =
128+
final PollResponse<PollOperationDetails> pollResponse =
129129
pollingContext.getLatestResponse();
130130
final String operationId = pollResponse.getValue().getOperationId();
131131
return pollingFunction.apply(operationId)
@@ -137,11 +137,11 @@ public SyncPoller<PollResult, ConfigurationSnapshot> beginCreateSnapshot(String
137137
};
138138
}
139139

140-
private Function<PollingContext<PollResult>, PollResponse<PollResult>>
140+
private Function<PollingContext<PollOperationDetails>, PollResponse<PollOperationDetails>>
141141
pollingOperationSync(Function<String, Response<OperationDetails>> pollingFunction) {
142142
return pollingContext -> {
143143
try {
144-
final PollResponse<PollResult> pollResponse =
144+
final PollResponse<PollOperationDetails> pollResponse =
145145
pollingContext.getLatestResponse();
146146
return processResponse(pollingFunction.apply(pollResponse.getValue().getOperationId()), pollResponse);
147147
} catch (RuntimeException ex) {
@@ -151,7 +151,7 @@ public SyncPoller<PollResult, ConfigurationSnapshot> beginCreateSnapshot(String
151151
}
152152

153153
// Fetching operation
154-
private Function<PollingContext<PollResult>,
154+
private Function<PollingContext<PollOperationDetails>,
155155
Mono<ConfigurationSnapshot>> fetchingOperation(
156156
Function<String, Mono<ConfigurationSnapshot>> fetchingFunction) {
157157
return pollingContext -> {
@@ -164,7 +164,7 @@ Mono<ConfigurationSnapshot>> fetchingOperation(
164164
};
165165
}
166166

167-
private Function<PollingContext<PollResult>, ConfigurationSnapshot> fetchingOperationSync(
167+
private Function<PollingContext<PollOperationDetails>, ConfigurationSnapshot> fetchingOperationSync(
168168
Function<String, ConfigurationSnapshot> fetchingFunction) {
169169
return pollingContext -> {
170170
try {
@@ -176,9 +176,9 @@ private Function<PollingContext<PollResult>, ConfigurationSnapshot> fetchingOper
176176
};
177177
}
178178

179-
private PollResponse<PollResult> processResponse(
179+
private PollResponse<PollOperationDetails> processResponse(
180180
Response<OperationDetails> response,
181-
PollResponse<PollResult> operationResultPollResponse) {
181+
PollResponse<PollOperationDetails> operationResultPollResponse) {
182182
LongRunningOperationStatus status;
183183
State state = response.getValue().getStatus();
184184
if (NOT_STARTED.equals(state) || RUNNING.equals(state)) {

‎sdk/appconfiguration/azure-data-appconfiguration/src/main/java/module-info.java

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
module com.azure.data.appconfiguration {
55
requires transitive com.azure.core;
6-
requires transitive com.azure.core.experimental;
76
requires com.azure.json;
87

98
opens com.azure.data.appconfiguration.implementation to com.azure.core;

‎sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/com/azure/data/appconfiguration/ConfigurationClientJavaDocCodeSnippets.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
package com.azure.data.appconfiguration;
55

6-
import com.azure.core.experimental.models.PollResult;
76
import com.azure.core.http.HttpPipeline;
87
import com.azure.core.http.HttpPipelineBuilder;
98
import com.azure.core.http.MatchConditions;
109
import com.azure.core.http.rest.Response;
1110
import com.azure.core.util.Configuration;
1211
import com.azure.core.util.Context;
12+
import com.azure.core.util.polling.PollOperationDetails;
1313
import com.azure.core.util.polling.SyncPoller;
1414
import com.azure.data.appconfiguration.models.ConfigurationSetting;
1515
import com.azure.data.appconfiguration.models.ConfigurationSettingsFilter;
@@ -427,7 +427,7 @@ public void beginCreateSnapshotMaxOverload() {
427427
String snapshotName = "{snapshotName}";
428428
Context ctx = new Context(key2, value2);
429429

430-
SyncPoller<PollResult, ConfigurationSnapshot> poller =
430+
SyncPoller<PollOperationDetails, ConfigurationSnapshot> poller =
431431
client.beginCreateSnapshot(snapshotName,
432432
new ConfigurationSnapshot(filters).setRetentionPeriod(Duration.ofHours(1)), ctx);
433433
poller.setPollInterval(Duration.ofSeconds(10));

‎sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/com/azure/data/appconfiguration/CreateSnapshot.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
package com.azure.data.appconfiguration;
55

6-
import com.azure.core.experimental.models.PollResult;
76
import com.azure.core.util.Context;
7+
import com.azure.core.util.polling.PollOperationDetails;
88
import com.azure.core.util.polling.SyncPoller;
99
import com.azure.data.appconfiguration.models.ConfigurationSetting;
1010
import com.azure.data.appconfiguration.models.ConfigurationSettingsFilter;
@@ -49,7 +49,7 @@ public static void main(String[] args) {
4949

5050
// Create a snapshot
5151
String snapshotName = "{snapshotName}";
52-
SyncPoller<PollResult, ConfigurationSnapshot> poller =
52+
SyncPoller<PollOperationDetails, ConfigurationSnapshot> poller =
5353
client.beginCreateSnapshot(snapshotName, new ConfigurationSnapshot(filters), Context.NONE);
5454
poller.setPollInterval(Duration.ofSeconds(10));
5555
poller.waitForCompletion();

‎sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/com/azure/data/appconfiguration/ListSnapshots.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
package com.azure.data.appconfiguration;
55

6-
import com.azure.core.experimental.models.PollResult;
76
import com.azure.core.util.Configuration;
87
import com.azure.core.util.Context;
8+
import com.azure.core.util.polling.PollOperationDetails;
99
import com.azure.core.util.polling.SyncPoller;
1010
import com.azure.data.appconfiguration.models.ConfigurationSetting;
1111
import com.azure.data.appconfiguration.models.ConfigurationSettingsFilter;
@@ -50,7 +50,7 @@ public static void main(String[] args) {
5050

5151
// 1. Create first snapshot
5252
String snapshotNameTest = "{snapshotNameInTest}";
53-
SyncPoller<PollResult, ConfigurationSnapshot> poller =
53+
SyncPoller<PollOperationDetails, ConfigurationSnapshot> poller =
5454
client.beginCreateSnapshot(snapshotNameTest, new ConfigurationSnapshot(filters), null);
5555
poller.setPollInterval(Duration.ofSeconds(10));
5656
poller.waitForCompletion();
@@ -71,7 +71,7 @@ public static void main(String[] args) {
7171

7272
// 2. Create second snapshot
7373
String snapshotNameProduct = "{snapshotNameInProduct}";
74-
SyncPoller<PollResult, ConfigurationSnapshot> pollerProduct =
74+
SyncPoller<PollOperationDetails, ConfigurationSnapshot> pollerProduct =
7575
client.beginCreateSnapshot(snapshotNameProduct, new ConfigurationSnapshot(filters), Context.NONE);
7676
pollerProduct.setPollInterval(Duration.ofSeconds(10));
7777
pollerProduct.waitForCompletion();

0 commit comments

Comments
 (0)