Skip to content

Commit 022c0ee

Browse files
mukundansundarmacromania
mukundansundar
authored and
macromania
committed
Convert Config API to Stable endpoints. (dapr#846)
Signed-off-by: Mahmut Canga <[email protected]>
1 parent 7ade730 commit 022c0ee

20 files changed

+612
-528
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
spring-boot-version: 2.3.6.RELEASE
3939
experimental: false
4040
env:
41-
GOVER: 1.19
41+
GOVER: "1.20"
4242
GOOS: linux
4343
GOARCH: amd64
4444
GOPROXY: https://proxy.golang.org
@@ -47,7 +47,7 @@ jobs:
4747
DAPR_RUNTIME_VER: 1.10.6-rc.2
4848
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.10.0/install/install.sh
4949
DAPR_CLI_REF:
50-
DAPR_REF:
50+
DAPR_REF: 1415e23b14628db70adf9403f5a18876f40b6924
5151
steps:
5252
- uses: actions/checkout@v3
5353
- name: Set up OpenJDK ${{ env.JDK_VER }}

‎.github/workflows/validate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
matrix:
3333
java: [ 11, 13, 15, 16 ]
3434
env:
35-
GOVER: 1.19
35+
GOVER: "1.20"
3636
GOOS: linux
3737
GOARCH: amd64
3838
GOPROXY: https://proxy.golang.org
@@ -41,7 +41,7 @@ jobs:
4141
DAPR_RUNTIME_VER: 1.10.6-rc.2
4242
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.10.0/install/install.sh
4343
DAPR_CLI_REF:
44-
DAPR_REF:
44+
DAPR_REF: 1415e23b14628db70adf9403f5a18876f40b6924
4545
steps:
4646
- uses: actions/checkout@v3
4747
- name: Set up OpenJDK ${{ env.JDK_VER }}

‎examples/src/main/java/io/dapr/examples/configuration/grpc/ConfigurationClient.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
package io.dapr.examples.configuration.grpc;
1515

16+
import io.dapr.client.DaprClient;
1617
import io.dapr.client.DaprClientBuilder;
1718
import io.dapr.client.DaprPreviewClient;
1819
import io.dapr.client.domain.ConfigurationItem;
@@ -44,8 +45,8 @@ public class ConfigurationClient {
4445
* @throws Exception throws Exception
4546
*/
4647
public static void main(String[] args) throws Exception {
47-
try (DaprPreviewClient client = (new DaprClientBuilder()).buildPreviewClient()) {
48-
System.out.println("Using preview client...");
48+
try (DaprClient client = (new DaprClientBuilder()).build()) {
49+
System.out.println("Using Dapr client...");
4950
getConfigurations(client);
5051
subscribeConfigurationRequest(client);
5152
}
@@ -56,7 +57,7 @@ public static void main(String[] args) throws Exception {
5657
*
5758
* @param client DaprPreviewClient object
5859
*/
59-
public static void getConfigurations(DaprPreviewClient client) {
60+
public static void getConfigurations(DaprClient client) {
6061
System.out.println("*******trying to retrieve configurations for a list of keys********");
6162
List<String> keys = new ArrayList<>();
6263
keys.add("myconfig1");
@@ -76,7 +77,7 @@ public static void getConfigurations(DaprPreviewClient client) {
7677
*
7778
* @param client DaprPreviewClient object
7879
*/
79-
public static void subscribeConfigurationRequest(DaprPreviewClient client) {
80+
public static void subscribeConfigurationRequest(DaprClient client) {
8081
System.out.println("Subscribing to key: myconfig1");
8182
SubscribeConfigurationRequest req = new SubscribeConfigurationRequest(
8283
CONFIG_STORE_NAME, Collections.singletonList("myconfig1"));

‎examples/src/main/java/io/dapr/examples/configuration/grpc/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
## Retrieve Configurations via Configuration API
22

33
This example provides the different capabilities provided by Dapr Java SDK for Configuration. For further information about Configuration APIs please refer to [this link](https://docs.dapr.io/developing-applications/building-blocks/configuration/)
4-
**This API is available in Preview Mode**.
54

65
### Using the ConfigurationAPI
76

@@ -63,7 +62,7 @@ public class ConfigurationClient {
6362
*/
6463
public static void main(String[] args) throws Exception {
6564
try (DaprPreviewClient client = (new DaprClientBuilder()).buildPreviewClient()) {
66-
System.out.println("Using preview client...");
65+
System.out.println("Using Dapr client...");
6766
getConfigurations(client);
6867
subscribeConfigurationRequestWithSubscribe(client);
6968
unsubscribeConfigurationItems(client);
@@ -134,7 +133,7 @@ Use the following command to run this example-
134133
<!-- STEP
135134
name: Run ConfigurationClient example
136135
expected_stdout_lines:
137-
- "== APP == Using preview client..."
136+
- "== APP == Using Dapr client..."
138137
- "== APP == *******trying to retrieve configurations for a list of keys********"
139138
- "== APP == val1 : key ->myconfig1"
140139
- "== APP == val2 : key ->myconfig2"
@@ -155,7 +154,7 @@ dapr run --components-path ./components/configuration --app-id configgrpc --log-
155154

156155
### Sample output
157156
```
158-
== APP == Using preview client...
157+
== APP == Using Dapr client...
159158
== APP == *******trying to retrieve configurations for a list of keys********
160159
== APP == val1 : key ->myconfig1
161160
== APP == val2 : key ->myconfig2

‎examples/src/main/java/io/dapr/examples/configuration/http/ConfigurationClient.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package io.dapr.examples.configuration.http;
1515

1616
import io.dapr.client.DaprApiProtocol;
17+
import io.dapr.client.DaprClient;
1718
import io.dapr.client.DaprClientBuilder;
1819
import io.dapr.client.DaprPreviewClient;
1920
import io.dapr.client.domain.ConfigurationItem;
@@ -42,8 +43,8 @@ public class ConfigurationClient {
4243
*/
4344
public static void main(String[] args) throws Exception {
4445
System.getProperties().setProperty(Properties.API_PROTOCOL.getName(), DaprApiProtocol.HTTP.name());
45-
try (DaprPreviewClient client = (new DaprClientBuilder()).buildPreviewClient()) {
46-
System.out.println("Using preview client...");
46+
try (DaprClient client = (new DaprClientBuilder()).build()) {
47+
System.out.println("Using Dapr client...");
4748
getConfigurations(client);
4849
subscribeConfigurationRequest(client);
4950
}
@@ -54,7 +55,7 @@ public static void main(String[] args) throws Exception {
5455
*
5556
* @param client DaprPreviewClient object
5657
*/
57-
public static void getConfigurations(DaprPreviewClient client) {
58+
public static void getConfigurations(DaprClient client) {
5859
System.out.println("*******trying to retrieve configurations for a list of keys********");
5960
List<String> keys = new ArrayList<>();
6061
keys.add("myconfig1");
@@ -79,7 +80,7 @@ public static void getConfigurations(DaprPreviewClient client) {
7980
*
8081
* @param client DaprPreviewClient object
8182
*/
82-
public static void subscribeConfigurationRequest(DaprPreviewClient client) throws InterruptedException {
83+
public static void subscribeConfigurationRequest(DaprClient client) throws InterruptedException {
8384
System.out.println("Subscribing to key: myconfig2");
8485
SubscribeConfigurationRequest req = new SubscribeConfigurationRequest(
8586
CONFIG_STORE_NAME, Collections.singletonList("myconfig2"));

‎examples/src/main/java/io/dapr/examples/configuration/http/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class ConfigurationClient {
6464
public static void main(String[] args) throws Exception {
6565
System.getProperties().setProperty(Properties.API_PROTOCOL.getName(), DaprApiProtocol.HTTP.name());
6666
try (DaprPreviewClient client = (new DaprClientBuilder()).buildPreviewClient()) {
67-
System.out.println("Using preview client...");
67+
System.out.println("Using Dapr client...");
6868
getConfigurations(client);
6969
subscribeConfigurationRequest(client);
7070
}
@@ -153,7 +153,7 @@ Use the following command to run this example-
153153
<!-- STEP
154154
name: Run ConfigurationClient example
155155
expected_stdout_lines:
156-
- "== APP == Using preview client..."
156+
- "== APP == Using Dapr client..."
157157
- "== APP == *******trying to retrieve configurations for a list of keys********"
158158
- "== APP == val1 : key ->myconfig1"
159159
- "== APP == val2 : key ->myconfig2"
@@ -184,7 +184,7 @@ docker exec dapr_redis redis-cli MSET myconfig2 "updated_val2||1"
184184

185185
### Sample output
186186
```
187-
== APP == Using preview client...
187+
== APP == Using Dapr client...
188188
== APP == *******trying to retrieve configurations for a list of keys********
189189
== APP == val1 : key ->myconfig1
190190
== APP == val2 : key ->myconfig2

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<grpc.version>1.42.1</grpc.version>
1818
<protobuf.version>3.17.3</protobuf.version>
19-
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.10.0-rc.2/dapr/proto</dapr.proto.baseurl>
19+
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/1415e23b14628db70adf9403f5a18876f40b6924/dapr/proto</dapr.proto.baseurl>
2020
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
2121
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
2222
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
@@ -65,7 +65,7 @@
6565
<dependency>
6666
<groupId>junit</groupId>
6767
<artifactId>junit</artifactId>
68-
<version>4.13.1</version>
68+
<version>4.13.2</version>
6969
<scope>test</scope>
7070
</dependency>
7171
<dependency>

‎sdk-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<dependency>
104104
<groupId>junit</groupId>
105105
<artifactId>junit</artifactId>
106-
<version>4.13.1</version>
106+
<version>4.13.2</version>
107107
<scope>test</scope>
108108
</dependency>
109109
<dependency>

‎sdk-tests/src/test/java/io/dapr/it/configuration/grpc/ConfigurationClientIT.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
package io.dapr.it.configuration.grpc;
1515

16+
import io.dapr.client.DaprClient;
1617
import io.dapr.client.DaprClientBuilder;
17-
import io.dapr.client.DaprPreviewClient;
1818
import io.dapr.client.domain.ConfigurationItem;
1919
import io.dapr.client.domain.SubscribeConfigurationResponse;
2020
import io.dapr.client.domain.UnsubscribeConfigurationResponse;
@@ -37,7 +37,7 @@ public class ConfigurationClientIT extends BaseIT {
3737

3838
private static DaprRun daprRun;
3939

40-
private static DaprPreviewClient daprPreviewClient;
40+
private static DaprClient daprClient;
4141

4242
private static String key = "myconfig1";
4343

@@ -63,12 +63,12 @@ public class ConfigurationClientIT extends BaseIT {
6363
public static void init() throws Exception {
6464
daprRun = startDaprApp(ConfigurationClientIT.class.getSimpleName(), 5000);
6565
daprRun.switchToGRPC();
66-
daprPreviewClient = new DaprClientBuilder().buildPreviewClient();
66+
daprClient = new DaprClientBuilder().build();
6767
}
6868

6969
@AfterClass
7070
public static void tearDown() throws Exception {
71-
daprPreviewClient.close();
71+
daprClient.close();
7272
}
7373

7474
@Before
@@ -78,13 +78,13 @@ public void setupConfigStore() {
7878

7979
@Test
8080
public void getConfiguration() {
81-
ConfigurationItem ci = daprPreviewClient.getConfiguration(CONFIG_STORE_NAME, "myconfigkey1").block();
81+
ConfigurationItem ci = daprClient.getConfiguration(CONFIG_STORE_NAME, "myconfigkey1").block();
8282
assertEquals(ci.getValue(), "myconfigvalue1");
8383
}
8484

8585
@Test
8686
public void getConfigurations() {
87-
Map<String, ConfigurationItem> cis = daprPreviewClient.getConfiguration(CONFIG_STORE_NAME, "myconfigkey1", "myconfigkey2").block();
87+
Map<String, ConfigurationItem> cis = daprClient.getConfiguration(CONFIG_STORE_NAME, "myconfigkey1", "myconfigkey2").block();
8888
assertTrue(cis.size() == 2);
8989
assertTrue(cis.containsKey("myconfigkey1"));
9090
assertTrue(cis.containsKey("myconfigkey2"));
@@ -94,7 +94,7 @@ public void getConfigurations() {
9494
@Test
9595
public void subscribeConfiguration() {
9696
Runnable subscribeTask = () -> {
97-
Flux<SubscribeConfigurationResponse> outFlux = daprPreviewClient
97+
Flux<SubscribeConfigurationResponse> outFlux = daprClient
9898
.subscribeConfiguration(CONFIG_STORE_NAME, "myconfigkey1", "myconfigkey2");
9999
outFlux.subscribe(update -> {
100100
if (update.getItems().size() == 0 ) {
@@ -132,7 +132,7 @@ public void unsubscribeConfigurationItems() {
132132
AtomicReference<Disposable> disposableAtomicReference = new AtomicReference<>();
133133
AtomicReference<String> subscriptionId = new AtomicReference<>();
134134
Runnable subscribeTask = () -> {
135-
Flux<SubscribeConfigurationResponse> outFlux = daprPreviewClient
135+
Flux<SubscribeConfigurationResponse> outFlux = daprClient
136136
.subscribeConfiguration(CONFIG_STORE_NAME, "myconfigkey1");
137137
disposableAtomicReference.set(outFlux
138138
.subscribe(update -> {
@@ -163,7 +163,7 @@ public void unsubscribeConfigurationItems() {
163163
// To ensure key starts getting updated
164164
inducingSleepTime(1000);
165165

166-
UnsubscribeConfigurationResponse res = daprPreviewClient.unsubscribeConfiguration(
166+
UnsubscribeConfigurationResponse res = daprClient.unsubscribeConfiguration(
167167
subscriptionId.get(),
168168
CONFIG_STORE_NAME
169169
).block();

‎sdk-tests/src/test/java/io/dapr/it/configuration/http/ConfigurationIT.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.dapr.it.configuration.http;
22

3+
import io.dapr.client.DaprClient;
34
import io.dapr.client.DaprClientBuilder;
4-
import io.dapr.client.DaprPreviewClient;
55
import io.dapr.client.domain.ConfigurationItem;
66
import io.dapr.it.BaseIT;
77
import io.dapr.it.DaprRun;
@@ -21,7 +21,7 @@ public class ConfigurationIT extends BaseIT {
2121

2222
private static DaprRun daprRun;
2323

24-
private static DaprPreviewClient daprPreviewClient;
24+
private static DaprClient daprClient;
2525

2626
private static String key = "myconfig1";
2727

@@ -39,12 +39,12 @@ public class ConfigurationIT extends BaseIT {
3939
public static void init() throws Exception {
4040
daprRun = startDaprApp(ConfigurationIT.class.getSimpleName(), 5000);
4141
daprRun.switchToHTTP();
42-
daprPreviewClient = new DaprClientBuilder().buildPreviewClient();
42+
daprClient = new DaprClientBuilder().build();
4343
}
4444

4545
@AfterClass
4646
public static void tearDown() throws Exception {
47-
daprPreviewClient.close();
47+
daprClient.close();
4848
}
4949

5050
@Before
@@ -54,14 +54,14 @@ public void setupConfigStore() {
5454

5555
@Test
5656
public void getConfiguration() {
57-
ConfigurationItem ci = daprPreviewClient.getConfiguration(CONFIG_STORE_NAME, "myconfigkey1").block();
57+
ConfigurationItem ci = daprClient.getConfiguration(CONFIG_STORE_NAME, "myconfigkey1").block();
5858
assertEquals(ci.getKey(), "myconfigkey1");
5959
assertEquals(ci.getValue(), "myconfigvalue1");
6060
}
6161

6262
@Test
6363
public void getConfigurations() {
64-
Map<String, ConfigurationItem> cis = daprPreviewClient.getConfiguration(CONFIG_STORE_NAME, "myconfigkey1", "myconfigkey2").block();
64+
Map<String, ConfigurationItem> cis = daprClient.getConfiguration(CONFIG_STORE_NAME, "myconfigkey1", "myconfigkey2").block();
6565
assertTrue(cis.size() == 2);
6666
assertTrue(cis.containsKey("myconfigkey1"));
6767
assertTrue(cis.containsKey("myconfigkey2"));

‎sdk-tests/src/test/java/io/dapr/it/configuration/http/ConfigurationSubscribeIT.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.dapr.it.configuration.http;
22

3+
import io.dapr.client.DaprClient;
34
import io.dapr.client.DaprClientBuilder;
4-
import io.dapr.client.DaprPreviewClient;
55
import io.dapr.client.domain.SubscribeConfigurationResponse;
66
import io.dapr.client.domain.UnsubscribeConfigurationResponse;
77
import io.dapr.it.BaseIT;
@@ -23,7 +23,7 @@ public class ConfigurationSubscribeIT extends BaseIT {
2323

2424
private static DaprRun daprRun;
2525

26-
private static DaprPreviewClient daprPreviewClient;
26+
private static DaprClient daprClient;
2727

2828
private static String key = "myconfig1";
2929

@@ -46,12 +46,12 @@ public static void init() throws Exception {
4646
true,
4747
60000);
4848
daprRun.switchToHTTP();
49-
daprPreviewClient = new DaprClientBuilder().buildPreviewClient();
49+
daprClient = new DaprClientBuilder().build();
5050
}
5151

5252
@AfterClass
5353
public static void tearDown() throws Exception {
54-
daprPreviewClient.close();
54+
daprClient.close();
5555
}
5656

5757
@Before
@@ -62,14 +62,14 @@ public void setupConfigStore() {
6262
@Test
6363
public void subscribeAndUnsubscribeConfiguration() {
6464
AtomicReference<String> subId= new AtomicReference<>("");
65-
Flux<SubscribeConfigurationResponse> outFlux = daprPreviewClient
65+
Flux<SubscribeConfigurationResponse> outFlux = daprClient
6666
.subscribeConfiguration(CONFIG_STORE_NAME, "myconfigkey1", "myconfigkey2");
6767
outFlux.subscribe(items -> {
6868
subId.set(items.getSubscriptionId());
6969
});
7070
assertTrue(subId.get().length() > 0);
7171

72-
UnsubscribeConfigurationResponse res = daprPreviewClient.unsubscribeConfiguration(
72+
UnsubscribeConfigurationResponse res = daprClient.unsubscribeConfiguration(
7373
subId.get(),
7474
CONFIG_STORE_NAME
7575
).block();

0 commit comments

Comments
 (0)