diff --git a/checkstyle.xml b/checkstyle.xml
index 642023427..fb449e1eb 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -198,11 +198,6 @@
     </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"
@@ -241,11 +236,7 @@
     </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"/>
@@ -264,5 +255,17 @@
       <property name="exceptionVariableName" value="expected"/>
     </module>
     <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>
\ No newline at end of file
+</module>
diff --git a/examples/src/main/java/io/dapr/examples/actors/http/DemoActorImpl.java b/examples/src/main/java/io/dapr/examples/actors/http/DemoActorImpl.java
index e367c1ef5..b10d938a7 100644
--- a/examples/src/main/java/io/dapr/examples/actors/http/DemoActorImpl.java
+++ b/examples/src/main/java/io/dapr/examples/actors/http/DemoActorImpl.java
@@ -10,6 +10,7 @@ import io.dapr.actors.runtime.AbstractActor;
 import io.dapr.actors.runtime.ActorRuntimeContext;
 import io.dapr.actors.runtime.ActorType;
 import io.dapr.actors.runtime.Remindable;
+import reactor.core.publisher.Mono;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -17,8 +18,6 @@ import java.time.Duration;
 import java.util.Calendar;
 import java.util.TimeZone;
 
-import reactor.core.publisher.Mono;
-
 /**
  * Implementation of the DemoActor for the server side.
  */
diff --git a/examples/src/main/java/io/dapr/examples/actors/http/DemoActorService.java b/examples/src/main/java/io/dapr/examples/actors/http/DemoActorService.java
index 7b4f89ffb..35b9fdbe7 100644
--- a/examples/src/main/java/io/dapr/examples/actors/http/DemoActorService.java
+++ b/examples/src/main/java/io/dapr/examples/actors/http/DemoActorService.java
@@ -6,14 +6,11 @@
 package io.dapr.examples.actors.http;
 
 import io.dapr.actors.runtime.ActorRuntime;
-import io.dapr.serializer.DefaultObjectSerializer;
 import io.dapr.springboot.DaprApplication;
 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 org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * Service for Actor runtime.
diff --git a/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldService.java b/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldService.java
index edd24f37b..6a0fd8419 100644
--- a/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldService.java
+++ b/examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldService.java
@@ -5,25 +5,25 @@
 
 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.InvalidProtocolBufferException;
 import io.dapr.DaprClientGrpc;
 import io.dapr.DaprClientProtos;
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
 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.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.TimeZone;
-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 static io.dapr.examples.DaprExamplesProtos.SayRequest;
+import static io.dapr.examples.DaprExamplesProtos.SayResponse;
 
 /**
  * 1. Build and install jars:
diff --git a/examples/src/main/java/io/dapr/examples/invoke/http/DemoServiceController.java b/examples/src/main/java/io/dapr/examples/invoke/http/DemoServiceController.java
index bd5dee45e..e21ddc70f 100644
--- a/examples/src/main/java/io/dapr/examples/invoke/http/DemoServiceController.java
+++ b/examples/src/main/java/io/dapr/examples/invoke/http/DemoServiceController.java
@@ -6,6 +6,11 @@
 package io.dapr.examples.invoke.http;
 
 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.text.DateFormat;
@@ -14,12 +19,6 @@ import java.util.Calendar;
 import java.util.Map;
 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.
  */
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/http/Publisher.java b/examples/src/main/java/io/dapr/examples/pubsub/http/Publisher.java
index c4f6956e2..852f82ecf 100644
--- a/examples/src/main/java/io/dapr/examples/pubsub/http/Publisher.java
+++ b/examples/src/main/java/io/dapr/examples/pubsub/http/Publisher.java
@@ -7,7 +7,6 @@ package io.dapr.examples.pubsub.http;
 
 import io.dapr.client.DaprClient;
 import io.dapr.client.DaprClientBuilder;
-import io.dapr.serializer.DefaultObjectSerializer;
 
 import java.util.Collections;
 
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/http/SubscriberController.java b/examples/src/main/java/io/dapr/examples/pubsub/http/SubscriberController.java
index 7c9f0c952..2700ba63e 100644
--- a/examples/src/main/java/io/dapr/examples/pubsub/http/SubscriberController.java
+++ b/examples/src/main/java/io/dapr/examples/pubsub/http/SubscriberController.java
@@ -7,8 +7,6 @@ package io.dapr.examples.pubsub.http;
 
 import io.dapr.client.domain.CloudEvent;
 import io.dapr.serializer.DefaultObjectSerializer;
-import java.util.Map;
-
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 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 reactor.core.publisher.Mono;
 
+import java.util.Map;
+
 /**
  * SpringBoot Controller to handle input binding.
  */
diff --git a/pom.xml b/pom.xml
index fad4535f5..fba7e3506 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>8.27</version>
+            <version>8.29</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/sdk-actors/src/main/java/io/dapr/actors/client/ActorProxyImpl.java b/sdk-actors/src/main/java/io/dapr/actors/client/ActorProxyImpl.java
index de354ab6c..9367d5794 100644
--- a/sdk-actors/src/main/java/io/dapr/actors/client/ActorProxyImpl.java
+++ b/sdk-actors/src/main/java/io/dapr/actors/client/ActorProxyImpl.java
@@ -3,9 +3,10 @@ package io.dapr.actors.client;
 import io.dapr.actors.ActorId;
 import io.dapr.actors.runtime.ObjectSerializer;
 import io.dapr.serializer.DaprObjectSerializer;
