checkstyle.xml

@@ -112,6 +112,7 @@
         <module name="ModifierOrder"/>
         <module name="EmptyLineSeparator">
             <property name="allowNoEmptyLineBetweenFields" value="true"/>
+            <property name="allowMultipleEmptyLines" value="false"/>
         </module>
         <module name="SeparatorWrap">
             <property name="id" value="SeparatorWrapDot"/>
@@ -287,4 +288,13 @@
         <module name="SuppressWarningsHolder"/>
     </module>
     <module name="SuppressWarningsFilter"/>
+    <module name="RegexpHeader">
+        <property name="headerFile" value="${checkstyle.header.file}"/>
+        <property name="fileExtensions" value="java,xml"/>
+    </module>
+    <module name="SuppressionSingleFilter">
+        <property name="checks" value="RegexpHeader"/>
+        <property name="files" value=".*\.properties$"/>
+    </module>
+    <module name="NewlineAtEndOfFile"/>
 </module>

dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientProperties.java

@@ -23,7 +23,6 @@ public class DaprClientProperties {
   private Integer httpPort;
   private Integer grpcPort;
 
-
   /**
    * Constructs a {@link DaprClientProperties}.
    */

dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/pubsub/DaprPubSubProperties.java

@@ -15,7 +15,6 @@
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-
 @ConfigurationProperties(prefix = DaprPubSubProperties.CONFIG_PREFIX)
 public class DaprPubSubProperties {
 

dapr-spring/dapr-spring-boot-tests/src/main/java/io/dapr/spring/boot/testcontainers/service/connection/DaprContainerConnectionDetailsFactory.java

@@ -1,3 +1,16 @@
+/*
+ * Copyright 2021 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package io.dapr.spring.boot.testcontainers.service.connection;
 
 import io.dapr.spring.boot.autoconfigure.client.DaprConnectionDetails;

dapr-spring/dapr-spring-data/src/main/java/io/dapr/spring/data/MySQLDaprKeyValueAdapter.java

@@ -76,7 +76,6 @@ public MySQLDaprKeyValueAdapter(DaprClient daprClient, ObjectMapper mapper, Stri
     this.bindingName = bindingName;
   }
 
-
   @Override
   public <T> Iterable<T> getAllOf(String keyspace, Class<T> type) {
     Assert.hasText(keyspace, "Keyspace must not be empty");

dapr-spring/dapr-spring-data/src/main/java/io/dapr/spring/data/repository/query/DaprPredicate.java

@@ -1,3 +1,16 @@
+/*
+ * Copyright 2021 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package io.dapr.spring.data.repository.query;
 
 import org.springframework.beans.BeanWrapper;
@@ -18,7 +31,6 @@ public DaprPredicate(PropertyPath path, Object expected) {
     this(path, expected, (valueToCompare) -> ObjectUtils.nullSafeEquals(valueToCompare, expected));
   }
 
-
   /**
    * Creates a new {@link DaprPredicate}.
    *

dapr-spring/dapr-spring-messaging/src/main/java/io/dapr/spring/messaging/DaprMessagingTemplate.java

@@ -192,7 +192,6 @@ public SendMessageBuilder<T> withTopic(String topic) {
       return this;
     }
 
-
     @Override
     public void send() {
       template.doSend(topic, message);
@@ -202,7 +201,5 @@ public void send() {
     public Mono<Void> sendAsync() {
       return template.doSendAsync(topic, message);
     }
-
   }
-
 }

dapr-spring/dapr-spring-messaging/src/main/java/io/dapr/spring/messaging/observation/DaprMessagingSenderContext.java

@@ -58,7 +58,6 @@ public Map<String, String> properties() {
     return carrier.properties();
   }
 
-
   /**
    * The name of the bean sending the message (typically a {@code DaprMessagingTemplate}).
    * @return the name of the bean sending the message
@@ -75,7 +74,6 @@ public String getDestination() {
     return this.destination;
   }
 
-
   /**
    * Acts as a carrier for a Dapr message and records the propagated properties for
    * later access by the Dapr.

dapr-spring/dapr-spring-workflows/src/main/java/io/dapr/spring/workflows/config/DaprWorkflowsConfiguration.java

@@ -1,3 +1,16 @@
+/*
+ * Copyright 2021 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package io.dapr.spring.workflows.config;
 
 import io.dapr.workflows.Workflow;

dapr-spring/dapr-spring-workflows/src/main/java/io/dapr/spring/workflows/config/EnableDaprWorkflows.java

@@ -1,5 +1,17 @@
-package io.dapr.spring.workflows.config;
+/*
+ * Copyright 2021 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
+package io.dapr.spring.workflows.config;
 
 import org.springframework.context.annotation.Import;
 

dapr-spring/pom.xml

@@ -35,7 +35,7 @@
     <junit.version>5.11.2</junit.version>
     <dapr.spring.version>0.16.0-SNAPSHOT</dapr.spring.version>
     <springboot.version>3.2.6</springboot.version>
-    <springframework.version>6.1.20</springframework.version>
+    <springframework.version>6.1.21</springframework.version>
     <logback-core.version>1.4.14</logback-core.version>
   </properties>
 

examples/src/main/java/io/dapr/examples/workflows/childworkflow/DemoChildWorkflow.java

@@ -13,6 +13,7 @@
 
 package io.dapr.examples.workflows.childworkflow;
 
+import io.dapr.durabletask.interruption.OrchestratorBlockedException;
 import io.dapr.workflows.Workflow;
 import io.dapr.workflows.WorkflowStub;
 import io.dapr.workflows.WorkflowTaskOptions;

sdk-actors/src/main/java/io/dapr/actors/ActorId.java

@@ -123,7 +123,6 @@ public static ActorId createRandom() {
     return new ActorId(id.toString());
   }
 
-
   /**
    * Compares if two actors have the same content.
    *

sdk-actors/src/main/java/io/dapr/actors/client/ActorClient.java

@@ -130,7 +130,6 @@ public void close() {
     }
   }
 
-
   /**
    * Build an instance of the Client based on the provided setup.
    *

sdk-springboot/src/main/java/io/dapr/springboot/DaprController.java

@@ -13,7 +13,6 @@
 
 package io.dapr.springboot;
 
-
 import io.dapr.actors.runtime.ActorRuntime;
 import io.dapr.serializer.DefaultObjectSerializer;
 import org.springframework.http.MediaType;
@@ -124,5 +123,4 @@ public Mono<Void> invokeActorReminder(@PathVariable("type") String type,
                                         @RequestBody(required = false) byte[] body) {
     return ActorRuntime.getInstance().invokeReminder(type, id, reminder, body);
   }
-
 }

sdk-springboot/src/main/java/io/dapr/springboot/DaprTopicSubscription.java

@@ -123,7 +123,6 @@ class DaprTopicSubscription {
     this(pubsubName, topic, route, "", routes, metadata, bulkSubscribe);
   }
 
-
   /**
    * Create a subscription topic.
    *

sdk-workflows/src/main/java/io/dapr/workflows/WorkflowContext.java

@@ -347,10 +347,7 @@ default Task<Task<?>> anyOf(Task<?>... tasks) {
    * @param zonedDateTime timestamp with specific zone when the timer should expire
    * @return a new {@code Task} that completes after the specified delay
    */
-  default Task<Void> createTimer(ZonedDateTime zonedDateTime) {
-    throw new UnsupportedOperationException("This method is not implemented.");
-  }
-
+  Task<Void> createTimer(ZonedDateTime zonedDateTime);
 
   /**
    * Gets the deserialized input of the current task orchestration.

sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java

@@ -33,6 +33,7 @@
 
 import java.time.Duration;
 import java.time.Instant;
+import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.UUID;
 
@@ -189,6 +190,11 @@ public Task<Void> createTimer(Duration duration) {
     return this.innerContext.createTimer(duration);
   }
 
+  @Override
+  public Task<Void> createTimer(ZonedDateTime zonedDateTime) {
+    return this.innerContext.createTimer(zonedDateTime);
+  }
+
   /**
    * {@inheritDoc}
    */

sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityClassWrapper.java

@@ -48,7 +48,6 @@ public String getName() {
     return name;
   }
 
-
   @Override
   public TaskActivity create() {
     return ctx -> {

sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntime.java

@@ -94,4 +94,4 @@ private void shutDownWorkerPool() {
       Thread.currentThread().interrupt();
     }
   }
-}
+}

sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java

@@ -39,14 +39,10 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.*;
 
 public class DefaultWorkflowContextTest {
   private DefaultWorkflowContext context;
@@ -124,6 +120,11 @@ public Task<Void> createTimer(Duration duration) {
         return null;
       }
 
+      @Override
+      public Task<Void> createTimer(ZonedDateTime zonedDateTime) {
+        return null;
+      }
+
       @Override
       public <V> V getInput(Class<V> targetType) {
         return null;
@@ -269,8 +270,10 @@ public void createTimerTest() {
   }
 
   @Test
-  public void createTimerWithZonedDateTimeThrowsTest() {
-    assertThrows(UnsupportedOperationException.class, () -> context.createTimer(ZonedDateTime.now()));
+  public void createTimerWithZonedDateTimeTest() {
+    ZonedDateTime now = ZonedDateTime.now();
+    context.createTimer(now);
+    verify(mockInnerContext, times(1)).createTimer(now);
   }
 
   @Test

sdk/src/main/java/io/dapr/client/AbstractDaprClient.java

@@ -655,7 +655,6 @@ public Mono<UnlockResponseStatus> unlock(String storeName, String resourceId, St
     return this.unlock(request);
   }
 
-
   private List<String> filterEmptyKeys(String... keys) {
     return Arrays.stream(keys)
         .filter(key -> !key.trim().isEmpty())

sdk/src/main/java/io/dapr/client/GrpcChannelFacade.java

@@ -32,7 +32,6 @@ class GrpcChannelFacade implements Closeable {
    */
   private final ManagedChannel channel;
 
-
   /**
    * Default access level constructor, in order to create an instance of this class use io.dapr.client.DaprClientBuilder
    *

sdk/src/main/java/io/dapr/client/domain/BulkPublishEntry.java

@@ -81,7 +81,6 @@ public T getEvent() {
     return event;
   }
 
-
   public String getContentType() {
     return contentType;
   }

sdk/src/main/java/io/dapr/client/domain/BulkSubscribeAppResponseStatus.java

@@ -20,4 +20,4 @@ public enum BulkSubscribeAppResponseStatus {
   SUCCESS,
   RETRY,
   DROP
-}
+}

sdk/src/main/java/io/dapr/client/domain/BulkSubscribeMessage.java

@@ -55,4 +55,4 @@ public String getTopic() {
   public Map<String, String> getMetadata() {
     return metadata;
   }
-}
+}

sdk/src/main/java/io/dapr/client/domain/LockRequest.java

@@ -13,7 +13,6 @@
 
 package io.dapr.client.domain;
 
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.io.Serializable;

sdk/src/main/java/io/dapr/client/domain/QueryStateItem.java

@@ -13,10 +13,8 @@
 
 package io.dapr.client.domain;
 
-
 public class QueryStateItem<T> {
 
-
   /**
    * The value of the state.
    */

sdk/src/main/java/io/dapr/client/domain/QueryStateResponse.java

@@ -13,7 +13,6 @@
 
 package io.dapr.client.domain;
 
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

sdk/src/main/java/io/dapr/client/domain/UnlockResponseStatus.java

@@ -13,7 +13,6 @@
 
 package io.dapr.client.domain;
 
-
 public enum UnlockResponseStatus {
 
   /**

sdk/src/main/java/io/dapr/client/domain/query/Query.java

@@ -72,4 +72,4 @@ public Query setPagination(Pagination pagination) {
     this.pagination = pagination;
     return this;
   }
-}
+}

sdk/src/main/java/io/dapr/config/Properties.java

@@ -254,8 +254,6 @@ public class Properties {
           "DAPR_HTTP_CLIENT_MAX_IDLE_CONNECTIONS",
           DEFAULT_HTTP_CLIENT_MAX_IDLE_CONNECTIONS);
 
-
-
   /**
    * Dapr's default maximum inbound message size for GRPC in bytes.
    */

sdk/src/main/java/io/dapr/exceptions/DaprErrorDetails.java

@@ -217,5 +217,4 @@ public enum ErrorDetailType {
     HELP,
     LOCALIZED_MESSAGE,
   }
-
-}
+}