Merge branch 'master' into release-1.0

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
       DAPR_RUNTIME_VER: 1.0.0-rc.3
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/3dacfb672d55f1436c249057aaebbe597e1066f3/install/install.sh
       DAPR_CLI_REF:
-      DAPR_REF:
+      DAPR_REF: 4899aa8fb8f7537fb10432e6cc0cfc09c572cb54
       OSSRH_USER_TOKEN: ${{ secrets.OSSRH_USER_TOKEN }}
       OSSRH_PWD_TOKEN: ${{ secrets.OSSRH_PWD_TOKEN }}
       GPG_KEY: ${{ secrets.GPG_KEY }}

.github/workflows/validate.yml

@@ -1,5 +1,5 @@
 # ------------------------------------------------------------
-# Copyright (c) Microsoft Corporation.
+# Copyright (c) Microsoft Corporation and Dapr Contributors.
 # Licensed under the MIT License.
 # ------------------------------------------------------------
 

README.md

@@ -1,7 +1,7 @@
 ## Dapr SDK for Java
 
 [![Build Status](https://github.com/dapr/java-sdk/workflows/Build/badge.svg?event=push&branch=master)](https://github.com/dapr/java-sdk/actions?workflow=Build)
-[![Gitter](https://badges.gitter.im/Dapr/java-sdk.svg)](https://gitter.im/Dapr/java-sdk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Discord](https://img.shields.io/discord/778680217417809931)](https://discord.com/channels/778680217417809931/778749797242765342) 
 [![codecov](https://codecov.io/gh/dapr/java-sdk/branch/master/graph/badge.svg)](https://codecov.io/gh/dapr/java-sdk)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Maven Central](https://img.shields.io/maven-central/v/io.dapr/dapr-sdk.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22io.dapr%22%20AND%20a:%22dapr-sdk%22)

checkstyle.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright (c) Microsoft Corporation.
+  ~ Copyright (c) Microsoft Corporation and Dapr Contributors.
   ~ Licensed under the MIT License.
   -->
 
@@ -45,7 +45,7 @@
 
   <module name="Header">
     <property name="fileExtensions" value="java"/>
-    <property name="header"  value="/*\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n */"/>
+    <property name="header"  value="/*\n * Copyright (c) Microsoft Corporation and Dapr Contributors.\n * Licensed under the MIT License.\n */"/>
   </module>
 
   <module name="TreeWalker">

examples/src/main/java/io/dapr/examples/DaprApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/DaprConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/DaprMainApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/OpenTelemetryConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/OpenTelemetryInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/OpenTelemetryInterceptorConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/actors/DemoActor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/actors/DemoActorClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/actors/DemoActorImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/actors/DemoActorService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/bindings/http/InputBindingController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/bindings/http/InputBindingExample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/bindings/http/OutputBindingExample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/exception/Client.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/invoke/grpc/HelloWorldService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/invoke/http/DemoService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/invoke/http/DemoServiceController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/invoke/http/InvokeClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/pubsub/http/Publisher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/pubsub/http/Subscriber.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/pubsub/http/SubscriberController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/secrets/SecretClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/state/StateClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/tracing/InvokeClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 
@@ -52,18 +52,18 @@ public class InvokeClient {
           InvokeMethodRequest request = builder
               .withBody(message)
               .withHttpExtension(HttpExtension.POST)
-              .withContext(getReactorContext()).build();
+              .build();
           client.invokeMethod(request, TypeRef.get(byte[].class))
               .map(r -> {
-                System.out.println(new String(r.getObject()));
+                System.out.println(new String(r));
                 return r;
               })
               .flatMap(r -> {
                 InvokeMethodRequest sleepRequest = new InvokeMethodRequestBuilder(SERVICE_APP_ID, "proxy_sleep")
                     .withHttpExtension(HttpExtension.POST)
-                    .withContext(r.getContext()).build();
+                    .build();
                 return client.invokeMethod(sleepRequest, TypeRef.get(Void.class));
-              }).block();
+              }).subscriberContext(getReactorContext()).block();
         }
       }
 

examples/src/main/java/io/dapr/examples/tracing/README.md

@@ -147,19 +147,19 @@ public class TracingDemoMiddleServiceController {
       @RequestBody(required = false) String body) {
     InvokeMethodRequestBuilder builder = new InvokeMethodRequestBuilder(INVOKE_APP_ID, "echo");
     InvokeMethodRequest request = builder
-        .withBody(body)
+      .withBody(body)
-        .withHttpExtension(HttpExtension.POST)
+      .withHttpExtension(HttpExtension.POST)
-        .withContext(getReactorContext(context)).build();
+      .build();
-    return client.invokeMethod(request, TypeRef.get(byte[].class)).map(r -> r.getObject());
+    return client.invokeMethod(request, TypeRef.get(byte[].class)).subscriberContext(getReactorContext(context));
   }
   // ...
   @PostMapping(path = "/proxy_sleep")
   public Mono<Void> sleep(@RequestAttribute(name = "opentelemetry-context") Context context) {
     InvokeMethodRequestBuilder builder = new InvokeMethodRequestBuilder(INVOKE_APP_ID, "sleep");
     InvokeMethodRequest request = builder
-        .withHttpExtension(HttpExtension.POST)
+      .withHttpExtension(HttpExtension.POST)
-        .withContext(getReactorContext(context)).build();
+      .build();
-    return client.invokeMethod(request, TypeRef.get(byte[].class)).then();
+    return client.invokeMethod(request, TypeRef.get(byte[].class)).subscriberContext(getReactorContext(context)).then();
   }
 }
 ```
@@ -222,26 +222,29 @@ public class InvokeClient {
 private static final String SERVICE_APP_ID = "tracingdemoproxy";
 ///...
   public static void main(String[] args) throws Exception {
-    Tracer tracer = OpenTelemetryConfig.createTracer(InvokeClient.class.getCanonicalName());
+    final OpenTelemetry openTelemetry = OpenTelemetryConfig.createOpenTelemetry();
+    final Tracer tracer = openTelemetry.getTracer(InvokeClient.class.getCanonicalName());
 
     Span span = tracer.spanBuilder("Example's Main").setSpanKind(Span.Kind.CLIENT).startSpan();
     try (DaprClient client = (new DaprClientBuilder()).build()) {
       for (String message : args) {
-        try (Scope scope = tracer.withSpan(span)) {
+        try (Scope scope = span.makeCurrent()) {
-          InvokeServiceRequestBuilder builder = new InvokeServiceRequestBuilder(SERVICE_APP_ID, "proxy_echo");
+          InvokeMethodRequestBuilder builder = new InvokeMethodRequestBuilder(SERVICE_APP_ID, "proxy_echo");
-          InvokeServiceRequest request
+          InvokeMethodRequest request = builder
-              = builder.withBody(message).withHttpExtension(HttpExtension.POST).withContext(Context.current()).build();
+            .withBody(message)
-          client.invokeService(request, TypeRef.get(byte[].class))
+            .withHttpExtension(HttpExtension.POST)
-              .map(r -> {
+            .build();
-                System.out.println(new String(r.getObject()));
+          client.invokeMethod(request, TypeRef.get(byte[].class))
-                return r;
+            .map(r -> {
-              })
+              System.out.println(new String(r));
-              .flatMap(r -> {
+              return r;
-                InvokeServiceRequest sleepRequest = new InvokeServiceRequestBuilder(SERVICE_APP_ID, "proxy_sleep")
+            })
-                    .withHttpExtension(HttpExtension.POST)
+            .flatMap(r -> {
-                    .withContext(r.getContext()).build();
+              InvokeMethodRequest sleepRequest = new InvokeMethodRequestBuilder(SERVICE_APP_ID, "proxy_sleep")
-                return client.invokeMethod(sleepRequest, TypeRef.get(Void.class));
+                .withHttpExtension(HttpExtension.POST)
-              }).block();
+                .build();
+              return client.invokeMethod(sleepRequest, TypeRef.get(Void.class));
+            }).subscriberContext(getReactorContext()).block();
         }
       }
 

examples/src/main/java/io/dapr/examples/tracing/TracingDemoMiddleServiceController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 
@@ -52,8 +52,8 @@ public class TracingDemoMiddleServiceController {
     InvokeMethodRequest request = builder
         .withBody(body)
         .withHttpExtension(HttpExtension.POST)
-        .withContext(getReactorContext(context)).build();
+        .build();
-    return client.invokeMethod(request, TypeRef.get(byte[].class)).map(r -> r.getObject());
+    return client.invokeMethod(request, TypeRef.get(byte[].class)).subscriberContext(getReactorContext(context));
   }
 
   /**
@@ -67,8 +67,8 @@ public class TracingDemoMiddleServiceController {
     InvokeMethodRequestBuilder builder = new InvokeMethodRequestBuilder(INVOKE_APP_ID, "sleep");
     InvokeMethodRequest request = builder
         .withHttpExtension(HttpExtension.POST)
-        .withContext(getReactorContext(context)).build();
+        .build();
-    return client.invokeMethod(request, TypeRef.get(byte[].class)).then();
+    return client.invokeMethod(request, TypeRef.get(byte[].class)).subscriberContext(getReactorContext(context)).then();
   }
 
 }

examples/src/main/java/io/dapr/examples/tracing/TracingDemoService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/tracing/TracingDemoServiceController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

examples/src/main/java/io/dapr/examples/unittesting/DaprExampleTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

pom.xml

@@ -16,7 +16,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.33.1</grpc.version>
     <protobuf.version>3.13.0</protobuf.version>
-    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/4a6369caaba9cf46eae9bfa4fa6e76b474854c89/dapr/proto</dapr.proto.baseurl>
+    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/4899aa8fb8f7537fb10432e6cc0cfc09c572cb54/dapr/proto</dapr.proto.baseurl>
     <os-maven-plugin.version>1.6.2</os-maven-plugin.version>
     <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
     <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/AbstractActor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorCallType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorMethodContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorMethodInfoMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorObjectSerializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorReminderParams.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorRuntime.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 
@@ -18,9 +18,8 @@ import reactor.core.publisher.Mono;
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.util.Collections;
+import java.util.concurrent.ConcurrentHashMap;
-import java.util.HashMap;
+import java.util.concurrent.ConcurrentMap;
-import java.util.Map;
 
 /**
  * Contains methods to register actor types. Registering the types allows the
@@ -66,7 +65,7 @@ public class ActorRuntime implements Closeable {
   /**
    * Map of ActorType --> ActorManager.
    */
-  private final Map<String, ActorManager> actorManagers;
+  private final ConcurrentMap<String, ActorManager> actorManagers;
 
   /**
    * The default constructor. This should not be called directly.
@@ -100,7 +99,7 @@ public class ActorRuntime implements Closeable {
     }
 
     this.config = new ActorRuntimeConfig();
-    this.actorManagers = Collections.synchronizedMap(new HashMap<>());
+    this.actorManagers = new ConcurrentHashMap<>();
     this.daprClient = daprClient;
     this.channel = channel;
   }
@@ -138,7 +137,7 @@ public class ActorRuntime implements Closeable {
    * @throws IOException If cannot serialize config.
    */
   public byte[] serializeConfig() throws IOException {
-    return this.INTERNAL_SERIALIZER.serialize(this.config);
+    return INTERNAL_SERIALIZER.serialize(this.config);
   }
 
   /**
@@ -207,17 +206,18 @@ public class ActorRuntime implements Closeable {
 
     ActorTypeInformation<T> actorTypeInfo = ActorTypeInformation.create(clazz);
 
-    ActorRuntimeContext<T> context = new ActorRuntimeContext<>(
+    // Create ActorManager, if not yet registered.
-          this,
+    this.actorManagers.computeIfAbsent(actorTypeInfo.getName(), (k) -> {
-          objectSerializer,
+      ActorRuntimeContext<T> context = new ActorRuntimeContext<>(
-          actorFactory,
+              this,
-          actorTypeInfo,
+              objectSerializer,
-          this.daprClient,
+              actorFactory,
-          new DaprStateAsyncProvider(this.daprClient, stateSerializer));
+              actorTypeInfo,
-
+              this.daprClient,
-    // Create ActorManagers, override existing entry if registered again.
+              new DaprStateAsyncProvider(this.daprClient, stateSerializer));
-    this.actorManagers.put(actorTypeInfo.getName(), new ActorManager<T>(context));
+      this.config.addRegisteredActorType(actorTypeInfo.getName());
-    this.config.addRegisteredActorType(actorTypeInfo.getName());
+      return new ActorManager<T>(context);
+    });
   }
 
   /**
@@ -342,4 +342,4 @@ public class ActorRuntime implements Closeable {
       channel.shutdown();
     }
   }
-}
+}

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorRuntimeConfig.java

@@ -1,29 +1,30 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 
 package io.dapr.actors.runtime;
 
 import java.time.Duration;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Represents the configuration for the Actor Runtime.
  */
 public class ActorRuntimeConfig {
 
-  private Collection<String> registeredActorTypes = new ArrayList<>();
+  private List<String> registeredActorTypes = new CopyOnWriteArrayList<>();
 
-  private Duration actorIdleTimeout;
+  private volatile Duration actorIdleTimeout;
 
-  private Duration actorScanInterval;
+  private volatile Duration actorScanInterval;
 
-  private Duration drainOngoingCallTimeout;
+  private volatile Duration drainOngoingCallTimeout;
 
-  private Boolean drainBalancedActors;
+  private volatile Boolean drainBalancedActors;
 
   /**
    * Instantiates a new config for the Actor Runtime.

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorRuntimeContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorStateChange.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorStateChangeKind.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorStateManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorStateOperation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 
@@ -67,4 +67,4 @@ final class ActorStateOperation {
   public Object getValue() {
     return value;
   }
-}
+}

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorTimerParams.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 
@@ -87,4 +87,4 @@ final class ActorTimerParams {
     return this.data;
   }
 
-}
+}

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorTypeInformation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/ActorTypeUtilities.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/DaprClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/DaprGrpcClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/DaprHttpClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/DaprStateAsyncProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/DefaultActorFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/main/java/io/dapr/actors/runtime/Remindable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/ActorIdTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 package io.dapr.actors;

sdk-actors/src/test/java/io/dapr/actors/TestUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/client/ActorProxyBuilderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/client/ActorProxyImplForTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/client/ActorProxyImplTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/client/DaprClientStub.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/client/DaprGrpcClientTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/client/DaprHttpClientTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 package io.dapr.actors.client;
@@ -66,4 +66,4 @@ public class DaprHttpClientTest {
         () -> mono.block());
   }
 
-}
+}

sdk-actors/src/test/java/io/dapr/actors/runtime/ActorCustomSerializerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/ActorManagerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/ActorMethodInfoMapTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/ActorNoStateTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/ActorReminderParamsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/ActorRuntimeTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/ActorStatefulTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/ActorTimerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/ActorTypeInformationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/ActorTypeUtilitiesTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 package io.dapr.actors.runtime;

sdk-actors/src/test/java/io/dapr/actors/runtime/DaprGrpcClientTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/DaprHttpClientTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 package io.dapr.actors.runtime;
@@ -149,4 +149,4 @@ public class DaprHttpClientTest {
     Mono<Void> mono = DaprHttpClient.unregisterTimer("DemoActor", "1", "timer");
     assertNull(mono.block());
   }
-}
+}

sdk-actors/src/test/java/io/dapr/actors/runtime/DaprInMemoryStateProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/DaprStateAsyncProviderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/DefaultActorFactoryTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/DerivedActorTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/JavaSerializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/actors/runtime/ThrowFromPreAndPostActorMethodsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/java/io/dapr/client/DaprHttpProxy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation.
+ * Copyright (c) Microsoft Corporation and Dapr Contributors.
  * Licensed under the MIT License.
  */
 

sdk-actors/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

@@ -1 +1 @@
-mock-maker-inline
+mock-maker-inline