-import java.io.IOException;
 import reactor.core.publisher.Mono;
 
+import java.io.IOException;
+
 /**
  * Implements a proxy client for an Actor's instance.
  */
diff --git a/sdk-actors/src/main/java/io/dapr/actors/runtime/AbstractActor.java b/sdk-actors/src/main/java/io/dapr/actors/runtime/AbstractActor.java
index a5a7ec45f..ae9519610 100644
--- a/sdk-actors/src/main/java/io/dapr/actors/runtime/AbstractActor.java
+++ b/sdk-actors/src/main/java/io/dapr/actors/runtime/AbstractActor.java
@@ -7,12 +7,12 @@ package io.dapr.actors.runtime;
 
 import io.dapr.actors.ActorId;
 import io.dapr.actors.ActorTrace;
+import reactor.core.publisher.Mono;
+
 import java.io.IOException;
 import java.time.Duration;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import reactor.core.publisher.Mono;
 
 /**
  * Represents the base class for actors.
diff --git a/sdk-actors/src/main/java/io/dapr/actors/runtime/ActorManager.java b/sdk-actors/src/main/java/io/dapr/actors/runtime/ActorManager.java
index 8acc020a8..68e8a5cb0 100644
--- a/sdk-actors/src/main/java/io/dapr/actors/runtime/ActorManager.java
+++ b/sdk-actors/src/main/java/io/dapr/actors/runtime/ActorManager.java
@@ -1,13 +1,14 @@
 package io.dapr.actors.runtime;
 
 import io.dapr.actors.ActorId;
+import reactor.core.publisher.Mono;
+
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
-import reactor.core.publisher.Mono;
 
 /**
  * Manages actors of a specific type.
diff --git a/sdk-actors/src/main/java/io/dapr/actors/runtime/ActorRuntime.java b/sdk-actors/src/main/java/io/dapr/actors/runtime/ActorRuntime.java
index 42bd991db..03c303fcc 100644
--- a/sdk-actors/src/main/java/io/dapr/actors/runtime/ActorRuntime.java
+++ b/sdk-actors/src/main/java/io/dapr/actors/runtime/ActorRuntime.java
@@ -10,11 +10,12 @@ import io.dapr.actors.ActorTrace;
 import io.dapr.client.DaprHttpBuilder;
 import io.dapr.serializer.DaprObjectSerializer;
 import io.dapr.serializer.DefaultObjectSerializer;
+import reactor.core.publisher.Mono;
+
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import reactor.core.publisher.Mono;
 
 /**
  * Contains methods to register actor types. Registering the types allows the
diff --git a/sdk-actors/src/main/java/io/dapr/actors/runtime/ActorStateManager.java b/sdk-actors/src/main/java/io/dapr/actors/runtime/ActorStateManager.java
index eaa1d526c..cb48fd9f7 100644
--- a/sdk-actors/src/main/java/io/dapr/actors/runtime/ActorStateManager.java
+++ b/sdk-actors/src/main/java/io/dapr/actors/runtime/ActorStateManager.java
@@ -6,12 +6,13 @@
 package io.dapr.actors.runtime;
 
 import io.dapr.actors.ActorId;
+import reactor.core.publisher.Mono;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import reactor.core.publisher.Mono;
 
 /**
  * Manages state changes of a given Actor instance.
diff --git a/sdk-actors/src/main/java/io/dapr/actors/runtime/DaprStateAsyncProvider.java b/sdk-actors/src/main/java/io/dapr/actors/runtime/DaprStateAsyncProvider.java
index bb9e7e7c6..3665f5849 100644
--- a/sdk-actors/src/main/java/io/dapr/actors/runtime/DaprStateAsyncProvider.java
+++ b/sdk-actors/src/main/java/io/dapr/actors/runtime/DaprStateAsyncProvider.java
@@ -11,12 +11,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.dapr.actors.ActorId;
 import io.dapr.serializer.DaprObjectSerializer;
 import io.dapr.serializer.StringContentType;
+import reactor.core.publisher.Mono;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import reactor.core.publisher.Mono;
-
 /**
  * State Provider to interact with Dapr runtime to handle state.
  */
diff --git a/sdk-actors/src/main/java/io/dapr/actors/runtime/DefaultActorFactory.java b/sdk-actors/src/main/java/io/dapr/actors/runtime/DefaultActorFactory.java
index 460d78efc..bccd24c29 100644
--- a/sdk-actors/src/main/java/io/dapr/actors/runtime/DefaultActorFactory.java
+++ b/sdk-actors/src/main/java/io/dapr/actors/runtime/DefaultActorFactory.java
@@ -7,6 +7,7 @@ package io.dapr.actors.runtime;
 
 import io.dapr.actors.ActorId;
 import io.dapr.actors.ActorTrace;
