refactoring interceptor to internal package

Signed-off-by: salaboy <[email protected]>
dapr · Dec 11, 2023 · b51aa47 · b51aa47
1 parent 99ba57f
commit b51aa47
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 22 deletions.
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java b/sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java
@@ -21,6 +21,7 @@
 import io.dapr.config.Properties;
 import io.dapr.utils.NetworkUtils;
 import io.dapr.workflows.Workflow;
+import io.dapr.workflows.internal.APITokenClientInterceptor;
 import io.grpc.CallOptions;
 import io.grpc.Channel;
 import io.grpc.ClientCall;
@@ -262,25 +263,6 @@ public void close() throws InterruptedException {
     }
   }
 
-  public static ClientInterceptor WORKFLOW_INTERCEPTOR = new ClientInterceptor() {
-    @Override
-    public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
-        MethodDescriptor<ReqT, RespT> methodDescriptor,
-        CallOptions options,
-        Channel channel) {
-      // TBD: do we need timeout in workflow client?
-      ClientCall<ReqT, RespT> clientCall = channel.newCall(methodDescriptor, options);
-      return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(clientCall) {
-        @Override
-        public void start(final Listener<RespT> responseListener, final Metadata metadata) {
-          String daprApiToken = Properties.API_TOKEN.get();
-          if (daprApiToken != null) {
-            metadata.put(Metadata.Key.of(Headers.DAPR_API_TOKEN, Metadata.ASCII_STRING_MARSHALLER), daprApiToken);
-          }
-          super.start(responseListener, metadata);
-        }
-      };
-    }
-  };
+  private static ClientInterceptor WORKFLOW_INTERCEPTOR = new APITokenClientInterceptor();
 }
 
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/internal/APITokenClientInterceptor.java b/sdk-workflows/src/main/java/io/dapr/workflows/internal/APITokenClientInterceptor.java
@@ -0,0 +1,32 @@
+package io.dapr.workflows.internal;
+
+import io.dapr.client.Headers;
+import io.dapr.config.Properties;
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.ClientCall;
+import io.grpc.ClientInterceptor;
+import io.grpc.ForwardingClientCall;
+import io.grpc.Metadata;
+import io.grpc.MethodDescriptor;
+
+public class APITokenClientInterceptor implements ClientInterceptor {
+    @Override
+    public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
+        MethodDescriptor<ReqT, RespT> methodDescriptor,
+        CallOptions options,
+        Channel channel) {
+      // TBD: do we need timeout in workflow client?
+      ClientCall<ReqT, RespT> clientCall = channel.newCall(methodDescriptor, options);
+      return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(clientCall) {
+        @Override
+        public void start(final Listener<RespT> responseListener, final Metadata metadata) {
+          String daprApiToken = Properties.API_TOKEN.get();
+          if (daprApiToken != null) {
+            metadata.put(Metadata.Key.of(Headers.DAPR_API_TOKEN, Metadata.ASCII_STRING_MARSHALLER), daprApiToken);
+          }
+          super.start(responseListener, metadata);
+        }
+      };
+    }
+}
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
@@ -16,15 +16,17 @@
 import com.microsoft.durabletask.DurableTaskGrpcWorkerBuilder;
 import io.dapr.utils.NetworkUtils;
 import io.dapr.workflows.Workflow;
-import io.dapr.workflows.client.DaprWorkflowClient;
+import io.dapr.workflows.internal.APITokenClientInterceptor;
+import io.grpc.ClientInterceptor;
 
 public class WorkflowRuntimeBuilder {
   private static volatile WorkflowRuntime instance;
   private DurableTaskGrpcWorkerBuilder builder;
+  private static ClientInterceptor WORKFLOW_INTERCEPTOR = new APITokenClientInterceptor();
 
   public WorkflowRuntimeBuilder() {
     this.builder = new DurableTaskGrpcWorkerBuilder().grpcChannel(
-                          NetworkUtils.buildGrpcManagedChannel(DaprWorkflowClient.WORKFLOW_INTERCEPTOR));
+                          NetworkUtils.buildGrpcManagedChannel(WORKFLOW_INTERCEPTOR));
   }
 
   /**