Upgrading checkstyle version + fixing style. (#190)

Co-authored-by: Leon Mai <lemai@microsoft.com>
This commit is contained in:
Artur Souza 2020-01-31 14:38:16 -08:00 committed by GitHub
parent 187a22725c
commit 7510276a1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 59 additions and 58 deletions

View File

@ -198,11 +198,6 @@
</module> </module>
<module name="OverloadMethodsDeclarationOrder"/> <module name="OverloadMethodsDeclarationOrder"/>
<module name="VariableDeclarationUsageDistance"/> <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="MethodParamPad"/>
<module name="NoWhitespaceBefore"> <module name="NoWhitespaceBefore">
<property name="tokens" <property name="tokens"
@ -241,11 +236,7 @@
</module> </module>
<module name="JavadocMethod"> <module name="JavadocMethod">
<property name="scope" value="public"/> <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="allowedAnnotations" value="Override, Test"/>
<property name="allowThrowsTagsForSubclasses" value="true"/>
</module> </module>
<module name="MissingJavadocMethod"> <module name="MissingJavadocMethod">
<property name="scope" value="public"/> <property name="scope" value="public"/>
@ -264,5 +255,17 @@
<property name="exceptionVariableName" value="expected"/> <property name="exceptionVariableName" value="expected"/>
</module> </module>
<module name="CommentsIndentation"/> <module name="CommentsIndentation"/>
<module name="ImportOrder">
<property name="groups" value="*,javax,java"/>
<property name="ordered" value="true"/>
<property name="separated" value="true"/>
<property name="option" value="bottom"/>
<property name="sortStaticImportsAlphabetically" value="true"/>
</module>
<module name="SuppressionXpathSingleFilter">
<property name="checks" value="ImportOrder"/>
<property name="message" value="^'java\..*'.*"/>
</module>
</module> </module>
</module> </module>

View File

@ -10,6 +10,7 @@ import io.dapr.actors.runtime.AbstractActor;
import io.dapr.actors.runtime.ActorRuntimeContext; import io.dapr.actors.runtime.ActorRuntimeContext;
import io.dapr.actors.runtime.ActorType; import io.dapr.actors.runtime.ActorType;
import io.dapr.actors.runtime.Remindable; import io.dapr.actors.runtime.Remindable;
import reactor.core.publisher.Mono;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -17,8 +18,6 @@ import java.time.Duration;
import java.util.Calendar; import java.util.Calendar;
import java.util.TimeZone; import java.util.TimeZone;
import reactor.core.publisher.Mono;
/** /**
* Implementation of the DemoActor for the server side. * Implementation of the DemoActor for the server side.
*/ */

View File

@ -6,14 +6,11 @@
package io.dapr.examples.actors.http; package io.dapr.examples.actors.http;
import io.dapr.actors.runtime.ActorRuntime; import io.dapr.actors.runtime.ActorRuntime;
import io.dapr.serializer.DefaultObjectSerializer;
import io.dapr.springboot.DaprApplication; import io.dapr.springboot.DaprApplication;
import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options; import org.apache.commons.cli.Options;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
/** /**
* Service for Actor runtime. * Service for Actor runtime.

View File

@ -5,25 +5,25 @@
package io.dapr.examples.invoke.grpc; package io.dapr.examples.invoke.grpc;
import static io.dapr.examples.DaprExamplesProtos.SayRequest;
import static io.dapr.examples.DaprExamplesProtos.SayResponse;
import com.google.protobuf.Any; import com.google.protobuf.Any;
import com.google.protobuf.InvalidProtocolBufferException;
import io.dapr.DaprClientGrpc; import io.dapr.DaprClientGrpc;
import io.dapr.DaprClientProtos; import io.dapr.DaprClientProtos;
import io.grpc.Server; import io.grpc.Server;
import io.grpc.ServerBuilder; import io.grpc.ServerBuilder;
import io.grpc.stub.StreamObserver; import io.grpc.stub.StreamObserver;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import java.io.IOException; import java.io.IOException;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.TimeZone; import java.util.TimeZone;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser; import static io.dapr.examples.DaprExamplesProtos.SayRequest;
import org.apache.commons.cli.DefaultParser; import static io.dapr.examples.DaprExamplesProtos.SayResponse;
import org.apache.commons.cli.Options;
/** /**
* 1. Build and install jars: * 1. Build and install jars:

View File

@ -6,6 +6,11 @@
package io.dapr.examples.invoke.http; package io.dapr.examples.invoke.http;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.web.bind.annotation.PostMapping;
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.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.text.DateFormat; import java.text.DateFormat;
@ -14,12 +19,6 @@ import java.util.Calendar;
import java.util.Map; import java.util.Map;
import java.util.TimeZone; import java.util.TimeZone;
import org.springframework.web.bind.annotation.PostMapping;
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;
/** /**
* SpringBoot Controller to handle input binding. * SpringBoot Controller to handle input binding.
*/ */

View File

@ -7,7 +7,6 @@ package io.dapr.examples.pubsub.http;
import io.dapr.client.DaprClient; import io.dapr.client.DaprClient;
import io.dapr.client.DaprClientBuilder; import io.dapr.client.DaprClientBuilder;
import io.dapr.serializer.DefaultObjectSerializer;
import java.util.Collections; import java.util.Collections;

View File

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

View File

@ -145,7 +145,7 @@
<dependency> <dependency>
<groupId>com.puppycrawl.tools</groupId> <groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId> <artifactId>checkstyle</artifactId>
<version>8.27</version> <version>8.29</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>

View File

@ -3,9 +3,10 @@ package io.dapr.actors.client;
import io.dapr.actors.ActorId; import io.dapr.actors.ActorId;
import io.dapr.actors.runtime.ObjectSerializer; import io.dapr.actors.runtime.ObjectSerializer;
import io.dapr.serializer.DaprObjectSerializer; import io.dapr.serializer.DaprObjectSerializer;
import java.io.IOException;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import java.io.IOException;
/** /**
* Implements a proxy client for an Actor's instance. * Implements a proxy client for an Actor's instance.
*/ */

View File

@ -7,12 +7,12 @@ package io.dapr.actors.runtime;
import io.dapr.actors.ActorId; import io.dapr.actors.ActorId;
import io.dapr.actors.ActorTrace; import io.dapr.actors.ActorTrace;
import reactor.core.publisher.Mono;
import java.io.IOException; import java.io.IOException;
import java.time.Duration; import java.time.Duration;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import reactor.core.publisher.Mono;
/** /**
* Represents the base class for actors. * Represents the base class for actors.

View File

@ -1,13 +1,14 @@
package io.dapr.actors.runtime; package io.dapr.actors.runtime;
import io.dapr.actors.ActorId; import io.dapr.actors.ActorId;
import reactor.core.publisher.Mono;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import reactor.core.publisher.Mono;
/** /**
* Manages actors of a specific type. * Manages actors of a specific type.

View File

@ -10,11 +10,12 @@ import io.dapr.actors.ActorTrace;
import io.dapr.client.DaprHttpBuilder; import io.dapr.client.DaprHttpBuilder;
import io.dapr.serializer.DaprObjectSerializer; import io.dapr.serializer.DaprObjectSerializer;
import io.dapr.serializer.DefaultObjectSerializer; import io.dapr.serializer.DefaultObjectSerializer;
import reactor.core.publisher.Mono;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import reactor.core.publisher.Mono;
/** /**
* Contains methods to register actor types. Registering the types allows the * Contains methods to register actor types. Registering the types allows the

View File

@ -6,12 +6,13 @@
package io.dapr.actors.runtime; package io.dapr.actors.runtime;
import io.dapr.actors.ActorId; import io.dapr.actors.ActorId;
import reactor.core.publisher.Mono;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import reactor.core.publisher.Mono;
/** /**
* Manages state changes of a given Actor instance. * Manages state changes of a given Actor instance.

View File

@ -11,12 +11,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import io.dapr.actors.ActorId; import io.dapr.actors.ActorId;
import io.dapr.serializer.DaprObjectSerializer; import io.dapr.serializer.DaprObjectSerializer;
import io.dapr.serializer.StringContentType; import io.dapr.serializer.StringContentType;
import reactor.core.publisher.Mono;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import reactor.core.publisher.Mono;
/** /**
* State Provider to interact with Dapr runtime to handle state. * State Provider to interact with Dapr runtime to handle state.
*/ */

View File

@ -7,6 +7,7 @@ package io.dapr.actors.runtime;
import io.dapr.actors.ActorId; import io.dapr.actors.ActorId;
import io.dapr.actors.ActorTrace; import io.dapr.actors.ActorTrace;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
/** /**

View File

@ -9,6 +9,7 @@ import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import io.dapr.utils.DurationUtils; import io.dapr.utils.DurationUtils;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.time.Duration; import java.time.Duration;
@ -185,7 +186,7 @@ public class ObjectSerializer extends io.dapr.client.ObjectSerializer {
* *
* @param data bytes to be wrapped into the "data" attribute in a JSON object. * @param data bytes to be wrapped into the "data" attribute in a JSON object.
* @return String to be sent to Dapr's API. * @return String to be sent to Dapr's API.
* @throws RuntimeException In case it cannot generate String. * @throws IOException In case it cannot generate String.
*/ */
public byte[] wrapData(final byte[] data) throws IOException { public byte[] wrapData(final byte[] data) throws IOException {
try (ByteArrayOutputStream output = new ByteArrayOutputStream()) { try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {

View File

@ -5,9 +5,10 @@
package io.dapr.actors.runtime; package io.dapr.actors.runtime;
import java.time.Duration;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import java.time.Duration;
/** /**
* Interface that actors must implement to consume reminders registered using RegisterReminderAsync. * Interface that actors must implement to consume reminders registered using RegisterReminderAsync.
*/ */

View File

@ -8,9 +8,10 @@ package io.dapr.client;
import io.dapr.client.domain.State; import io.dapr.client.domain.State;
import io.dapr.client.domain.StateOptions; import io.dapr.client.domain.StateOptions;
import io.dapr.client.domain.Verb; import io.dapr.client.domain.Verb;
import reactor.core.publisher.Mono;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import reactor.core.publisher.Mono;
/** /**
* Generic Client Adapter to be used regardless of the GRPC or the HTTP Client implementation required. * Generic Client Adapter to be used regardless of the GRPC or the HTTP Client implementation required.

View File

@ -16,14 +16,13 @@ import io.dapr.client.domain.State;
import io.dapr.client.domain.StateOptions; import io.dapr.client.domain.StateOptions;
import io.dapr.client.domain.Verb; import io.dapr.client.domain.Verb;
import io.dapr.serializer.DaprObjectSerializer; import io.dapr.serializer.DaprObjectSerializer;
import reactor.core.publisher.Mono;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import reactor.core.publisher.Mono;
/** /**
* An adapter for the GRPC Client. * An adapter for the GRPC Client.
* *

View File

@ -12,6 +12,7 @@ import io.dapr.serializer.DaprObjectSerializer;
import io.dapr.serializer.DefaultObjectSerializer; import io.dapr.serializer.DefaultObjectSerializer;
import io.dapr.serializer.StringContentType; import io.dapr.serializer.StringContentType;
import io.dapr.utils.Constants; import io.dapr.utils.Constants;
import reactor.core.publisher.Mono;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -21,8 +22,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import reactor.core.publisher.Mono;
/** /**
* An adapter for the HTTP Client. * An adapter for the HTTP Client.
* *

View File

@ -9,6 +9,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import io.dapr.exceptions.DaprError; import io.dapr.exceptions.DaprError;
import io.dapr.exceptions.DaprException; import io.dapr.exceptions.DaprException;
import io.dapr.utils.Constants; import io.dapr.utils.Constants;
import okhttp3.HttpUrl;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import reactor.core.publisher.Mono;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Collections; import java.util.Collections;
@ -17,14 +24,6 @@ import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import okhttp3.HttpUrl;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import reactor.core.publisher.Mono;
public class DaprHttp { public class DaprHttp {
/** /**

View File

@ -6,9 +6,10 @@
package io.dapr.client; package io.dapr.client;
import io.dapr.utils.Properties; import io.dapr.utils.Properties;
import java.time.Duration;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import java.time.Duration;
/** /**
* A builder for the DaprHttp. * A builder for the DaprHttp.
*/ */

View File

@ -11,7 +11,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import io.dapr.client.domain.CloudEvent; import io.dapr.client.domain.CloudEvent;
import java.io.IOException; import java.io.IOException;
import java.util.Base64;
/** /**
* Serializes and deserializes an internal object. * Serializes and deserializes an internal object.