Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions sdk/src/main/java/io/dapr/client/AbstractDaprClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ public Mono<Void> publishEvent(String pubsubName, String topicName, Object data,
* {@inheritDoc}
*/
@Override
@Deprecated
public <T> Mono<T> invokeMethod(
String appId,
String methodName,
Expand All @@ -136,6 +137,7 @@ public <T> Mono<T> invokeMethod(
* {@inheritDoc}
*/
@Override
@Deprecated
public <T> Mono<T> invokeMethod(
String appId,
String methodName,
Expand All @@ -150,6 +152,7 @@ public <T> Mono<T> invokeMethod(
* {@inheritDoc}
*/
@Override
@Deprecated
public <T> Mono<T> invokeMethod(
String appId, String methodName, HttpExtension httpExtension, Map<String, String> metadata, TypeRef<T> type) {
return this.invokeMethod(appId, methodName, null, httpExtension, metadata, type);
Expand All @@ -159,6 +162,7 @@ public <T> Mono<T> invokeMethod(
* {@inheritDoc}
*/
@Override
@Deprecated
public <T> Mono<T> invokeMethod(
String appId, String methodName, HttpExtension httpExtension, Map<String, String> metadata, Class<T> clazz) {
return this.invokeMethod(appId, methodName, null, httpExtension, metadata, TypeRef.get(clazz));
Expand All @@ -168,6 +172,7 @@ public <T> Mono<T> invokeMethod(
* {@inheritDoc}
*/
@Override
@Deprecated
public <T> Mono<T> invokeMethod(String appId, String methodName, Object request, HttpExtension httpExtension,
TypeRef<T> type) {
return this.invokeMethod(appId, methodName, request, httpExtension, null, type);
Expand All @@ -177,6 +182,7 @@ public <T> Mono<T> invokeMethod(String appId, String methodName, Object request,
* {@inheritDoc}
*/
@Override
@Deprecated
public <T> Mono<T> invokeMethod(String appId, String methodName, Object request, HttpExtension httpExtension,
Class<T> clazz) {
return this.invokeMethod(appId, methodName, request, httpExtension, null, TypeRef.get(clazz));
Expand All @@ -186,6 +192,7 @@ public <T> Mono<T> invokeMethod(String appId, String methodName, Object request,
* {@inheritDoc}
*/
@Override
@Deprecated
public Mono<Void> invokeMethod(String appId, String methodName, Object request, HttpExtension httpExtension) {
return this.invokeMethod(appId, methodName, request, httpExtension, null, TypeRef.BYTE_ARRAY).then();
}
Expand All @@ -194,6 +201,7 @@ public Mono<Void> invokeMethod(String appId, String methodName, Object request,
* {@inheritDoc}
*/
@Override
@Deprecated
public Mono<Void> invokeMethod(
String appId, String methodName, Object request, HttpExtension httpExtension, Map<String, String> metadata) {
return this.invokeMethod(appId, methodName, request, httpExtension, metadata, TypeRef.BYTE_ARRAY).then();
Expand All @@ -203,6 +211,7 @@ public Mono<Void> invokeMethod(
* {@inheritDoc}
*/
@Override
@Deprecated
public Mono<Void> invokeMethod(
String appId, String methodName, HttpExtension httpExtension, Map<String, String> metadata) {
return this.invokeMethod(appId, methodName, null, httpExtension, metadata, TypeRef.BYTE_ARRAY).then();
Expand All @@ -212,6 +221,7 @@ public Mono<Void> invokeMethod(
* {@inheritDoc}
*/
@Override
@Deprecated
public Mono<byte[]> invokeMethod(
String appId, String methodName, byte[] request, HttpExtension httpExtension, Map<String, String> metadata) {
return this.invokeMethod(appId, methodName, request, httpExtension, metadata, TypeRef.BYTE_ARRAY);
Expand All @@ -221,6 +231,7 @@ public Mono<byte[]> invokeMethod(
* {@inheritDoc}
*/
@Override
@Deprecated
public Mono<Void> invokeBinding(String bindingName, String operation, Object data) {
return this.invokeBinding(bindingName, operation, data, null, TypeRef.BYTE_ARRAY).then();
}
Expand All @@ -229,6 +240,7 @@ public Mono<Void> invokeBinding(String bindingName, String operation, Object dat
* {@inheritDoc}
*/
@Override
@Deprecated
public Mono<byte[]> invokeBinding(String bindingName, String operation, byte[] data, Map<String, String> metadata) {
return this.invokeBinding(bindingName, operation, data, metadata, TypeRef.BYTE_ARRAY);
}
Expand All @@ -237,6 +249,7 @@ public Mono<byte[]> invokeBinding(String bindingName, String operation, byte[] d
* {@inheritDoc}
*/
@Override
@Deprecated
public <T> Mono<T> invokeBinding(String bindingName, String operation, Object data, TypeRef<T> type) {
return this.invokeBinding(bindingName, operation, data, null, type);
}
Expand All @@ -245,6 +258,7 @@ public <T> Mono<T> invokeBinding(String bindingName, String operation, Object da
* {@inheritDoc}
*/
@Override
@Deprecated
public <T> Mono<T> invokeBinding(String bindingName, String operation, Object data, Class<T> clazz) {
return this.invokeBinding(bindingName, operation, data, null, TypeRef.get(clazz));
}
Expand All @@ -253,6 +267,7 @@ public <T> Mono<T> invokeBinding(String bindingName, String operation, Object da
* {@inheritDoc}
*/
@Override
@Deprecated
public <T> Mono<T> invokeBinding(
String bindingName, String operation, Object data, Map<String, String> metadata, TypeRef<T> type) {
InvokeBindingRequest request = new InvokeBindingRequest(bindingName, operation)
Expand All @@ -266,6 +281,7 @@ public <T> Mono<T> invokeBinding(
* {@inheritDoc}
*/
@Override
@Deprecated
public <T> Mono<T> invokeBinding(
String bindingName, String operation, Object data, Map<String, String> metadata, Class<T> clazz) {
return this.invokeBinding(bindingName, operation, data, metadata, TypeRef.get(clazz));
Expand All @@ -275,6 +291,7 @@ public <T> Mono<T> invokeBinding(
* {@inheritDoc}
*/
@Override
@Deprecated
public Mono<Void> invokeBinding(InvokeBindingRequest request) {
return this.invokeBinding(request, TypeRef.VOID);
}
Expand Down
39 changes: 39 additions & 0 deletions sdk/src/main/java/io/dapr/client/DaprClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,10 @@ <T> Mono<T> invokeMethod(String appId, String methodName, HttpExtension httpExte
* HTTP, {@link HttpExtension#NONE} otherwise.
* @param metadata Metadata (in GRPC) or headers (in HTTP) to be sent in request.
* @return A Mono Plan of type Void.
*
* @deprecated It is recommended to use language-native HTTP clients or gRPC clients for service invocation instead.
*/
@Deprecated
Mono<Void> invokeMethod(String appId, String methodName, Object request, HttpExtension httpExtension,
Map<String, String> metadata);

Expand All @@ -281,7 +284,10 @@ Mono<Void> invokeMethod(String appId, String methodName, Object request, HttpExt
* @param httpExtension Additional fields that are needed if the receiving app is listening on
* HTTP, {@link HttpExtension#NONE} otherwise.
* @return A Mono Plan of type Void.
*
* @deprecated It is recommended to use language-native HTTP clients or gRPC clients for service invocation instead.
*/
@Deprecated
Mono<Void> invokeMethod(String appId, String methodName, Object request, HttpExtension httpExtension);

/**
Expand All @@ -293,7 +299,10 @@ Mono<Void> invokeMethod(String appId, String methodName, Object request, HttpExt
* HTTP, {@link HttpExtension#NONE} otherwise.
* @param metadata Metadata (in GRPC) or headers (in HTTP) to be sent in request.
* @return A Mono Plan of type Void.
*
* @deprecated It is recommended to use language-native HTTP clients or gRPC clients for service invocation instead.
*/
@Deprecated
Mono<Void> invokeMethod(String appId, String methodName, HttpExtension httpExtension, Map<String, String> metadata);

/**
Expand All @@ -306,7 +315,10 @@ Mono<Void> invokeMethod(String appId, String methodName, Object request, HttpExt
* HTTP, {@link HttpExtension#NONE} otherwise.
* @param metadata Metadata (in GRPC) or headers (in HTTP) to be sent in request.
* @return A Mono Plan of type byte[].
*
* @deprecated It is recommended to use language-native HTTP clients or gRPC clients for service invocation instead.
*/
@Deprecated
Mono<byte[]> invokeMethod(String appId, String methodName, byte[] request, HttpExtension httpExtension,
Map<String, String> metadata);

Expand All @@ -317,7 +329,10 @@ Mono<byte[]> invokeMethod(String appId, String methodName, byte[] request, HttpE
* @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.
*
* @deprecated It is recommended to use language-native HTTP clients or gRPC clients for service invocation instead.
*/
@Deprecated
<T> Mono<T> invokeMethod(InvokeMethodRequest invokeMethodRequest, TypeRef<T> type);

/**
Expand All @@ -327,7 +342,10 @@ Mono<byte[]> invokeMethod(String appId, String methodName, byte[] request, HttpE
* @param operation The operation to be performed by the binding request processor.
* @param data The data to be processed, use byte[] to skip serialization.
* @return an empty Mono.
*
* @deprecated It is recommended to use language-native HTTP clients or gRPC clients for binding invocation instead.
*/
@Deprecated
Mono<Void> invokeBinding(String bindingName, String operation, Object data);

/**
Expand All @@ -338,7 +356,10 @@ Mono<byte[]> invokeMethod(String appId, String methodName, byte[] request, HttpE
* @param data The data to be processed, skipping serialization.
* @param metadata The metadata map.
* @return a Mono plan of type byte[].
*
* @deprecated It is recommended to use language-native HTTP clients or gRPC clients for binding invocation instead.
*/
@Deprecated
Mono<byte[]> invokeBinding(String bindingName, String operation, byte[] data, Map<String, String> metadata);

/**
Expand All @@ -350,7 +371,10 @@ Mono<byte[]> invokeMethod(String appId, String methodName, byte[] request, HttpE
* @param type The type being returned.
* @param <T> The type of the return
* @return a Mono plan of type T.
*
* @deprecated It is recommended to use language-native HTTP clients or gRPC clients for binding invocation instead.
*/
@Deprecated
<T> Mono<T> invokeBinding(String bindingName, String operation, Object data, TypeRef<T> type);

/**
Expand All @@ -362,7 +386,10 @@ Mono<byte[]> invokeMethod(String appId, String methodName, byte[] request, HttpE
* @param clazz The type being returned.
* @param <T> The type of the return
* @return a Mono plan of type T.
*
* @deprecated It is recommended to use language-native HTTP clients or gRPC clients for binding invocation instead.
*/
@Deprecated
<T> Mono<T> invokeBinding(String bindingName, String operation, Object data, Class<T> clazz);

/**
Expand All @@ -375,7 +402,10 @@ Mono<byte[]> invokeMethod(String appId, String methodName, byte[] request, HttpE
* @param type The type being returned.
* @param <T> The type of the return
* @return a Mono plan of type T.
*
* @deprecated It is recommended to use language-native HTTP clients or gRPC clients for binding invocation instead.
*/
@Deprecated
<T> Mono<T> invokeBinding(String bindingName, String operation, Object data, Map<String, String> metadata,
TypeRef<T> type);

Expand All @@ -389,7 +419,10 @@ <T> Mono<T> invokeBinding(String bindingName, String operation, Object data, Map
* @param clazz The type being returned.
* @param <T> The type of the return
* @return a Mono plan of type T.
*
* @deprecated It is recommended to use language-native HTTP clients or gRPC clients for binding invocation instead.
*/
@Deprecated
<T> Mono<T> invokeBinding(String bindingName, String operation, Object data, Map<String, String> metadata,
Class<T> clazz);

Expand All @@ -398,7 +431,10 @@ <T> Mono<T> invokeBinding(String bindingName, String operation, Object data, Map
*
* @param request The binding invocation request.
* @return a Mono with void.
*
* @deprecated It is recommended to use language-native HTTP clients or gRPC clients for binding invocation instead.
*/
@Deprecated
Mono<Void> invokeBinding(InvokeBindingRequest request);

/**
Expand All @@ -408,7 +444,10 @@ <T> Mono<T> invokeBinding(String bindingName, String operation, Object data, Map
* @param type The type being returned.
* @param <T> The type of the return
* @return a Mono plan of type T.
*
* @deprecated It is recommended to use language-native HTTP clients or gRPC clients for binding invocation instead.
*/
@Deprecated
<T> Mono<T> invokeBinding(InvokeBindingRequest request, TypeRef<T> type);

/**
Expand Down
3 changes: 3 additions & 0 deletions sdk/src/main/java/io/dapr/client/DaprClientImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
import reactor.util.retry.Retry;

import javax.annotation.Nonnull;

import java.io.IOException;
import java.time.Duration;
import java.time.Instant;
Expand Down Expand Up @@ -606,6 +607,7 @@ private <T> Subscription<T> buildSubscription(
}

@Override
@Deprecated
public <T> Mono<T> invokeMethod(InvokeMethodRequest invokeMethodRequest, TypeRef<T> type) {
try {
final String appId = invokeMethodRequest.getAppId();
Expand Down Expand Up @@ -675,6 +677,7 @@ private <T> Mono<T> getMonoForHttpResponse(TypeRef<T> type, DaprHttp.Response r)
* {@inheritDoc}
*/
@Override
@Deprecated
public <T> Mono<T> invokeBinding(InvokeBindingRequest request, TypeRef<T> type) {
try {
final String name = request.getName();
Expand Down
Loading