Merge branch 'master' into feature/jobs-api

Author: cicoyle

.github/scripts/create-release.sh

@@ -42,12 +42,12 @@ if [ "$VARIANT" = "SNAPSHOT" ]; then
   git checkout -b $branch_name
   ${script_dir}/update_sdk_version.sh $REL_VERSION
   git clean -xdf
-  git commit -s -m "Update master version to ${$REL_VERSION}" -a
+  git commit -s -m "Update master version to ${REL_VERSION}" -a
   git push origin $branch_name
   gh pr create --repo ${GITHUB_REPOSITORY} \
     --base master \
-    --title "Update master version to ${$REL_VERSION}" \
-    --body "Update master version to ${$REL_VERSION}"
+    --title "Update master version to ${REL_VERSION}" \
+    --body "Update master version to ${REL_VERSION}"
   echo "Done."
   exit 0
 elif [ "$VARIANT" = "rc" ]; then
@@ -84,38 +84,38 @@ fi
 echo "$RELEASE_BRANCH branch is ready."
 
 if [ `git rev-parse --verify $RELEASE_TAG 2>/dev/null` ]; then
-  echo "$RELEASE_TAG tag already exists, aborting ..."
-  exit 2
-fi
-
-${script_dir}/update_sdk_version.sh $REL_VERSION
-git commit -s -m "Release $REL_VERSION" -a
-if [ "$VARIANT" = "" ]; then
-  echo "Generating docs ..."
-  ${script_dir}/update_docs.sh $REL_VERSION
-  git commit -s -m "Generate updated javadocs for $REL_VERSION" -a
-fi
-git push origin $RELEASE_BRANCH
+  echo "$RELEASE_TAG tag already exists, checking it out ..."
+  git checkout $RELEASE_TAG
+else
+  ${script_dir}/update_sdk_version.sh $REL_VERSION
+  git commit -s -m "Release $REL_VERSION" -a
+  if [ "$VARIANT" = "" ]; then
+    echo "Generating docs ..."
+    ${script_dir}/update_docs.sh $REL_VERSION
+    git commit -s -m "Generate updated javadocs for $REL_VERSION" -a
+  fi
+  git push origin $RELEASE_BRANCH
 
-echo "Tagging $RELEASE_TAG ..."
-git tag $RELEASE_TAG
-echo "$RELEASE_TAG is tagged."
+  echo "Tagging $RELEASE_TAG ..."
+  git tag $RELEASE_TAG
+  echo "$RELEASE_TAG is tagged."
 
-echo "Pushing $RELEASE_TAG tag ..."
-git push origin $RELEASE_TAG
-echo "$RELEASE_TAG tag is pushed."
+  echo "Pushing $RELEASE_TAG tag ..."
+  git push origin $RELEASE_TAG
+  echo "$RELEASE_TAG tag is pushed."
+fi
 
 if [ "$VARIANT" = "" ]; then
   git clean -xdf
   echo "Creating pull request to update docs ..."
   branch_name="automation/update_docs_${current_time}"
   git reset --hard origin/master
-  git cherry-pick $RELEASE_TAG
+  git cherry-pick --strategy=recursive -X theirs $RELEASE_TAG
   git push origin $branch_name
   gh pr create --repo ${GITHUB_REPOSITORY} \
     --base master \
-    --title "Update master docs for ${$REL_VERSION} release" \
-    --body "Update master docs for ${$REL_VERSION} release"
+    --title "Update master docs for ${REL_VERSION} release" \
+    --body "Update master docs for ${REL_VERSION} release"
 fi
 
 echo "Done."

.github/scripts/update_docs.sh

@@ -27,5 +27,5 @@ rm -f daprdocs/content/en/java-sdk-docs/_index.mdbak || echo
 rm -f daprdocs/content/en/java-sdk-docs/spring-boot/_index.md/_index.mdbak || echo
 
 rm -rf docs
-./mvnw -Dmaven.test.skip=false -Djacoco.skip=true clean install
-./mvnw site-deploy
+./mvnw -Dmaven.test.skip=true -Djacoco.skip=true clean install
+./mvnw -Dmaven.test.skip=true -Djacoco.skip=true site-deploy

.github/workflows/create-release.yml

@@ -25,11 +25,18 @@ jobs:
   create-release:
     name: Creates release branch and tag
     runs-on: ubuntu-latest
