dapr
/
java-sdk
mirror of https://github.com/dapr/java-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename InvokeServiceRequest to InvokeMethodRequest. (#443) 

* Rename InvokeServiceRequest to InvokeMethodRequest.

* Organize imports.
This commit is contained in:
Artur Souza 2021-01-15 04:51:48 -08:00 committed by GitHub
parent 019dee9a8b
commit d43272fdc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 95 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/src/main/java/io/dapr/examples/tracing/InvokeClient.java
View File

@ -8,8 +8,8 @@ package io.dapr.examples.tracing;
import io.dapr.client.DaprClient;
import io.dapr.client.DaprClientBuilder;
import io.dapr.client.domain.HttpExtension;
import io.dapr.client.domain.InvokeServiceRequest;
import io.dapr.client.domain.InvokeServiceRequestBuilder;
import io.dapr.client.domain.InvokeMethodRequest;
import io.dapr.client.domain.InvokeMethodRequestBuilder;
import io.dapr.springboot.OpenTelemetryConfig;
import io.dapr.utils.TypeRef;
import io.opentelemetry.api.trace.Span;
@ -45,8 +45,8 @@ public class InvokeClient {
try (DaprClient client = (new DaprClientBuilder()).build()) {
for (String message : args) {
try (Scope scope = span.makeCurrent()) {
InvokeServiceRequestBuilder builder = new InvokeServiceRequestBuilder(SERVICE_APP_ID, "proxy_echo");
InvokeServiceRequest request
InvokeMethodRequestBuilder builder = new InvokeMethodRequestBuilder(SERVICE_APP_ID, "proxy_echo");
InvokeMethodRequest request
= builder.withBody(message).withHttpExtension(HttpExtension.POST).withContext(Context.current()).build();
client.invokeMethod(request, TypeRef.get(byte[].class))
.map(r -> {
@ -54,7 +54,7 @@ public class InvokeClient {
return r;
})
.flatMap(r -> {
InvokeServiceRequest sleepRequest = new InvokeServiceRequestBuilder(SERVICE_APP_ID, "proxy_sleep")
InvokeMethodRequest sleepRequest = new InvokeMethodRequestBuilder(SERVICE_APP_ID, "proxy_sleep")
.withHttpExtension(HttpExtension.POST)
.withContext(r.getContext()).build();
return client.invokeMethod(sleepRequest, TypeRef.get(Void.class));

15
examples/src/main/java/io/dapr/examples/tracing/TracingDemoMiddleServiceController.java
View File

@ -7,20 +7,17 @@ package io.dapr.examples.tracing;
import io.dapr.client.DaprClient;
import io.dapr.client.domain.HttpExtension;
import io.dapr.client.domain.InvokeServiceRequest;
import io.dapr.client.domain.InvokeServiceRequestBuilder;
import io.dapr.client.domain.InvokeMethodRequest;
import io.dapr.client.domain.InvokeMethodRequestBuilder;
import io.dapr.utils.TypeRef;
import io.opentelemetry.context.Context;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RestController;
import reactor.core.publisher.Mono;
import java.util.Map;
/**
* SpringBoot Controller to handle service invocation.
*
@ -48,8 +45,8 @@ public class TracingDemoMiddleServiceController {
public Mono<byte[]> echo(
@RequestAttribute(name = "opentelemetry-context") Context context,
@RequestBody(required = false) String body) {
InvokeServiceRequestBuilder builder = new InvokeServiceRequestBuilder(INVOKE_APP_ID, "echo");
InvokeServiceRequest request
InvokeMethodRequestBuilder builder = new InvokeMethodRequestBuilder(INVOKE_APP_ID, "echo");
InvokeMethodRequest request
= builder.withBody(body).withHttpExtension(HttpExtension.POST).withContext(context).build();
return client.invokeMethod(request, TypeRef.get(byte[].class)).map(r -> r.getObject());
}
@ -62,8 +59,8 @@ public class TracingDemoMiddleServiceController {
*/
@PostMapping(path = "/proxy_sleep")
public Mono<Void> sleep(@RequestAttribute(name = "opentelemetry-context") Context context) {
InvokeServiceRequestBuilder builder = new InvokeServiceRequestBuilder(INVOKE_APP_ID, "sleep");
InvokeServiceRequest request = builder.withHttpExtension(HttpExtension.POST).withContext(context).build();
InvokeMethodRequestBuilder builder = new InvokeMethodRequestBuilder(INVOKE_APP_ID, "sleep");
InvokeMethodRequest request = builder.withHttpExtension(HttpExtension.POST).withContext(context).build();
return client.invokeMethod(request, TypeRef.get(byte[].class)).then();
}

2
sdk-tests/src/test/java/io/dapr/it/BaseIT.java
View File

@ -9,8 +9,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.junit.AfterClass;
import java.io.Closeable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;

4
sdk-tests/src/test/java/io/dapr/it/actors/ActorReminderFailoverIT.java
View File

@ -20,7 +20,9 @@ import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.UUID;
import static io.dapr.it.actors.MyActorTestUtils.*;
import static io.dapr.it.actors.MyActorTestUtils.countMethodCalls;
import static io.dapr.it.actors.MyActorTestUtils.fetchMethodCallLogs;
import static io.dapr.it.actors.MyActorTestUtils.validateMethodCalls;
import static org.junit.Assert.assertNotEquals;
public class ActorReminderFailoverIT extends BaseIT {

4
sdk-tests/src/test/java/io/dapr/it/actors/ActorReminderRecoveryIT.java
View File

@ -22,7 +22,9 @@ import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.UUID;
import static io.dapr.it.actors.MyActorTestUtils.*;
import static io.dapr.it.actors.MyActorTestUtils.countMethodCalls;
import static io.dapr.it.actors.MyActorTestUtils.fetchMethodCallLogs;
import static io.dapr.it.actors.MyActorTestUtils.validateMethodCalls;
public class ActorReminderRecoveryIT extends BaseIT {

4
sdk-tests/src/test/java/io/dapr/it/actors/ActorStateIT.java
View File

@ -22,7 +22,9 @@ import java.util.Arrays;
import java.util.Collection;
import static io.dapr.it.Retry.callWithRetry;
import static org.junit.Assert.*;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@RunWith(Parameterized.class)
public class ActorStateIT extends BaseIT {

14
sdk-tests/src/test/java/io/dapr/it/methodinvoke/http/MethodInvokeController.java
View File

@ -1,8 +1,18 @@
package io.dapr.it.methodinvoke.http;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
/**
* SpringBoot Controller to handle input binding.

1
sdk-tests/src/test/java/io/dapr/it/methodinvoke/http/MethodInvokeIT.java
View File

@ -10,7 +10,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.io.IOException;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;

1
sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java
View File

@ -7,7 +7,6 @@ package io.dapr.it.pubsub.http;
import io.dapr.client.DaprClient;
import io.dapr.client.DaprClientBuilder;
import io.dapr.client.DaprHttp;
import io.dapr.client.domain.HttpExtension;
import io.dapr.client.domain.Metadata;
import io.dapr.it.BaseIT;

7
sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java
View File

@ -7,13 +7,14 @@ package io.dapr.it.pubsub.http;
import io.dapr.Topic;
import io.dapr.client.domain.CloudEvent;
import io.dapr.serializer.DefaultObjectSerializer;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import reactor.core.publisher.Mono;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* SpringBoot Controller to handle input binding.

1
sdk-tests/src/test/java/io/dapr/it/secrets/SecretsClientIT.java
View File

@ -20,7 +20,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;

3
sdk-tests/src/test/java/io/dapr/it/state/AbstractStateClientIT.java
View File

@ -18,12 +18,9 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
import static io.dapr.it.TestUtils.assertThrowsDaprException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Common test cases for Dapr client (GRPC and HTTP).

1
sdk-tests/src/test/java/io/dapr/it/state/GRPCStateClientIT.java
View File

@ -14,7 +14,6 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.IOException;
import java.util.Collections;
import static io.dapr.it.TestUtils.assertThrowsDaprException;

1
sdk-tests/src/test/java/io/dapr/it/state/HttpStateClientIT.java
View File

@ -14,7 +14,6 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.IOException;
import java.util.Collections;
import static io.dapr.it.TestUtils.assertThrowsDaprException;

8
sdk/src/main/java/io/dapr/client/AbstractDaprClient.java
View File

@ -17,8 +17,8 @@ import io.dapr.client.domain.GetStateRequestBuilder;
import io.dapr.client.domain.HttpExtension;
import io.dapr.client.domain.InvokeBindingRequest;
import io.dapr.client.domain.InvokeBindingRequestBuilder;
import io.dapr.client.domain.InvokeServiceRequest;
import io.dapr.client.domain.InvokeServiceRequestBuilder;
import io.dapr.client.domain.InvokeMethodRequest;
import io.dapr.client.domain.InvokeMethodRequestBuilder;
import io.dapr.client.domain.PublishEventRequest;
import io.dapr.client.domain.PublishEventRequestBuilder;
import io.dapr.client.domain.SaveStateRequest;
@ -96,8 +96,8 @@ abstract class AbstractDaprClient implements DaprClient {
HttpExtension httpExtension,
Map<String, String> metadata,
TypeRef<T> type) {
InvokeServiceRequestBuilder builder = new InvokeServiceRequestBuilder(appId, methodName);
InvokeServiceRequest req = builder
InvokeMethodRequestBuilder builder = new InvokeMethodRequestBuilder(appId, methodName);
InvokeMethodRequest req = builder
.withBody(data)
.withHttpExtension(httpExtension)
.withContentType(objectSerializer.getContentType())

6
sdk/src/main/java/io/dapr/client/DaprClient.java
View File

@ -12,7 +12,7 @@ import io.dapr.client.domain.GetSecretRequest;
import io.dapr.client.domain.GetStateRequest;
import io.dapr.client.domain.HttpExtension;
import io.dapr.client.domain.InvokeBindingRequest;
import io.dapr.client.domain.InvokeServiceRequest;
import io.dapr.client.domain.InvokeMethodRequest;
import io.dapr.client.domain.PublishEventRequest;
import io.dapr.client.domain.Response;
import io.dapr.client.domain.SaveStateRequest;
@ -215,12 +215,12 @@ public interface DaprClient extends AutoCloseable {
/**
* Invoke a service method.
*
* @param invokeServiceRequest Request object.
* @param invokeMethodRequest Request object.
* @param type The Type needed as return for the call.
* @param <T> The Type of the return, use byte[] to skip serialization.
* @return A Mono Plan of type T.
*/
<T> Mono<Response<T>> invokeMethod(InvokeServiceRequest invokeServiceRequest, TypeRef<T> type);
<T> Mono<Response<T>> invokeMethod(InvokeMethodRequest invokeMethodRequest, TypeRef<T> type);
/**
* Invokes a Binding operation.

14
sdk/src/main/java/io/dapr/client/DaprClientGrpc.java
View File

@ -16,7 +16,7 @@ import io.dapr.client.domain.GetSecretRequest;
import io.dapr.client.domain.GetStateRequest;
import io.dapr.client.domain.HttpExtension;
import io.dapr.client.domain.InvokeBindingRequest;
import io.dapr.client.domain.InvokeServiceRequest;
import io.dapr.client.domain.InvokeMethodRequest;
import io.dapr.client.domain.PublishEventRequest;
import io.dapr.client.domain.Response;
import io.dapr.client.domain.SaveStateRequest;
@ -185,13 +185,13 @@ public class DaprClientGrpc extends AbstractDaprClient {
* {@inheritDoc}
*/
@Override
public <T> Mono<Response<T>> invokeMethod(InvokeServiceRequest invokeServiceRequest, TypeRef<T> type) {
public <T> Mono<Response<T>> invokeMethod(InvokeMethodRequest invokeMethodRequest, TypeRef<T> type) {
try {
String appId = invokeServiceRequest.getAppId();
String method = invokeServiceRequest.getMethod();
Object body = invokeServiceRequest.getBody();
HttpExtension httpExtension = invokeServiceRequest.getHttpExtension();
Context context = invokeServiceRequest.getContext();
String appId = invokeMethodRequest.getAppId();
String method = invokeMethodRequest.getMethod();
Object body = invokeMethodRequest.getBody();
HttpExtension httpExtension = invokeMethodRequest.getHttpExtension();
Context context = invokeMethodRequest.getContext();
DaprProtos.InvokeServiceRequest envelope = buildInvokeServiceRequest(
httpExtension,
appId,

16
sdk/src/main/java/io/dapr/client/DaprClientHttp.java
View File

@ -14,7 +14,7 @@ import io.dapr.client.domain.GetSecretRequest;
import io.dapr.client.domain.GetStateRequest;
import io.dapr.client.domain.HttpExtension;
import io.dapr.client.domain.InvokeBindingRequest;
import io.dapr.client.domain.InvokeServiceRequest;
import io.dapr.client.domain.InvokeMethodRequest;
import io.dapr.client.domain.PublishEventRequest;
import io.dapr.client.domain.Response;
import io.dapr.client.domain.SaveStateRequest;
@ -155,14 +155,14 @@ public class DaprClientHttp extends AbstractDaprClient {
/**
* {@inheritDoc}
*/
public <T> Mono<Response<T>> invokeMethod(InvokeServiceRequest invokeServiceRequest, TypeRef<T> type) {
public <T> Mono<Response<T>> invokeMethod(InvokeMethodRequest invokeMethodRequest, TypeRef<T> type) {
try {
final String appId = invokeServiceRequest.getAppId();
final String method = invokeServiceRequest.getMethod();
final Object request = invokeServiceRequest.getBody();
final HttpExtension httpExtension = invokeServiceRequest.getHttpExtension();
final String contentType = invokeServiceRequest.getContentType();
final Context context = invokeServiceRequest.getContext();
final String appId = invokeMethodRequest.getAppId();
final String method = invokeMethodRequest.getMethod();
final Object request = invokeMethodRequest.getBody();
final HttpExtension httpExtension = invokeMethodRequest.getHttpExtension();
final String contentType = invokeMethodRequest.getContentType();
final Context context = invokeMethodRequest.getContext();
if (httpExtension == null) {
throw new IllegalArgumentException("HttpExtension cannot be null. Use HttpExtension.NONE instead.");
}

1
sdk/src/main/java/io/dapr/client/domain/DeleteStateRequestBuilder.java
View File

@ -6,6 +6,7 @@
package io.dapr.client.domain;
import io.opentelemetry.context.Context;
import java.util.Collections;
import java.util.Map;

1
sdk/src/main/java/io/dapr/client/domain/GetStateRequestBuilder.java
View File

@ -6,6 +6,7 @@
package io.dapr.client.domain;
import io.opentelemetry.context.Context;
import java.util.Collections;
import java.util.Map;

4
sdk/src/main/java/io/dapr/client/domain/InvokeServiceRequest.java → sdk/src/main/java/io/dapr/client/domain/InvokeMethodRequest.java
View File

@ -7,12 +7,10 @@ package io.dapr.client.domain;
import io.opentelemetry.context.Context;
import java.util.Map;
/**
* A request to invoke a service.
*/
public class InvokeServiceRequest {
public class InvokeMethodRequest {
private String appId;

16
sdk/src/main/java/io/dapr/client/domain/InvokeServiceRequestBuilder.java → sdk/src/main/java/io/dapr/client/domain/InvokeMethodRequestBuilder.java
View File

@ -10,7 +10,7 @@ import io.opentelemetry.context.Context;
/**
* Builds a request to invoke a service.
*/
public class InvokeServiceRequestBuilder {
public class InvokeMethodRequestBuilder {
private final String appId;
@ -24,27 +24,27 @@ public class InvokeServiceRequestBuilder {
private Context context;
public InvokeServiceRequestBuilder(String appId, String method) {
public InvokeMethodRequestBuilder(String appId, String method) {
this.appId = appId;
this.method = method;
}
public InvokeServiceRequestBuilder withContentType(String contentType) {
public InvokeMethodRequestBuilder withContentType(String contentType) {
this.contentType = contentType;
return this;
}
public InvokeServiceRequestBuilder withBody(Object body) {
public InvokeMethodRequestBuilder withBody(Object body) {
this.body = body;
return this;
}
public InvokeServiceRequestBuilder withHttpExtension(HttpExtension httpExtension) {
public InvokeMethodRequestBuilder withHttpExtension(HttpExtension httpExtension) {
this.httpExtension = httpExtension;
return this;
}
public InvokeServiceRequestBuilder withContext(Context context) {
public InvokeMethodRequestBuilder withContext(Context context) {
this.context = context;
return this;
}
@ -53,8 +53,8 @@ public class InvokeServiceRequestBuilder {
* Builds a request object.
* @return Request object.
*/
public InvokeServiceRequest build() {
InvokeServiceRequest request = new InvokeServiceRequest();
public InvokeMethodRequest build() {
InvokeMethodRequest request = new InvokeMethodRequest();
request.setAppId(this.appId);
request.setContentType(contentType);
request.setMethod(this.method);

16
sdk/src/test/java/io/dapr/client/DaprClientGrpcTest.java
View File

@ -53,10 +53,22 @@ import java.util.concurrent.atomic.AtomicBoolean;
import static io.dapr.utils.TestUtils.assertThrowsDaprException;
import static io.dapr.utils.TestUtils.findFreePort;
import static org.junit.Assert.*;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.argThat;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
public class DaprClientGrpcTest {

5
sdk/src/test/java/io/dapr/client/DaprClientHttpTest.java
View File

@ -38,7 +38,10 @@ import java.util.Map;
import static io.dapr.utils.TestUtils.assertThrowsDaprException;
import static io.dapr.utils.TestUtils.findFreePort;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;

1
sdk/src/test/java/io/dapr/client/DaprHttpStub.java
View File

@ -8,7 +8,6 @@ package io.dapr.client;
import io.opentelemetry.context.Context;
import reactor.core.publisher.Mono;
import java.io.IOException;
import java.util.Map;
/**

4
sdk/src/test/java/io/dapr/client/DaprHttpTest.java
View File

@ -22,7 +22,9 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
public class DaprHttpTest {

10
sdk/src/test/java/io/dapr/client/domain/StateTest.java
View File

@ -2,14 +2,14 @@ package io.dapr.client.domain;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNotEquals;
import java.util.HashMap;
import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
public class StateTest {
private static final String KEY = "key";

1
sdk/src/test/java/io/dapr/serializer/DefaultObjectSerializerTest.java
View File

@ -14,7 +14,6 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.TreeMap;
import java.util.function.Function;

2
sdk/src/test/java/io/dapr/utils/TestUtils.java
View File

@ -11,8 +11,6 @@ import org.junit.jupiter.api.function.Executable;
import java.io.IOException;
import java.net.ServerSocket;
import java.util.HashSet;
import java.util.Set;
public final class TestUtils {