Fix release 1.13.0-rc-1 (#1152)

artursouza · web-flow · commit 7798360cd823 · 2024-10-23T09:58:48.000-07:00
diff --git a/.github/scripts/update_docs.sh b/.github/scripts/update_docs.sh
@@ -4,20 +4,28 @@ set -uex
 
 DAPR_JAVA_SDK_VERSION=$1
 
+# Alpha artifacts of the sdk tracks the regular SDK minor and patch versions, just not the major.
+# Replaces the SDK major version to 0 for alpha artifacts.
+DAPR_JAVA_SDK_ALPHA_VERSION=`echo $DAPR_JAVA_SDK_VERSION | sed 's/^[0-9]*\./0./'`
+
 if [[ "$OSTYPE" == "darwin"* ]]; then
   sed -i bak "s/<version>.*<\/version>\$/<version>${DAPR_JAVA_SDK_VERSION}<\/version>/g" README.md
   sed -i bak "s/compile('io.dapr:\(.*\):.*')/compile('io.dapr:\\1:${DAPR_JAVA_SDK_VERSION}')/g" README.md
   sed -i bak "s/<version>.*<\/version>\$/<version>${DAPR_JAVA_SDK_VERSION}<\/version>/g" daprdocs/content/en/java-sdk-docs/_index.md
   sed -i bak "s/compile('io.dapr:\(.*\):.*')/compile('io.dapr:\\1:${DAPR_JAVA_SDK_VERSION}')/g" daprdocs/content/en/java-sdk-docs/_index.md
+  sed -i bak "s/<version>.*<\/version>\$/<version>${DAPR_JAVA_SDK_ALPHA_VERSION}<\/version>/g" daprdocs/content/en/java-sdk-docs/spring-boot/_index.md
   rm README.mdbak
 else
   sed -i "s/<version>.*<\/version>\$/<version>${DAPR_JAVA_SDK_VERSION}<\/version>/g" README.md
   sed -i "s/compile('io.dapr:\(.*\):.*')/compile('io.dapr:\\1:${DAPR_JAVA_SDK_VERSION}')/g" README.md
   sed -i "s/<version>.*<\/version>\$/<version>${DAPR_JAVA_SDK_VERSION}<\/version>/g" daprdocs/content/en/java-sdk-docs/_index.md
   sed -i "s/compile('io.dapr:\(.*\):.*')/compile('io.dapr:\\1:${DAPR_JAVA_SDK_VERSION}')/g" daprdocs/content/en/java-sdk-docs/_index.md
+  sed -i "s/<version>.*<\/version>\$/<version>${DAPR_JAVA_SDK_ALPHA_VERSION}<\/version>/g" daprdocs/content/en/java-sdk-docs/spring-boot/_index.md
 fi
 
-rm -rf docs
-mvn -Dmaven.test.skip=false -Djacoco.skip=true clean install
-mvn site-deploy
 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
diff --git a/.github/scripts/update_sdk_version.sh b/.github/scripts/update_sdk_version.sh
@@ -10,6 +10,7 @@ DAPR_JAVA_SDK_ALPHA_VERSION=`echo $DAPR_JAVA_SDK_VERSION | sed 's/^[0-9]*\./0./'
 
 mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_VERSION
 mvn versions:set-property -Dproperty=dapr.sdk.alpha.version -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION
+mvn versions:set-property -Dproperty=dapr.sdk.version -DnewVersion=$DAPR_JAVA_SDK_VERSION
 mvn versions:set-property -Dproperty=dapr.sdk.version -DnewVersion=$DAPR_JAVA_SDK_VERSION -f sdk-tests/pom.xml
 mvn versions:set-property -Dproperty=dapr.sdk.alpha.version -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f sdk-tests/pom.xml
 
@@ -23,4 +24,7 @@ mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f sdk-workflows/pom.
 # testcontainers-dapr
 mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f testcontainers-dapr/pom.xml
 
+# dapr-spring
+mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f dapr-spring/pom.xml
+
 git clean -f
diff --git a/.github/workflows/validate-docs.yml b/.github/workflows/validate-docs.yml
@@ -0,0 +1,34 @@
+name: Validate Javadocs Generation
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+      - release-*
+    tags:
+      - v*
+
+  pull_request:
+    branches:
+    - master
+    - release-*
+
+jobs:
+  build:
+    name: "Validate Javadocs generation"
+    runs-on: linux-arm64-latest-4-cores
+    timeout-minutes: 30
+    env:
+      JDK_VER: 17
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up OpenJDK ${{ env.JDK_VER }}
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: ${{ env.JDK_VER }}
+    - name: Install jars
+      run: ./mvnw install -q -B -DskipTests
+    - name: Validate Java docs generation
+      run: ./mvnw site-deploy
diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/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.13.0-rc-1</version>
   </parent>
 
   <artifactId>dapr-spring-boot-autoconfigure</artifactId>
diff --git a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml b/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.13.0-rc-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml b/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.13.0-rc-1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/dapr-spring/dapr-spring-boot-tests/pom.xml b/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.13.0-rc-1</version>
   </parent>
 
   <artifactId>dapr-spring-boot-tests</artifactId>
diff --git a/dapr-spring/dapr-spring-data/pom.xml b/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.13.0-rc-1</version>
   </parent>
 
   <artifactId>dapr-spring-data</artifactId>
diff --git a/dapr-spring/dapr-spring-data/src/main/java/io/dapr/spring/data/PostgreSQLDaprKeyValueAdapter.java b/dapr-spring/dapr-spring-data/src/main/java/io/dapr/spring/data/PostgreSQLDaprKeyValueAdapter.java
@@ -152,7 +152,8 @@ private String createSql(String sqlPattern, String keyspace) {
   private String createSql(String sqlPattern, String keyspace, Object criteria) {
     String keyspaceFilter = getKeyspaceFilter(keyspace);
 
-    if (criteria instanceof DaprPredicate daprPredicate) {
+    if (criteria instanceof DaprPredicate) {
+      var daprPredicate = (DaprPredicate) criteria;
       String path = daprPredicate.getPath().toString();
       String pathWithOutType = String.format("'%s'", path.substring(path.indexOf(".") + 1));
       String value = String.format("'%s'", daprPredicate.getValue().toString());
diff --git a/dapr-spring/dapr-spring-data/src/main/java/io/dapr/spring/data/repository/query/DaprPredicateBuilder.java b/dapr-spring/dapr-spring-data/src/main/java/io/dapr/spring/data/repository/query/DaprPredicateBuilder.java
@@ -46,7 +46,9 @@ public Predicate<Object> isFalse() {
   public Predicate<Object> isEqualTo(Object value) {
     return new DaprPredicate(part.getProperty(), value, o -> {
       if (!ObjectUtils.nullSafeEquals(Part.IgnoreCaseType.NEVER, part.shouldIgnoreCase())) {
-        if (o instanceof String s1 && value instanceof String s2) {
+        if ((o instanceof String) && (value instanceof String)) {
+          var s1 = (String)o;
+          var s2 = (String)value;
           return s1.equalsIgnoreCase(s2);
         }
       }
@@ -85,7 +87,8 @@ public Predicate<Object> matches(Object value) {
         return ObjectUtils.nullSafeEquals(o, value);
       }
 
-      if (value instanceof Pattern pattern) {
+      if (value instanceof Pattern) {
+        var pattern = (Pattern)value;
         return pattern.matcher(o.toString()).find();
       }
 
@@ -95,8 +98,10 @@ public Predicate<Object> matches(Object value) {
 
   public Predicate<Object> in(Object value) {
     return new DaprPredicate(part.getProperty(), value, o -> {
-      if (value instanceof Collection<?> collection) {
-        if (o instanceof Collection<?> subSet) {
+      if (value instanceof Collection<?>) {
+        var collection = (Collection<?>)value;
+        if (o instanceof Collection<?>) {
+          var subSet = (Collection<?>)o;
           return collection.containsAll(subSet);
         }
 
@@ -117,15 +122,17 @@ public Predicate<Object> contains(Object value) {
         return false;
       }
 
-      if (o instanceof Collection<?> collection) {
+      if (o instanceof Collection<?>) {
+        var collection = (Collection<?>)o;
         return collection.contains(value);
       }
 
       if (ObjectUtils.isArray(o)) {
         return ObjectUtils.containsElement(ObjectUtils.toObjectArray(o), value);
       }
 
-      if (o instanceof Map<?, ?> map) {
+      if (o instanceof Map<?, ?>) {
+        var map = (Map<?, ?>)o;
         return map.containsValue(value);
       }
 
@@ -145,9 +152,10 @@ public Predicate<Object> contains(Object value) {
 
   public Predicate<Object> startsWith(Object value) {
     return new DaprPredicate(part.getProperty(), value, o -> {
-      if (!(o instanceof String s)) {
+      if (!(o instanceof String)) {
         return false;
       }
+      var s = (String)o;
 
       if (ObjectUtils.nullSafeEquals(Part.IgnoreCaseType.NEVER, part.shouldIgnoreCase())) {
         return s.startsWith(value.toString());
@@ -159,10 +167,11 @@ public Predicate<Object> startsWith(Object value) {
 
   public Predicate<Object> endsWith(Object value) {
     return new DaprPredicate(part.getProperty(), value, o -> {
-      if (!(o instanceof String s)) {
+      if (!(o instanceof String)) {
         return false;
       }
 
+      var s = (String)o;
       if (ObjectUtils.nullSafeEquals(Part.IgnoreCaseType.NEVER, part.shouldIgnoreCase())) {
         return s.endsWith(value.toString());
       }
diff --git a/dapr-spring/dapr-spring-messaging/pom.xml b/dapr-spring/dapr-spring-messaging/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.13.0-rc-1</version>
   </parent>
 
   <artifactId>dapr-spring-messaging</artifactId>
diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml
@@ -13,7 +13,7 @@
   <groupId>io.dapr.spring</groupId>
   <artifactId>dapr-spring-parent</artifactId>
   <packaging>pom</packaging>
-  <version>0.13.0-SNAPSHOT</version>
+  <version>0.13.0-rc-1</version>
   <name>dapr-spring-parent</name>
   <description>SDK extension for Spring and Spring Boot</description>
 
@@ -28,9 +28,9 @@
 
   <properties>
     <springboot.version>3.2.6</springboot.version>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
-    <maven.compiler.release>17</maven.compiler.release>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.release>11</maven.compiler.release>
   </properties>
 
   <dependencyManagement>
@@ -108,7 +108,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.7.0</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <id>attach-javadocs</id>
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
     <protobuf.version>3.25.0</protobuf.version>
     <protocCommand>protoc</protocCommand>
     <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.14.4/dapr/proto</dapr.proto.baseurl>
-    <dapr.sdk.version>1.13.0-SNAPSHOT</dapr.sdk.version>
+    <dapr.sdk.version>1.13.0-rc-1</dapr.sdk.version>
     <dapr.sdk.alpha.version>0.13.0-rc-1</dapr.sdk.alpha.version>
     <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
     <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,9 @@ public Predicate<Object> isFalse() {`
`46`	`46`	`public Predicate<Object> isEqualTo(Object value) {`
`47`	`47`	`return new DaprPredicate(part.getProperty(), value, o -> {`
`48`	`48`	`if (!ObjectUtils.nullSafeEquals(Part.IgnoreCaseType.NEVER, part.shouldIgnoreCase())) {`
`49`		`- if (o instanceof String s1 && value instanceof String s2) {`
	`49`	`+ if ((o instanceof String) && (value instanceof String)) {`
	`50`	`+ var s1 = (String)o;`
	`51`	`+ var s2 = (String)value;`
`50`	`52`	`return s1.equalsIgnoreCase(s2);`
`51`	`53`	`}`
`52`	`54`	`}`
`@@ -85,7 +87,8 @@ public Predicate<Object> matches(Object value) {`
`85`	`87`	`return ObjectUtils.nullSafeEquals(o, value);`
`86`	`88`	`}`
`87`	`89`
`88`		`- if (value instanceof Pattern pattern) {`
	`90`	`+ if (value instanceof Pattern) {`
	`91`	`+ var pattern = (Pattern)value;`
`89`	`92`	`return pattern.matcher(o.toString()).find();`
`90`	`93`	`}`
`91`	`94`
`@@ -95,8 +98,10 @@ public Predicate<Object> matches(Object value) {`
`95`	`98`
`96`	`99`	`public Predicate<Object> in(Object value) {`
`97`	`100`	`return new DaprPredicate(part.getProperty(), value, o -> {`
`98`		`- if (value instanceof Collection<?> collection) {`
`99`		`- if (o instanceof Collection<?> subSet) {`
	`101`	`+ if (value instanceof Collection<?>) {`
	`102`	`+ var collection = (Collection<?>)value;`
	`103`	`+ if (o instanceof Collection<?>) {`
	`104`	`+ var subSet = (Collection<?>)o;`
`100`	`105`	`return collection.containsAll(subSet);`
`101`	`106`	`}`
`102`	`107`
`@@ -117,15 +122,17 @@ public Predicate<Object> contains(Object value) {`
`117`	`122`	`return false;`
`118`	`123`	`}`
`119`	`124`
`120`		`- if (o instanceof Collection<?> collection) {`
	`125`	`+ if (o instanceof Collection<?>) {`
	`126`	`+ var collection = (Collection<?>)o;`
`121`	`127`	`return collection.contains(value);`
`122`	`128`	`}`
`123`	`129`
`124`	`130`	`if (ObjectUtils.isArray(o)) {`
`125`	`131`	`return ObjectUtils.containsElement(ObjectUtils.toObjectArray(o), value);`
`126`	`132`	`}`
`127`	`133`
`128`		`- if (o instanceof Map<?, ?> map) {`
	`134`	`+ if (o instanceof Map<?, ?>) {`
	`135`	`+ var map = (Map<?, ?>)o;`
`129`	`136`	`return map.containsValue(value);`
`130`	`137`	`}`
`131`	`138`
`@@ -145,9 +152,10 @@ public Predicate<Object> contains(Object value) {`
`145`	`152`
`146`	`153`	`public Predicate<Object> startsWith(Object value) {`
`147`	`154`	`return new DaprPredicate(part.getProperty(), value, o -> {`
`148`		`- if (!(o instanceof String s)) {`
	`155`	`+ if (!(o instanceof String)) {`
`149`	`156`	`return false;`
`150`	`157`	`}`
	`158`	`+ var s = (String)o;`
`151`	`159`
`152`	`160`	`if (ObjectUtils.nullSafeEquals(Part.IgnoreCaseType.NEVER, part.shouldIgnoreCase())) {`
`153`	`161`	`return s.startsWith(value.toString());`
`@@ -159,10 +167,11 @@ public Predicate<Object> startsWith(Object value) {`
`159`	`167`
`160`	`168`	`public Predicate<Object> endsWith(Object value) {`
`161`	`169`	`return new DaprPredicate(part.getProperty(), value, o -> {`
`162`		`- if (!(o instanceof String s)) {`
	`170`	`+ if (!(o instanceof String)) {`
`163`	`171`	`return false;`
`164`	`172`	`}`
`165`	`173`
	`174`	`+ var s = (String)o;`
`166`	`175`	`if (ObjectUtils.nullSafeEquals(Part.IgnoreCaseType.NEVER, part.shouldIgnoreCase())) {`
`167`	`176`	`return s.endsWith(value.toString());`
`168`	`177`	`}`