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

Spliting Actor client and runtime into a separate jar. (#83)

This commit is contained in:
Artur Souza 2020-01-11 10:13:29 -08:00 committed by GitHub
parent 018a79530b
commit 6953bc49d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 458 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -84,6 +84,7 @@
<modules>
<module>sdk-autogen</module>
<module>sdk</module>
<module>sdk-actors</module>
<module>sdk-springboot</module>
<module>examples</module>
</modules>

268
sdk-actors/checkstyle-java.xml Normal file
View File

@ -0,0 +1,268 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">
<!--
Checkstyle configuration that checks the Google coding conventions from Google Java Style
that can be found at https://google.github.io/styleguide/javaguide.html
Checkstyle is very configurable. Be sure to read the documentation at
http://checkstyle.sf.net (or in your downloaded distribution).
To completely disable a check, just comment it out or delete it from the file.
Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
-->
<module name = "Checker">
<property name="charset" value="UTF-8"/>
<property name="severity" value="warning"/>
<property name="fileExtensions" value="java, properties, xml"/>
<!-- Excludes all 'module-info.java' files -->
<!-- See https://checkstyle.org/config_filefilters.html -->
<module name="BeforeExecutionExclusionFileFilter">
<property name="fileNamePattern" value="module\-info\.java$"/>
</module>
<!-- Checks for whitespace -->
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
</module>
<module name="LineLength">
<property name="fileExtensions" value="java"/>
<property name="max" value="100"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
</module>
<module name="TreeWalker">
<module name="OuterTypeFilename"/>
<module name="IllegalTokenText">
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
<property name="format"
value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
<property name="message"
value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
</module>
<module name="AvoidEscapedUnicodeCharacters">
<property name="allowEscapesForControlCharacters" value="true"/>
<property name="allowByTailComment" value="true"/>
<property name="allowNonPrintableEscapes" value="true"/>
</module>
<module name="AvoidStarImport"/>
<module name="OneTopLevelClass"/>
<module name="NoLineWrap"/>
<module name="EmptyBlock">
<property name="option" value="TEXT"/>
<property name="tokens"
value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
</module>
<module name="NeedBraces"/>
<module name="LeftCurly"/>
<module name="RightCurly">
<property name="id" value="RightCurlySame"/>
<property name="tokens"
value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
LITERAL_DO"/>
</module>
<module name="RightCurly">
<property name="id" value="RightCurlyAlone"/>
<property name="option" value="alone"/>
<property name="tokens"
value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
INSTANCE_INIT"/>
</module>
<module name="WhitespaceAround">
<property name="allowEmptyConstructors" value="true"/>
<property name="allowEmptyLambdas" value="true"/>
<property name="allowEmptyMethods" value="true"/>
<property name="allowEmptyTypes" value="true"/>
<property name="allowEmptyLoops" value="true"/>
<message key="ws.notFollowed"
value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
<message key="ws.notPreceded"
value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
</module>
<module name="OneStatementPerLine"/>
<module name="MultipleVariableDeclarations"/>
<module name="ArrayTypeStyle"/>
<module name="MissingSwitchDefault"/>
<module name="FallThrough"/>
<module name="UpperEll"/>
<module name="ModifierOrder"/>
<module name="EmptyLineSeparator">
<property name="allowNoEmptyLineBetweenFields" value="true"/>
</module>
<module name="SeparatorWrap">
<property name="id" value="SeparatorWrapDot"/>
<property name="tokens" value="DOT"/>
<property name="option" value="nl"/>
</module>
<module name="SeparatorWrap">
<property name="id" value="SeparatorWrapComma"/>
<property name="tokens" value="COMMA"/>
<property name="option" value="EOL"/>
</module>
<module name="SeparatorWrap">
<!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
<property name="id" value="SeparatorWrapEllipsis"/>
<property name="tokens" value="ELLIPSIS"/>
<property name="option" value="EOL"/>
</module>
<module name="SeparatorWrap">
<!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
<property name="id" value="SeparatorWrapArrayDeclarator"/>
<property name="tokens" value="ARRAY_DECLARATOR"/>
<property name="option" value="EOL"/>
</module>
<module name="SeparatorWrap">
<property name="id" value="SeparatorWrapMethodRef"/>
<property name="tokens" value="METHOD_REF"/>
<property name="option" value="nl"/>
</module>
<module name="PackageName">
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
<message key="name.invalidPattern"
value="Package name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="TypeName">
<message key="name.invalidPattern"
value="Type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="MemberName">
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
<message key="name.invalidPattern"
value="Member name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="ParameterName">
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
<message key="name.invalidPattern"
value="Parameter name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="LambdaParameterName">
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
<message key="name.invalidPattern"
value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="CatchParameterName">
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
<message key="name.invalidPattern"
value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="LocalVariableName">
<property name="tokens" value="VARIABLE_DEF"/>
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
<message key="name.invalidPattern"
value="Local variable name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="ClassTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
<message key="name.invalidPattern"
value="Class type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="MethodTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
<message key="name.invalidPattern"
value="Method type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="InterfaceTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
<message key="name.invalidPattern"
value="Interface type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="NoFinalizer"/>
<module name="GenericWhitespace">
<message key="ws.followed"
value="GenericWhitespace ''{0}'' is followed by whitespace."/>
<message key="ws.preceded"
value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
<message key="ws.illegalFollow"
value="GenericWhitespace ''{0}'' should followed by whitespace."/>
<message key="ws.notPreceded"
value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
</module>
<module name="Indentation">
<property name="basicOffset" value="2"/>
<property name="braceAdjustment" value="0"/>
<property name="caseIndent" value="2"/>
<property name="throwsIndent" value="4"/>
<property name="lineWrappingIndentation" value="4"/>
<property name="arrayInitIndent" value="2"/>
</module>
<module name="AbbreviationAsWordInName">
<property name="ignoreFinal" value="false"/>
<property name="allowedAbbreviationLength" value="1"/>
</module>
<module name="OverloadMethodsDeclarationOrder"/>
<module name="VariableDeclarationUsageDistance"/>
<module name="CustomImportOrder">
<property name="sortImportsInGroupAlphabetically" value="true"/>
<property name="separateLineBetweenGroups" value="true"/>
<property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
</module>
<module name="MethodParamPad"/>
<module name="NoWhitespaceBefore">
<property name="tokens"
value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
<property name="allowLineBreaks" value="true"/>
</module>
<module name="ParenPad"/>
<module name="OperatorWrap">
<property name="option" value="NL"/>
<property name="tokens"
value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
</module>
<module name="AnnotationLocation">
<property name="id" value="AnnotationLocationMostCases"/>
<property name="tokens"
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
</module>
<module name="AnnotationLocation">
<property name="id" value="AnnotationLocationVariables"/>
<property name="tokens" value="VARIABLE_DEF"/>
<property name="allowSamelineMultipleAnnotations" value="true"/>
</module>
<module name="NonEmptyAtclauseDescription"/>
<module name="InvalidJavadocPosition"/>
<module name="JavadocTagContinuationIndentation"/>
<module name="SummaryJavadoc">
<property name="forbiddenSummaryFragments"
value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
</module>
<module name="JavadocParagraph"/>
<module name="AtclauseOrder">
<property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
<property name="target"
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
</module>
<module name="JavadocMethod">
<property name="scope" value="public"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingThrowsTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="allowedAnnotations" value="Override, Test"/>
<property name="allowThrowsTagsForSubclasses" value="true"/>
</module>
<module name="MissingJavadocMethod">
<property name="scope" value="public"/>
<property name="minLineCount" value="2"/>
<property name="allowedAnnotations" value="Override, Test"/>
</module>
<module name="MethodName">
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
<message key="name.invalidPattern"
value="Method name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="SingleLineJavadoc">
<property name="ignoreInlineTags" value="false"/>
</module>
<module name="EmptyCatchBlock">
<property name="exceptionVariableName" value="expected"/>
</module>
<module name="CommentsIndentation"/>
</module>
</module>

144
sdk-actors/pom.xml Normal file
View File

@ -0,0 +1,144 @@
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.dapr</groupId>
<artifactId>dapr-sdk-parent</artifactId>
<version>0.2.0</version>
</parent>
<artifactId>dapr-sdk-actors</artifactId>
<packaging>jar</packaging>
<version>0.2.0</version>
<name>dapr-sdk</name>
<description>SDK for Actors on Dapr</description>
<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>libs-release</name>
<url>https://repo.spring.io/libs-release</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>io.dapr</groupId>
<artifactId>dapr-sdk</artifactId>
<version>0.2.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<skipITs>true</skipITs>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<skipITs>${skipITs}</skipITs>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.4</version>
<executions>
<execution>
<id>default-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>check</id>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>CLASS</element>
<limits>
<limit>
<counter>LINE</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
</limit>
<limit>
<counter>BRANCH</counter>
<value>COVEREDRATIO</value>
<minimum>0.00</minimum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0
sdk/src/main/java/io/dapr/actors/ActorId.java → sdk-actors/src/main/java/io/dapr/actors/ActorId.java
View File

0
sdk/src/main/java/io/dapr/actors/ActorTrace.java → sdk-actors/src/main/java/io/dapr/actors/ActorTrace.java
View File

0
sdk/src/main/java/io/dapr/actors/client/ActorMethodEnvelope.java → sdk-actors/src/main/java/io/dapr/actors/client/ActorMethodEnvelope.java
View File

0
sdk/src/main/java/io/dapr/actors/client/ActorProxy.java → sdk-actors/src/main/java/io/dapr/actors/client/ActorProxy.java
View File

0
sdk/src/main/java/io/dapr/actors/client/ActorProxyBuilder.java → sdk-actors/src/main/java/io/dapr/actors/client/ActorProxyBuilder.java
View File

0
sdk/src/main/java/io/dapr/actors/client/ActorProxyImpl.java → sdk-actors/src/main/java/io/dapr/actors/client/ActorProxyImpl.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/AbstractActor.java → sdk-actors/src/main/java/io/dapr/actors/runtime/AbstractActor.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/Actor.java → sdk-actors/src/main/java/io/dapr/actors/runtime/Actor.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorCallType.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorCallType.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorFactory.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorFactory.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorManager.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorManager.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorMethodContext.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorMethodContext.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorMethodInfoMap.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorMethodInfoMap.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorReminderParams.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorReminderParams.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorRuntime.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorRuntime.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorRuntimeContext.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorRuntimeContext.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorStateChange.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorStateChange.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorStateChangeKind.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorStateChangeKind.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorStateManager.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorStateManager.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorStateSerializer.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorStateSerializer.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorTimer.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorTimer.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorTimerParams.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorTimerParams.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorType.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorType.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorTypeInformation.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorTypeInformation.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/ActorTypeUtilities.java → sdk-actors/src/main/java/io/dapr/actors/runtime/ActorTypeUtilities.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/DaprStateAsyncProvider.java → sdk-actors/src/main/java/io/dapr/actors/runtime/DaprStateAsyncProvider.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/DefaultActorFactory.java → sdk-actors/src/main/java/io/dapr/actors/runtime/DefaultActorFactory.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/DurationUtils.java → sdk-actors/src/main/java/io/dapr/actors/runtime/DurationUtils.java
View File

0
sdk/src/main/java/io/dapr/actors/runtime/Remindable.java → sdk-actors/src/main/java/io/dapr/actors/runtime/Remindable.java
View File

0
sdk/src/test/java/io/dapr/actors/ActorIdTest.java → sdk-actors/src/test/java/io/dapr/actors/ActorIdTest.java
View File

0
sdk/src/test/java/io/dapr/actors/client/ActorProxyBuilderTest.java → sdk-actors/src/test/java/io/dapr/actors/client/ActorProxyBuilderTest.java
View File

0
sdk/src/test/java/io/dapr/actors/client/ActorProxyImplTest.java → sdk-actors/src/test/java/io/dapr/actors/client/ActorProxyImplTest.java
View File

0
sdk/src/test/java/io/dapr/actors/runtime/ActorManagerTest.java → sdk-actors/src/test/java/io/dapr/actors/runtime/ActorManagerTest.java
View File

0
sdk/src/test/java/io/dapr/actors/runtime/ActorMethodInfoMapTest.java → sdk-actors/src/test/java/io/dapr/actors/runtime/ActorMethodInfoMapTest.java
View File

0
sdk/src/test/java/io/dapr/actors/runtime/ActorReminderParamsTest.java → sdk-actors/src/test/java/io/dapr/actors/runtime/ActorReminderParamsTest.java
View File

0
sdk/src/test/java/io/dapr/actors/runtime/ActorTimerTest.java → sdk-actors/src/test/java/io/dapr/actors/runtime/ActorTimerTest.java
View File

0
sdk/src/test/java/io/dapr/actors/runtime/ActorTypeInformationTest.java → sdk-actors/src/test/java/io/dapr/actors/runtime/ActorTypeInformationTest.java
View File

0
sdk/src/test/java/io/dapr/actors/runtime/DaprStateAsyncProviderTest.java → sdk-actors/src/test/java/io/dapr/actors/runtime/DaprStateAsyncProviderTest.java
View File

0
sdk/src/test/java/io/dapr/actors/runtime/DefaultActorFactoryTest.java → sdk-actors/src/test/java/io/dapr/actors/runtime/DefaultActorFactoryTest.java
View File

0
sdk/src/test/java/io/dapr/actors/runtime/DurationUtilsTest.java → sdk-actors/src/test/java/io/dapr/actors/runtime/DurationUtilsTest.java
View File

5
sdk-springboot/pom.xml
View File

@ -43,6 +43,11 @@
<artifactId>dapr-sdk</artifactId>
<version>0.2.0</version>
</dependency>
<dependency>
<groupId>io.dapr</groupId>
<artifactId>dapr-sdk-actors</artifactId>
<version>0.2.0</version>
</dependency>
</dependencies>
<build>

20
sdk/src/main/java/io/dapr/client/DaprClientHttpAdapter.java
View File

@ -7,7 +7,6 @@ package io.dapr.client;
import io.dapr.client.domain.StateKeyValue;
import io.dapr.client.domain.StateOptions;
import io.dapr.client.domain.Verb;
import io.dapr.exceptions.DaprException;
import io.dapr.utils.Constants;
import io.dapr.utils.ObjectSerializer;
import reactor.core.publisher.Mono;
@ -64,7 +63,7 @@ public class DaprClientHttpAdapter implements DaprClient {
public <T> Mono<Void> publishEvent(String topic, T event, Map<String, String> metadata) {
try {
if (topic == null || topic.trim().isEmpty()) {
throw new DaprException("INVALID_TOPIC", "Topic name cannot be null or empty.");
throw new IllegalArgumentException("Topic name cannot be null or empty.");
}
byte[] serializedEvent = objectSerializer.serialize(event);
@ -83,14 +82,14 @@ public class DaprClientHttpAdapter implements DaprClient {
public <T, R> Mono<T> invokeService(Verb verb, String appId, String method, R request, Map<String, String> metadata, Class<T> clazz) {
try {
if (verb == null) {
throw new DaprException("500", "Verb cannot be null.");
throw new IllegalArgumentException("Verb cannot be null.");
}
String httMethod = verb.toString();
if (appId == null || appId.trim().isEmpty()) {
throw new DaprException("500", "App Id cannot be null or empty.");
throw new IllegalArgumentException("App Id cannot be null or empty.");
}
if (method == null || method.trim().isEmpty()) {
throw new DaprException("500", "Method name cannot be null or empty.");
throw new IllegalArgumentException("Method name cannot be null or empty.");
}
String path = String.format("%s/%s/method/%s", Constants.INVOKE_PATH, appId, method);
byte[] serializedRequestBody = objectSerializer.serialize(request);
@ -146,7 +145,7 @@ public class DaprClientHttpAdapter implements DaprClient {
public <T> Mono<Void> invokeBinding(String name, T request) {
try {
if (name == null || name.trim().isEmpty()) {
throw new DaprException("500", "Name to bind cannot be null or empty.");
throw new IllegalArgumentException("Name to bind cannot be null or empty.");
}
Map<String, Object> jsonMap = new HashMap<>();
@ -172,7 +171,7 @@ public class DaprClientHttpAdapter implements DaprClient {
public <T, K> Mono<T> getState(StateKeyValue<K> state, StateOptions options, Class<T> clazz) {
try {
if (state.getKey() == null) {
throw new DaprException("500", "Name cannot be null or empty.");
throw new IllegalArgumentException("Name cannot be null or empty.");
}
Map<String, String> headers = new HashMap<>();
if (state.getEtag() != null && !state.getEtag().trim().isEmpty()) {
@ -236,8 +235,11 @@ public class DaprClientHttpAdapter implements DaprClient {
@Override
public <T> Mono<Void> deleteState(StateKeyValue<T> state, StateOptions options) {
try {
if (state.getKey() == null) {
throw new DaprException("500", "Name cannot be null or empty.");
if (state == null) {
throw new IllegalArgumentException("State cannot be null.");
}
if (state.getKey() == null || state.getKey().trim().isEmpty()) {
throw new IllegalArgumentException("Name cannot be null or empty.");
}
Map<String, String> headers = new HashMap<>();
if (state.getEtag() != null && !state.getEtag().trim().isEmpty()) {

43
sdk/src/main/java/io/dapr/client/DaprHttp.java
View File

@ -8,18 +8,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import io.dapr.exceptions.DaprError;
import io.dapr.exceptions.DaprException;
import io.dapr.utils.Constants;
import io.dapr.utils.ObjectSerializer;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import okhttp3.*;
import reactor.core.publisher.Mono;
import java.io.IOException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.Collections;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@ -89,7 +87,7 @@ class DaprHttp {
* @return Asynchronous text
*/
public Mono<String> invokeAPI(String method, String urlString, Map<String, String> headers) {
return this.invokeAPI(method, urlString, (byte[])null, headers);
return this.invokeAPI(method, urlString, (String) null, headers);
}
/**
@ -101,7 +99,12 @@ class DaprHttp {
* @return Asynchronous text
*/
public Mono<String> invokeAPI(String method, String urlString, String content, Map<String, String> headers) {
return this.invokeAPI(method, urlString, content == null ? EMPTY_BYTES : content.getBytes(StandardCharsets.UTF_8), headers);
return this.invokeAPI(
method,
urlString,
content == null ? EMPTY_BYTES : content.getBytes(StandardCharsets.UTF_8),
headers)
.map(s -> new String(s, StandardCharsets.UTF_8));
}
/**
@ -112,12 +115,12 @@ class DaprHttp {
* @param content payload to be posted.
* @return Asynchronous text
*/
public Mono<String> invokeAPI(String method, String urlString, byte[] content, Map<String, String> headers) {
public Mono<byte[]> invokeAPI(String method, String urlString, byte[] content, Map<String, String> headers) {
return Mono.fromFuture(CompletableFuture.supplyAsync(
() -> {
try {
String requestId = UUID.randomUUID().toString();
RequestBody body = REQUEST_BODY_EMPTY_JSON;
RequestBody body;
String contentType = headers != null ? headers.get("content-type") : null;
MediaType mediaType = contentType == null ? MEDIA_TYPE_APPLICATION_JSON : MediaType.get(contentType);
@ -148,16 +151,16 @@ class DaprHttp {
Request request = requestBuilder.build();
try (Response response = this.httpClient.newCall(request).execute()) {
byte[] responseBody = response.body().bytes();
if (!response.isSuccessful()) {
DaprError error = parseDaprError(response.body().string());
DaprError error = this.parseDaprError(responseBody);
if ((error != null) && (error.getErrorCode() != null) && (error.getMessage() != null)) {
throw new RuntimeException(new DaprException(error));
throw new DaprException(error);
}
throw new RuntimeException("Unknown error.");
throw new IOException("Unknown error.");
}
String result = response.body().string();
return result == null ? "" : result;
return responseBody == null ? EMPTY_BYTES : responseBody;
}
} catch (Exception e) {
throw new RuntimeException(e);
@ -171,16 +174,12 @@ class DaprHttp {
* @param json Response body from Dapr.
* @return DaprError or null if could not parse.
*/
private static DaprError parseDaprError(String json) {
private static DaprError parseDaprError(byte[] json) throws IOException {
if (json == null) {
return null;
}
try {
return OBJECT_MAPPER.readValue(json, DaprError.class);
} catch (IOException e) {
throw new DaprException("500", "Unknown error: could not parse error json.");
}
return OBJECT_MAPPER.readValue(json, DaprError.class);
}
}

7
sdk/src/main/java/io/dapr/runtime/Dapr.java
View File

@ -6,7 +6,6 @@
package io.dapr.runtime;
import io.dapr.client.domain.CloudEventEnvelope;
import io.dapr.exceptions.DaprException;
import io.dapr.utils.ObjectSerializer;
import reactor.core.publisher.Mono;
@ -99,10 +98,14 @@ public final class Dapr implements DaprRuntime {
*/
@Override
public Mono<byte[]> handleInvocation(String name, byte[] payload, Map<String, String> metadata) {
if (name == null) {
return Mono.error(new IllegalArgumentException("Handler's name cannot be null."));
}
Function<HandleRequest, Mono<byte[]>> handler = this.handlers.get(name);
if (handler == null) {
return Mono.error(new DaprException("INVALID_METHOD_OR_TOPIC", "Did not find handler for : " + (name == null ? "" : name)));
return Mono.error(new IllegalArgumentException("Did not find handler for : " + (name == null ? "" : name)));
}
try {

4
sdk/src/test/java/io/dapr/actors/client/DaprHttpAsyncClientIT.java → sdk/src/test/java/io/dapr/client/DaprHttpAsyncClientIT.java
View File

@ -2,10 +2,8 @@
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*/
package io.dapr.actors.client;
package io.dapr.client;
import io.dapr.client.DaprClient;
import io.dapr.client.DaprClientBuilder;
import io.dapr.exceptions.DaprException;
import org.junit.Assert;
import org.junit.Test;

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

@ -42,7 +42,7 @@ public class DaprHttpStub extends DaprHttp {
* {@inheritDoc}
*/
@Override
public Mono<String> invokeAPI(String method, String urlString, byte[] content, Map<String, String> headers) {
public Mono<byte[]> invokeAPI(String method, String urlString, byte[] content, Map<String, String> headers) {
return Mono.empty();
}
}

3
sdk/src/test/java/io/dapr/runtime/DaprRuntimeTest.java
View File

@ -204,8 +204,7 @@ public class DaprRuntimeTest {
this.daprRuntime.handleInvocation(
METHOD_NAME,
message.data,
message.metadata)
.map(r -> new String(r, StandardCharsets.UTF_8)));
message.metadata));
Mono<byte[]> response = client.invokeService(Verb.POST, APP_ID, METHOD_NAME, message.data, message.metadata);
Assert.assertEquals(