+    env:
+      JDK_VER: '17'
     steps:
       - name: Check out code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Set up OpenJDK ${{ env.JDK_VER }}
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: ${{ env.JDK_VER }}
       - name: Install required packages
         run: |
           sudo apt-get update
@@ -50,8 +57,15 @@ jobs:
     runs-on: ubuntu-latest
     needs: create-release
     steps:
-      - name: Triggers the build
+      - name: Identify build ref to trigger build and release.
+        run: |
+          if [[ "${{ inputs.rel_version }}" == *"SNAPSHOT"* ]]; then
+            echo "BUILD_GIT_REF=master" >> $GITHUB_ENV
+          else
+            echo "BUILD_GIT_REF=v${{ inputs.rel_version }}" >> $GITHUB_ENV
+          fi
+      - name: Triggers the build and release.
         env:
           GITHUB_TOKEN: ${{ secrets.DAPR_BOT_TOKEN }}
         run: |
-          gh workflow run build.yml --repo ${GITHUB_REPOSITORY} --ref v$(echo '${{ inputs.rel_version }}' | sed -r 's/^[vV]?([0-9].+)$/\1/')
+          gh workflow run build.yml --repo ${GITHUB_REPOSITORY} --ref v$(echo '${{ env.BUILD_GIT_REF }}' | sed -r 's/^[vV]?([0-9].+)$/\1/')

README.md

@@ -49,19 +49,19 @@ For a Maven project, add the following to your `pom.xml` file:
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk</artifactId>
-      <version>1.12.0</version>
+      <version>1.13.1</version>
     </dependency>
     <!-- Dapr's SDK for Actors (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-actors</artifactId>
-      <version>1.12.0</version>
+      <version>1.13.1</version>
     </dependency>
     <!-- Dapr's SDK integration with SpringBoot (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-springboot</artifactId>
-      <version>1.12.0</version>
+      <version>1.13.1</version>
     </dependency>
     ...
   </dependencies>
