Skip to content

Commit c8b1846

Browse files
artursouzaartursouza
authored
Merge branch 'master' into spring-boot-docs
2 parents 47f5579 + 8a0913d commit c8b1846

File tree

71 files changed

+1108
-938
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1108
-938
lines changed

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ jobs:
3838
GOARCH: amd64
3939
GOPROXY: https://proxy.golang.org
4040
JDK_VER: ${{ matrix.java }}
41-
DAPR_CLI_VER: 1.14.0-rc.6
42-
DAPR_RUNTIME_VER: 1.14.0-rc.6
43-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0-rc.4/install/install.sh
41+
DAPR_CLI_VER: 1.14.0
42+
DAPR_RUNTIME_VER: 1.14.4
43+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0/install/install.sh
4444
DAPR_CLI_REF:
4545
DAPR_REF:
4646
TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64

‎.github/workflows/validate.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ jobs:
3737
GOARCH: amd64
3838
GOPROXY: https://proxy.golang.org
3939
JDK_VER: ${{ matrix.java }}
40-
DAPR_CLI_VER: 1.14.0-rc.6
41-
DAPR_RUNTIME_VER: 1.14.0-rc.6
42-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0-rc.3/install/install.sh
40+
DAPR_CLI_VER: 1.14.0
41+
DAPR_RUNTIME_VER: 1.14.4
42+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0/install/install.sh
4343
DAPR_CLI_REF:
4444
DAPR_REF:
4545
steps:
@@ -160,3 +160,7 @@ jobs:
160160
working-directory: ./examples
161161
run: |
162162
mm.py ./src/main/java/io/dapr/examples/workflows/README.md
163+
- name: Validate streaming subscription example
164+
working-directory: ./examples
165+
run: |
166+
mm.py ./src/main/java/io/dapr/examples/pubsub/stream/README.md

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,10 @@ Try the following examples to learn more about Dapr's Java SDK:
102102
* [Invoking a Grpc service](./examples/src/main/java/io/dapr/examples/invoke/grpc)
103103
* [State management](./examples/src/main/java/io/dapr/examples/state)
104104
* [PubSub with subscriber](./examples/src/main/java/io/dapr/examples/pubsub/)
105+
* [PubSub with streaming subscription](./examples/src/main/java/io/dapr/examples/pubsub/stream/)
105106
* [Binding with input over Http](./examples/src/main/java/io/dapr/examples/bindings/http)
106107
* [Actors](./examples/src/main/java/io/dapr/examples/actors/)
108+
* [Workflows](./examples/src/main/java/io/dapr/examples/workflows/)
107109
* [Secrets management](./examples/src/main/java/io/dapr/examples/secrets)
108110
* [Configuration](./examples/src/main/java/io/dapr/examples/configuration)
109111
* [Distributed tracing with OpenTelemetry SDK](./examples/src/main/java/io/dapr/examples/tracing)