+
 import java.lang.reflect.Constructor;
 
 /**
diff --git a/sdk-actors/src/main/java/io/dapr/actors/runtime/ObjectSerializer.java b/sdk-actors/src/main/java/io/dapr/actors/runtime/ObjectSerializer.java
index 4202e9811..2cfb2e654 100644
--- a/sdk-actors/src/main/java/io/dapr/actors/runtime/ObjectSerializer.java
+++ b/sdk-actors/src/main/java/io/dapr/actors/runtime/ObjectSerializer.java
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonNode;
 import io.dapr.utils.DurationUtils;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 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.
    * @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 {
     try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
diff --git a/sdk-actors/src/main/java/io/dapr/actors/runtime/Remindable.java b/sdk-actors/src/main/java/io/dapr/actors/runtime/Remindable.java
index c66ff1478..de0584e40 100644
--- a/sdk-actors/src/main/java/io/dapr/actors/runtime/Remindable.java
+++ b/sdk-actors/src/main/java/io/dapr/actors/runtime/Remindable.java
@@ -5,9 +5,10 @@
 
 package io.dapr.actors.runtime;
 
-import java.time.Duration;
 import reactor.core.publisher.Mono;
 
+import java.time.Duration;
+
 /**
  * Interface that actors must implement to consume reminders registered using RegisterReminderAsync.
  */
diff --git a/sdk/src/main/java/io/dapr/client/DaprClient.java b/sdk/src/main/java/io/dapr/client/DaprClient.java
index bcedd9ae0..7fae48cd6 100644
--- a/sdk/src/main/java/io/dapr/client/DaprClient.java
+++ b/sdk/src/main/java/io/dapr/client/DaprClient.java
@@ -8,9 +8,10 @@ package io.dapr.client;
 import io.dapr.client.domain.State;
 import io.dapr.client.domain.StateOptions;
 import io.dapr.client.domain.Verb;
+import reactor.core.publisher.Mono;
+
 import java.util.List;
 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.
diff --git a/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java b/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java
index 3cfdc3ea8..be9be36a0 100644
--- a/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java
+++ b/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java
@@ -16,14 +16,13 @@ import io.dapr.client.domain.State;
 import io.dapr.client.domain.StateOptions;
 import io.dapr.client.domain.Verb;
 import io.dapr.serializer.DaprObjectSerializer;
+import reactor.core.publisher.Mono;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import reactor.core.publisher.Mono;
-
 /**
  * An adapter for the GRPC Client.
  *
diff --git a/sdk/src/main/java/io/dapr/client/DaprClientHttp.java b/sdk/src/main/java/io/dapr/client/DaprClientHttp.java
index 0e79a3bd8..5108835f8 100644
--- a/sdk/src/main/java/io/dapr/client/DaprClientHttp.java
+++ b/sdk/src/main/java/io/dapr/client/DaprClientHttp.java
@@ -12,6 +12,7 @@ import io.dapr.serializer.DaprObjectSerializer;
 import io.dapr.serializer.DefaultObjectSerializer;
 import io.dapr.serializer.StringContentType;
 import io.dapr.utils.Constants;
+import reactor.core.publisher.Mono;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -21,8 +22,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import reactor.core.publisher.Mono;
-
 /**
  * An adapter for the HTTP Client.
  *
diff --git a/sdk/src/main/java/io/dapr/client/DaprHttp.java b/sdk/src/main/java/io/dapr/client/DaprHttp.java
index 543559c4a..37613aec4 100644
--- a/sdk/src/main/java/io/dapr/client/DaprHttp.java
+++ b/sdk/src/main/java/io/dapr/client/DaprHttp.java
@@ -9,6 +9,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.dapr.exceptions.DaprError;
 import io.dapr.exceptions.DaprException;
 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.nio.charset.StandardCharsets;
 import java.util.Collections;
@@ -17,14 +24,6 @@ import java.util.Map;
 import java.util.Optional;
 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 {
 
   /**
diff --git a/sdk/src/main/java/io/dapr/client/DaprHttpBuilder.java b/sdk/src/main/java/io/dapr/client/DaprHttpBuilder.java
index 9c833042d..54fc5babb 100644
--- a/sdk/src/main/java/io/dapr/client/DaprHttpBuilder.java
+++ b/sdk/src/main/java/io/dapr/client/DaprHttpBuilder.java
@@ -6,9 +6,10 @@
 package io.dapr.client;
 
 import io.dapr.utils.Properties;
-import java.time.Duration;
 import okhttp3.OkHttpClient;
 
+import java.time.Duration;
+
 /**
  * A builder for the DaprHttp.
  */
diff --git a/sdk/src/main/java/io/dapr/client/ObjectSerializer.java b/sdk/src/main/java/io/dapr/client/ObjectSerializer.java
index 33014f6f7..8375eabe4 100644
--- a/sdk/src/main/java/io/dapr/client/ObjectSerializer.java
+++ b/sdk/src/main/java/io/dapr/client/ObjectSerializer.java
@@ -11,7 +11,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.dapr.client.domain.CloudEvent;
 
 import java.io.IOException;
-import java.util.Base64;
 
 /**
  * Serializes and deserializes an internal object.