@@ -75,11 +75,11 @@ For a Gradle project, add the following to your `build.gradle` file:
 dependencies {
 ...
     // Dapr's core SDK with all features, except Actors.
-    compile('io.dapr:dapr-sdk:1.12.0')
+    compile('io.dapr:dapr-sdk:1.13.1')
     // Dapr's SDK for Actors (optional).
-    compile('io.dapr:dapr-sdk-actors:1.12.0')
+    compile('io.dapr:dapr-sdk-actors:1.13.1')
     // Dapr's SDK integration with SpringBoot (optional).
-    compile('io.dapr:dapr-sdk-springboot:1.12.0')
+    compile('io.dapr:dapr-sdk-springboot:1.13.1')
 }
 ```
 

dapr-spring/dapr-spring-boot-autoconfigure/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-spring-boot-autoconfigure</artifactId>
@@ -27,6 +27,12 @@
       <version>${project.parent.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>io.dapr.spring</groupId>
+      <artifactId>dapr-spring-workflows</artifactId>
+      <version>${project.parent.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>

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

@@ -16,12 +16,17 @@
 import io.dapr.client.DaprClient;
 import io.dapr.client.DaprClientBuilder;
 import io.dapr.config.Properties;
+import io.dapr.workflows.client.DaprWorkflowClient;
+import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @AutoConfiguration
 @ConditionalOnClass(DaprClient.class)
 @EnableConfigurationProperties(DaprClientProperties.class)
@@ -58,4 +63,29 @@ DaprClient daprClient(DaprClientBuilder daprClientBuilder) {
     return daprClientBuilder.build();
   }
 
+  @Bean
+  @ConditionalOnMissingBean
+  DaprWorkflowClient daprWorkflowClient(DaprConnectionDetails daprConnectionDetails) {
+    Properties properties = createPropertiesFromConnectionDetails(daprConnectionDetails);
+    return new DaprWorkflowClient(properties);
+  }
+
+  @Bean
+  @ConditionalOnMissingBean
+  WorkflowRuntimeBuilder daprWorkflowRuntimeBuilder(DaprConnectionDetails daprConnectionDetails) {
+    Properties properties = createPropertiesFromConnectionDetails(daprConnectionDetails);
+    return new WorkflowRuntimeBuilder(properties);
+  }
+
+  private Properties createPropertiesFromConnectionDetails(DaprConnectionDetails daprConnectionDetails) {
+    final Map<String, String> propertyOverrides = new HashMap<>();
+    propertyOverrides.put(Properties.HTTP_ENDPOINT.getName(), daprConnectionDetails.httpEndpoint());
+    propertyOverrides.put(Properties.HTTP_PORT.getName(), String.valueOf(daprConnectionDetails.httpPort()));
+    propertyOverrides.put(Properties.GRPC_ENDPOINT.getName(), daprConnectionDetails.grpcEndpoint());
+    propertyOverrides.put(Properties.GRPC_PORT.getName(), String.valueOf(daprConnectionDetails.grpcPort()));
+    return new Properties(propertyOverrides);
+  }
+
+
+
 }

dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprWorkflowsRegistrationTests.java

@@ -0,0 +1,44 @@
+package io.dapr.spring.boot.autoconfigure.client;
+
+import io.dapr.spring.boot.autoconfigure.client.workflows.TestActivity;
+import io.dapr.spring.boot.autoconfigure.client.workflows.TestWorkflow;
+import io.dapr.workflows.client.DaprWorkflowClient;
+import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@SpringBootTest(classes = {WorkflowTestApplication.class, DaprClientAutoConfiguration.class, TestActivity.class, TestWorkflow.class})
+public class DaprWorkflowsRegistrationTests {
+
+  @Autowired
+  private DaprWorkflowClient daprWorkflowClient;
+
+  @Autowired
+  private WorkflowRuntimeBuilder workflowRuntimeBuilder;
+
+  @Autowired
+  private TestActivity testActivity;
+
+  @Autowired
+  private TestWorkflow testWorkflow;
+
+  @Test
+  public void testWorkflowInjection(){
+
+    //I cannot test here if the client works, as it needs the runtime
+    assertNotNull(daprWorkflowClient);
+
+    //@TODO: there is no way to assert the runtime and its registered workflows and activities
+    assertNotNull(workflowRuntimeBuilder);
+
+    //Check that both Activities and Workflows are managed beans
+    assertNotNull(testActivity);
+    assertNotNull(testWorkflow);
+    assertNotNull(testActivity.getRestTemplate());
+    assertNotNull(testWorkflow.getRestTemplate());
+
+  }
+}

dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/WorkflowTestApplication.java

@@ -0,0 +1,24 @@
+package io.dapr.spring.boot.autoconfigure.client;
+
+import io.dapr.spring.workflows.config.EnableDaprWorkflows;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@SpringBootApplication
+@EnableDaprWorkflows
+public class WorkflowTestApplication {
+  public static void main(String[] args) {
+    SpringApplication.run(WorkflowTestApplication.class, args);
+  }
+
+  @Configuration
+  static class Config {
+    @Bean
+    RestTemplate restTemplate(){
+      return new RestTemplate();
+    }
+  }
+}

dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/workflows/TestActivity.java

@@ -0,0 +1,21 @@
+package io.dapr.spring.boot.autoconfigure.client.workflows;
+
+import io.dapr.workflows.WorkflowActivity;
+import io.dapr.workflows.WorkflowActivityContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.client.RestTemplate;
+
+public class TestActivity implements WorkflowActivity {
+
+  @Autowired
+  private RestTemplate restTemplate;
+
+  @Override
+  public Object run(WorkflowActivityContext ctx) {
+    return "OK";
+  }
+
+  public RestTemplate getRestTemplate() {
+    return restTemplate;
+  }
+}

dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/workflows/TestWorkflow.java

@@ -0,0 +1,23 @@
+package io.dapr.spring.boot.autoconfigure.client.workflows;
+
+import io.dapr.workflows.Workflow;
+import io.dapr.workflows.WorkflowStub;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.client.RestTemplate;
+
+public class TestWorkflow implements Workflow {
+
+  @Autowired
+  private RestTemplate restTemplate;
+
+  @Override
+  public WorkflowStub create() {
+    return ctx -> {
+      ctx.callActivity(TestActivity.class.getName(), null).await();
+    };
+  }
+
+  public RestTemplate getRestTemplate() {
+    return restTemplate;
+  }
+}

dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.dapr.spring</groupId>
         <artifactId>dapr-spring-parent</artifactId>
-        <version>0.13.0-SNAPSHOT</version>
+        <version>0.14.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -40,6 +40,11 @@
       <artifactId>dapr-spring-messaging</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.dapr.spring</groupId>
+      <artifactId>dapr-spring-workflows</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
   </dependencies>
 
 </project>

dapr-spring/dapr-spring-boot-tests/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-spring-boot-tests</artifactId>

dapr-spring/dapr-spring-data/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-spring-data</artifactId>