Added thread interceptor (#120)

Author: mfateev

.github/dependabot.yml

@@ -3,8 +3,8 @@ updates:
   - package-ecosystem: "gradle"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"

build.gradle

@@ -1,12 +1,12 @@
 buildscript {
     dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.11'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'
     }
 }
 
 plugins {
     id 'com.github.sherter.google-java-format' version '0.9'
-    id 'com.google.protobuf' version '0.8.11'
+    id 'com.google.protobuf' version '0.8.12'
     id 'java-library'
     id 'net.ltgt.errorprone' version '1.2.1'
     id 'net.minecrell.licenser' version '0.4.1'
@@ -92,17 +92,17 @@ dependencies {
     errorprone('com.google.errorprone:error_prone_core:2.4.0')
 
     api group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
-    api group: 'com.uber.m3', name: 'tally-core', version: '0.4.0'
+    api group: 'com.uber.m3', name: 'tally-core', version: '0.6.1'
     api group: 'io.micrometer', name: 'micrometer-core', version: '1.5.1'
-    api group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    api group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
     api 'io.grpc:grpc-protobuf:1.30.1'
     api 'io.grpc:grpc-stub:1.30.1'
 
     implementation group: 'com.google.guava', name: 'guava', version: '29.0-jre'
-    implementation group: 'com.cronutils', name: 'cron-utils', version: '9.0.0'
+    implementation group: 'com.cronutils', name: 'cron-utils', version: '9.0.2'
     implementation 'io.grpc:grpc-netty-shaded:1.30.1'
-    implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.12.1'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.3'
+    implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.12.2'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.0'
     implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.11.0'
 
 
@@ -136,7 +136,7 @@ jar {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.11.0'
+        artifact = 'com.google.protobuf:protoc:3.12.3'
     }
     plugins {
         grpc {

src/main/java/io/temporal/client/WorkflowClientOptions.java

@@ -21,6 +21,7 @@
 
 import io.temporal.common.context.ContextPropagator;
 import io.temporal.common.converter.DataConverter;
+import io.temporal.common.interceptors.WorkflowClientInterceptor;
 import io.temporal.enums.v1.QueryRejectCondition;
 import java.lang.management.ManagementFactory;
 import java.util.Arrays;

src/main/java/io/temporal/common/interceptors/NoopWorkflowInterceptor.java

@@ -17,8 +17,11 @@
  *  permissions and limitations under the License.
  */
 
-package io.temporal.client;
+package io.temporal.common.interceptors;
 
+import io.temporal.client.ActivityCompletionClient;
+import io.temporal.client.WorkflowOptions;
+import io.temporal.client.WorkflowStub;
 import io.temporal.common.v1.WorkflowExecution;
 import java.util.Optional;
 

src/main/java/io/temporal/client/WorkflowClientInterceptor.java renamed to src/main/java/io/temporal/common/interceptors/WorkflowClientInterceptor.java

@@ -17,11 +17,15 @@
  *  permissions and limitations under the License.
  */
 
-package io.temporal.client;
+package io.temporal.common.interceptors;
 
+import io.temporal.client.ActivityCompletionClient;
+import io.temporal.client.WorkflowOptions;
+import io.temporal.client.WorkflowStub;
 import io.temporal.common.v1.WorkflowExecution;
 import java.util.Optional;
 
+/** Convenience base class for WorkflowClientInterceptor implementations. */
 public class WorkflowClientInterceptorBase implements WorkflowClientInterceptor {
 
   @Override

src/main/java/io/temporal/client/WorkflowClientInterceptorBase.java renamed to src/main/java/io/temporal/common/interceptors/WorkflowClientInterceptorBase.java

@@ -23,13 +23,13 @@
  * Intercepts calls to the workflow execution. Executes under workflow context. So all the
  * restrictions on the workflow code should be obeyed.
  */
-public interface WorkflowInvocationInterceptor {
+public interface WorkflowInboundCallsInterceptor {
   /**
-   * Called when workflow class is intantiated.
+   * Called when workflow class is instantiated.
    *
-   * @param interceptor interceptor for calls that workflow makes
+   * @param outboundCalls interceptor for calls that workflow makes to the SDK
    */
-  void init(WorkflowCallsInterceptor interceptor);
+  void init(WorkflowOutboundCallsInterceptor outboundCalls);
 
   /**
    * Called when workflow main method is called.

src/main/java/io/temporal/common/interceptors/WorkflowInvocationInterceptor.java renamed to src/main/java/io/temporal/common/interceptors/WorkflowInboundCallsInterceptor.java

@@ -19,19 +19,17 @@
 
 package io.temporal.common.interceptors;
 
-public class BaseWorkflowInvoker implements WorkflowInvoker {
-  private final WorkflowInvocationInterceptor next;
-  private final WorkflowCallsInterceptor interceptor;
+/** Convenience base class for WorkflowInboundCallsInterceptor implementations. */
+public class WorkflowInboundCallsInterceptorBase implements WorkflowInboundCallsInterceptor {
+  private final WorkflowInboundCallsInterceptor next;
 
-  public BaseWorkflowInvoker(
-      WorkflowCallsInterceptor interceptor, WorkflowInvocationInterceptor next) {
+  public WorkflowInboundCallsInterceptorBase(WorkflowInboundCallsInterceptor next) {
     this.next = next;
-    this.interceptor = interceptor;
   }
 
   @Override
-  public void init() {
-    next.init(interceptor);
+  public void init(WorkflowOutboundCallsInterceptor outboundCalls) {
+    next.init(outboundCalls);
   }
 
   @Override

src/main/java/io/temporal/common/interceptors/BaseWorkflowInvoker.java renamed to src/main/java/io/temporal/common/interceptors/WorkflowInboundCallsInterceptorBase.java

@@ -25,6 +25,5 @@
  * <p>TODO(maxim): JavaDoc with sample
  */
 public interface WorkflowInterceptor {
-  WorkflowInvoker interceptExecuteWorkflow(
-      WorkflowCallsInterceptor interceptor, WorkflowInvocationInterceptor next);
+  WorkflowInboundCallsInterceptor interceptWorkflow(WorkflowInboundCallsInterceptor next);
 }