Skip to content

Commit 502f7c0

Browse files
authored
Remove HTTP client and add gRPC interceptor helper. (#1051)
* Remove HTTP client and add gRPC interceptor helper. Signed-off-by: Artur Souza <asouza.pro@gmail.com> * New design for gRPC interceptor and channel proxy. Signed-off-by: Artur Souza <asouza.pro@gmail.com> --------- Signed-off-by: Artur Souza <asouza.pro@gmail.com> Signed-off-by: Artur Souza <artursouza.ms@outlook.com>
1 parent 9048bc1 commit 502f7c0

File tree

107 files changed

+1163
-5844
lines changed

Some content is hidden

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

107 files changed

+1163
-5844
lines changed

.github/workflows/validate.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ jobs:
100100
echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
101101
pip3 install setuptools wheel
102102
pip3 install mechanical-markdown
103-
- name: Install Local mongo database using docker-compose
104-
run: |
105-
docker-compose -f ./sdk-tests/deploy/local-test.yml up -d mongo
106-
docker ps
107103
- name: Clean up files
108104
run: ./mvnw clean
109105
- name: Build sdk
@@ -146,14 +142,10 @@ jobs:
146142
working-directory: ./examples
147143
run: |
148144
mm.py ./src/main/java/io/dapr/examples/unittesting/README.md
149-
- name: Validate Configuration gRPC API example
150-
working-directory: ./examples
151-
run: |
152-
mm.py ./src/main/java/io/dapr/examples/configuration/grpc/README.md
153-
- name: Validate Configuration HTTP API example
145+
- name: Validate Configuration API example
154146
working-directory: ./examples
155147
run: |
156-
mm.py ./src/main/java/io/dapr/examples/configuration/http/README.md
148+
mm.py ./src/main/java/io/dapr/examples/configuration/README.md
157149
- name: Validate actors example
158150
working-directory: ./examples
159151
run: |

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ Try the following examples to learn more about Dapr's Java SDK:
105105
* [Binding with input over Http](./examples/src/main/java/io/dapr/examples/bindings/http)
106106
* [Actors](./examples/src/main/java/io/dapr/examples/actors/)
107107
* [Secrets management](./examples/src/main/java/io/dapr/examples/secrets)
108+
* [Configuration](./examples/src/main/java/io/dapr/examples/configuration)
108109
* [Distributed tracing with OpenTelemetry SDK](./examples/src/main/java/io/dapr/examples/tracing)
109110
* [Exception handling](./examples/src/main/java/io/dapr/examples/exception)
110111
* [Unit testing](./examples/src/main/java/io/dapr/examples/unittesting)

examples/src/main/java/io/dapr/examples/OpenTelemetryInterceptor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
import io.opentelemetry.api.OpenTelemetry;
1717
import io.opentelemetry.context.Context;
1818
import io.opentelemetry.context.propagation.TextMapPropagator;
19+
import jakarta.servlet.DispatcherType;
20+
import jakarta.servlet.http.HttpServletRequest;
21+
import jakarta.servlet.http.HttpServletResponse;
1922
import org.jetbrains.annotations.Nullable;
2023
import org.springframework.beans.factory.annotation.Autowired;
2124
import org.springframework.stereotype.Component;
2225
import org.springframework.web.servlet.HandlerInterceptor;
2326
import org.springframework.web.servlet.ModelAndView;
2427

25-
import jakarta.servlet.DispatcherType;
26-
import jakarta.servlet.http.HttpServletRequest;
27-
import jakarta.servlet.http.HttpServletResponse;
2828
import java.util.Collections;
2929

3030
@Component

examples/src/main/java/io/dapr/examples/bindings/http/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Run `dapr init` to initialize Dapr in Self-Hosted Mode if it's not already initi
5454

5555
Before getting into the application code, follow these steps in order to set up a local instance of Kafka. This is needed for the local instances.
5656

57-
1. Run the container locally:
57+
1. Run the Kafka locally:
5858

5959
<!-- STEP
6060
name: Setup kafka container

examples/src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '2'
1+
version: '3'
22
services:
33
zookeeper:
44
image: confluentinc/cp-zookeeper:7.4.4
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
limitations under the License.
1212
*/
1313

14-
package io.dapr.examples.configuration.grpc;
14+
package io.dapr.examples.configuration;
1515

1616
import io.dapr.client.DaprClient;
1717
import io.dapr.client.DaprClientBuilder;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ sleep: 10
158158
-->
159159

160160
```bash
161-
dapr run --components-path ./components/configuration --app-id configgrpc --log-level debug -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.configuration.grpc.ConfigurationClient
161+
dapr run --components-path ./components/configuration --app-id configgrpc --log-level debug -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.configuration.ConfigurationClient
162162
```
163163

164164
<!-- END_STEP -->

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

Lines changed: 0 additions & 102 deletions
This file was deleted.

examples/src/main/java/io/dapr/examples/configuration/http/ConfigurationHandler.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)