‎dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientAutoConfiguration.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,18 @@ DaprConnectionDetails daprConnectionDetails(DaprClientProperties properties) {
3737
@ConditionalOnMissingBean
3838
DaprClientBuilder daprClientBuilder(DaprConnectionDetails daprConnectionDetails) {
3939
DaprClientBuilder builder = new DaprClientBuilder();
40-
builder.withPropertyOverride(Properties.HTTP_ENDPOINT, daprConnectionDetails.httpEndpoint());
41-
builder.withPropertyOverride(Properties.GRPC_ENDPOINT, daprConnectionDetails.grpcEndpoint());
42-
builder.withPropertyOverride(Properties.HTTP_PORT, String.valueOf(daprConnectionDetails.httpPort()));
43-
builder.withPropertyOverride(Properties.GRPC_PORT, String.valueOf(daprConnectionDetails.grpcPort()));
40+
if (daprConnectionDetails.httpEndpoint() != null) {
41+
builder.withPropertyOverride(Properties.HTTP_ENDPOINT, daprConnectionDetails.httpEndpoint());
42+
}
43+
if (daprConnectionDetails.grpcEndpoint() != null) {
44+
builder.withPropertyOverride(Properties.GRPC_ENDPOINT, daprConnectionDetails.grpcEndpoint());
45+
}
46+
if (daprConnectionDetails.httpPort() != null) {
47+
builder.withPropertyOverride(Properties.HTTP_PORT, String.valueOf(daprConnectionDetails.httpPort()));
48+
}
49+
if (daprConnectionDetails.grpcPort() != null) {
50+
builder.withPropertyOverride(Properties.GRPC_PORT, String.valueOf(daprConnectionDetails.grpcPort()));
51+
}
4452
return builder;
4553
}
4654

‎dapr-spring/dapr-spring-data/src/main/java/io/dapr/spring/data/AbstractDaprKeyValueAdapter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.Map;
2828

2929
public abstract class AbstractDaprKeyValueAdapter implements KeyValueAdapter {
30-
private static final Map<String, String> CONTENT_TYPE_META = Collections.singletonMap(
30+
private static final Map<String, String> CONTENT_TYPE_META = Map.of(
3131
"contentType", "application/json");
3232

3333
private final DaprClient daprClient;

‎dapr-spring/dapr-spring-data/src/main/java/io/dapr/spring/data/MySQLDaprKeyValueAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,13 @@ private String createSql(String sqlPattern, String keyspace, Object criteria) {
164164
}
165165

166166
private void execUsingBinding(String sql) {
167-
Map<String, String> meta = Collections.singletonMap("sql", sql);
167+
Map<String, String> meta = Map.of("sql", sql);
168168

169169
daprClient.invokeBinding(bindingName, "exec", null, meta).block();
170170
}
171171

172172
private <T> T queryUsingBinding(String sql, TypeRef<T> typeRef) {
173-
Map<String, String> meta = Collections.singletonMap("sql", sql);
173+
Map<String, String> meta = Map.of("sql", sql);
174174

175175
return daprClient.invokeBinding(bindingName, "query", null, meta, typeRef).block();
176176
}

‎dapr-spring/dapr-spring-data/src/main/java/io/dapr/spring/data/PostgreSQLDaprKeyValueAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,13 @@ private String createSql(String sqlPattern, String keyspace, Object criteria) {
172172
}
173173

174174
private void execUsingBinding(String sql) {
175-
Map<String, String> meta = Collections.singletonMap("sql", sql);
175+
Map<String, String> meta = Map.of("sql", sql);
176176

177177
daprClient.invokeBinding(bindingName, "exec", null, meta).block();
178178
}
179179

180180
private <T> T queryUsingBinding(String sql, TypeRef<T> typeRef) {
181-
Map<String, String> meta = Collections.singletonMap("sql", sql);
181+
Map<String, String> meta = Map.of("sql", sql);
182182

183183
return daprClient.invokeBinding(bindingName, "query", null, meta, typeRef).block();
184184
}

‎dapr-spring/dapr-spring-messaging/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<artifactId>dapr-spring-messaging</artifactId>
1313
<name>dapr-spring-messaging</name>
1414
<description>Dapr Spring Messaging</description>
15-
<packaging>jar</packaging>
15+
<packaging>jar</packaging>
1616

1717
</project>

‎dapr-spring/dapr-spring-messaging/src/main/java/io/dapr/spring/messaging/DaprMessagingTemplate.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import io.dapr.client.domain.Metadata;
1818
import reactor.core.publisher.Mono;
1919

20-
import java.util.Collections;
20+
import java.util.Map;
2121

2222
public class DaprMessagingTemplate<T> implements DaprMessagingOperations<T> {
2323

@@ -49,7 +49,7 @@ private Mono<Void> doSendAsync(String topic, T message) {
4949
return daprClient.publishEvent(pubsubName,
5050
topic,
5151
message,
52-
Collections.singletonMap(Metadata.TTL_IN_SECONDS, MESSAGE_TTL_IN_SECONDS));
52+
Map.of(Metadata.TTL_IN_SECONDS, MESSAGE_TTL_IN_SECONDS));
5353
}
5454

5555
private static class SendMessageBuilderImpl<T> implements SendMessageBuilder<T> {

0 commit comments

Comments
 (0)