Skip to content

Commit cd68261

Browse files
authored
0.27.0 release merge from develop (#27)
1 parent 76713f2 commit cd68261

24 files changed

+92
-53
lines changed

build.gradle

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
// Run 'gradle checkUpdates' to find out which dependencies have newer versions
2+
13
plugins {
24
id 'net.minecrell.licenser' version '0.4.1'
3-
id 'com.github.sherter.google-java-format' version '0.8'
4-
id "net.ltgt.errorprone" version "0.6"
5+
id 'com.github.sherter.google-java-format' version '0.9'
6+
id "net.ltgt.errorprone" version "1.2.1"
7+
id 'name.remal.check-updates' version '1.0.201'
58
}
69

710
apply plugin: 'java'
@@ -27,16 +30,16 @@ repositories {
2730
}
2831

2932
dependencies {
30-
implementation group: 'io.temporal', name: 'temporal-sdk', version: '0.26.0'
31-
implementation group: 'commons-configuration', name: 'commons-configuration', version: '1.9'
32-
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
33+
implementation group: 'io.temporal', name: 'temporal-sdk', version: '0.27.0'
34+
implementation group: 'commons-configuration', name: 'commons-configuration', version: '1.10'
35+
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
3336

34-
testImplementation group: 'junit', name: 'junit', version: '4.12'
37+
testImplementation group: 'junit', name: 'junit', version: '4.13'
3538
testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
36-
testImplementation group: 'org.powermock', name: 'powermock-api-mockito', version: '1.7.3'
39+
testImplementation group: 'org.powermock', name: 'powermock-api-mockito', version: '1.7.4'
3740

3841
errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
39-
errorprone("com.google.errorprone:error_prone_core:2.3.1")
42+
errorprone("com.google.errorprone:error_prone_core:2.4.0")
4043
}
4144

4245
compileJava {
@@ -51,3 +54,28 @@ task execute(type: JavaExec) {
5154
license {
5255
header rootProject.file('license-header.txt')
5356
}
57+
58+
task runHello {
59+
doLast {
60+
// Cron and Periodic are not in the list as they take long time to stop
61+
["io.temporal.samples.hello.HelloActivity",
62+
"io.temporal.samples.hello.HelloActivityRetry",
63+
"io.temporal.samples.hello.HelloAsync",
64+
"io.temporal.samples.hello.HelloAsyncActivityCompletion",
65+
"io.temporal.samples.hello.HelloAsyncLambda",
66+
"io.temporal.samples.hello.HelloChild",
67+
"io.temporal.samples.hello.HelloException",
68+
"io.temporal.samples.hello.HelloPolymorphicActivity",
69+
"io.temporal.samples.hello.HelloQuery",
70+
"io.temporal.samples.hello.HelloSaga",
71+
"io.temporal.samples.hello.HelloSearchAttributes",
72+
"io.temporal.samples.hello.HelloSignal"
73+
].each { mainClass ->
74+
println mainClass
75+
javaexec {
76+
classpath = sourceSets.main.runtimeClasspath
77+
main = mainClass
78+
}
79+
}
80+
}
81+
}

gradle/wrapper/gradle-wrapper.jar

-8 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew.bat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
2929
set APP_BASE_NAME=%~n0
3030
set APP_HOME=%DIRNAME%
3131

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
3235
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
3336
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
3437

src/main/java/io/temporal/samples/bookingsaga/TripBookingActivities.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,50 @@
2525
public interface TripBookingActivities {
2626

2727
/**
28+
* Request a car rental reservation.
29+
*
2830
* @param name customer name
2931
* @return reservationID
3032
*/
3133
String reserveCar(String name);
3234

3335
/**
36+
* Request a flight reservation.
37+
*
3438
* @param name customer name
3539
* @return reservationID
3640
*/
3741
String bookFlight(String name);
3842

3943
/**
44+
* Request a hotel reservation.
45+
*
4046
* @param name customer name
4147
* @return reservationID
4248
*/
4349
String bookHotel(String name);
4450

4551
/**
52+
* Cancel a flight reservation.
53+
*
4654
* @param name customer name
4755
* @param reservationID id returned by bookFlight
4856
* @return cancellationConfirmationID
4957
*/
5058
String cancelFlight(String reservationID, String name);
5159

5260
/**
61+
* Cancel a hotel reservation.
62+
*
5363
* @param name customer name
5464
* @param reservationID id returned by bookHotel
5565
* @return cancellationConfirmationID
5666
*/
5767
String cancelHotel(String reservationID, String name);
5868

5969
/**
70+
* Cancel a car rental reservation.
71+
*
6072
* @param name customer name
6173
* @param reservationID id returned by reserveCar
6274
* @return cancellationConfirmationID

src/main/java/io/temporal/samples/common/QueryWorkflowExecution.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
package io.temporal.samples.common;
2121

22+
import io.temporal.api.common.v1.WorkflowExecution;
2223
import io.temporal.client.WorkflowClient;
2324
import io.temporal.client.WorkflowStub;
24-
import io.temporal.common.v1.WorkflowExecution;
2525
import io.temporal.serviceclient.WorkflowServiceStubs;
2626
import java.util.Optional;
2727

@@ -33,7 +33,7 @@
3333
*/
3434
public class QueryWorkflowExecution {
3535

36-
public static void main(String[] args) throws Exception {
36+
public static void main(String[] args) {
3737
if (args.length < 2 || args.length > 3) {
3838
System.err.println(
3939
"Usage: java "

src/main/java/io/temporal/samples/hello/HelloActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public class HelloActivity {
4343
/** Workflow interface has to have at least one method annotated with @WorkflowMethod. */
4444
@WorkflowInterface
4545
public interface GreetingWorkflow {
46-
/** @return greeting string */
4746
@WorkflowMethod
4847
String getGreeting(String name);
4948
}

src/main/java/io/temporal/samples/hello/HelloActivityRetry.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public class HelloActivityRetry {
4343

4444
@WorkflowInterface
4545
public interface GreetingWorkflow {
46-
/** @return greeting string */
4746
@WorkflowMethod
4847
String getGreeting(String name);
4948
}

src/main/java/io/temporal/samples/hello/HelloAsyncActivityCompletion.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public class HelloAsyncActivityCompletion {
4747

4848
@WorkflowInterface
4949
public interface GreetingWorkflow {
50-
/** @return greeting string */
5150
@WorkflowMethod
5251
String getGreeting(String name);
5352
}

src/main/java/io/temporal/samples/hello/HelloAsyncLambda.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public class HelloAsyncLambda {
4343

4444
@WorkflowInterface
4545
public interface GreetingWorkflow {
46-
/** @return greeting string */
4746
@WorkflowMethod
4847
String getGreeting(String name);
4948
}

0 commit comments

Comments
 (0)