Updated to reflect SDK changes (#6)

* Fixes due to proto changes

* Updated to the latest version of Java library

Author: mfateev

build.gradle

@@ -15,7 +15,7 @@ googleJavaFormat {
 }
 
 group = 'com.uber'
-version = '0.10.0-SNAPSHOT'
+version = '0.20.0-SNAPSHOT'
 
 description = "Temporal Java SDK Samples"
 
@@ -36,7 +36,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'io.temporal', name: 'temporal-sdk', version: '0.10.0-SNAPSHOT'
+    compile group: 'io.temporal', name: 'temporal-sdk', version: '0.20.0-SNAPSHOT'
 
     compile group: 'commons-configuration', name: 'commons-configuration', version: '1.9'
     compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'

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

@@ -19,6 +19,9 @@
 
 package io.temporal.samples.bookingsaga;
 
+import io.temporal.activity.ActivityInterface;
+
+@ActivityInterface
 public interface TripBookingActivities {
 
   /**

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

@@ -21,8 +21,10 @@
 
 import static io.temporal.samples.bookingsaga.TripBookingSaga.TASK_LIST;
 
+import io.temporal.workflow.WorkflowInterface;
 import io.temporal.workflow.WorkflowMethod;
 
+@WorkflowInterface
 public interface TripBookingWorkflow {
 
   @WorkflowMethod(executionStartToCloseTimeoutSeconds = 3600, taskList = TASK_LIST)

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

@@ -21,7 +21,7 @@
 
 import io.temporal.client.WorkflowClient;
 import io.temporal.client.WorkflowStub;
-import io.temporal.proto.common.WorkflowExecution;
+import io.temporal.proto.execution.WorkflowExecution;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import java.util.Optional;
 

src/main/java/io/temporal/samples/fileprocessing/FileProcessingWorkflow.java

@@ -19,10 +19,12 @@
 
 package io.temporal.samples.fileprocessing;
 
+import io.temporal.workflow.WorkflowInterface;
 import io.temporal.workflow.WorkflowMethod;
 import java.net.URL;
 
 /** Contract for file processing workflow. */
+@WorkflowInterface
 public interface FileProcessingWorkflow {
 
   @WorkflowMethod(

src/main/java/io/temporal/samples/fileprocessing/StoreActivities.java

@@ -19,8 +19,10 @@
 
 package io.temporal.samples.fileprocessing;
 
+import io.temporal.activity.ActivityInterface;
 import java.net.URL;
 
+@ActivityInterface
 public interface StoreActivities {
 
   final class TaskListFileNamePair {

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

@@ -19,13 +19,17 @@
 
 package io.temporal.samples.hello;
 
+import io.temporal.activity.ActivityInterface;
 import io.temporal.activity.ActivityMethod;
+import io.temporal.activity.ActivityOptions;
 import io.temporal.client.WorkflowClient;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.worker.Worker;
 import io.temporal.worker.WorkerFactory;
 import io.temporal.workflow.Workflow;
+import io.temporal.workflow.WorkflowInterface;
 import io.temporal.workflow.WorkflowMethod;
+import java.time.Duration;
 
 /**
  * Hello World Temporal workflow that executes a single activity. Requires a local instance the
@@ -36,15 +40,17 @@ public class HelloActivity {
   static final String TASK_LIST = "HelloActivity";
 
   /** Workflow interface has to have at least one method annotated with @WorkflowMethod. */
+  @WorkflowInterface
   public interface GreetingWorkflow {
     /** @return greeting string */
     @WorkflowMethod(executionStartToCloseTimeoutSeconds = 10, taskList = TASK_LIST)
     String getGreeting(String name);
   }
 
   /** Activity interface is just a POJI. */
+  @ActivityInterface
   public interface GreetingActivities {
-    @ActivityMethod(scheduleToCloseTimeoutSeconds = 2)
+    @ActivityMethod
     String composeGreeting(String greeting, String name);
   }
 
@@ -57,7 +63,9 @@ public static class GreetingWorkflowImpl implements GreetingWorkflow {
      * activity invocations.
      */
     private final GreetingActivities activities =
-        Workflow.newActivityStub(GreetingActivities.class);
+        Workflow.newActivityStub(
+            GreetingActivities.class,
+            ActivityOptions.newBuilder().setScheduleToCloseTimeout(Duration.ofSeconds(2)).build());
 
     @Override
     public String getGreeting(String name) {

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

@@ -19,6 +19,7 @@
 
 package io.temporal.samples.hello;
 
+import io.temporal.activity.ActivityInterface;
 import io.temporal.activity.ActivityOptions;
 import io.temporal.client.WorkflowClient;
 import io.temporal.client.WorkflowOptions;
@@ -28,6 +29,7 @@
 import io.temporal.worker.WorkerFactory;
 import io.temporal.workflow.Functions;
 import io.temporal.workflow.Workflow;
+import io.temporal.workflow.WorkflowInterface;
 import io.temporal.workflow.WorkflowMethod;
 import java.time.Duration;
 
@@ -39,12 +41,14 @@ public class HelloActivityRetry {
 
   static final String TASK_LIST = "HelloActivityRetry";
 
+  @WorkflowInterface
   public interface GreetingWorkflow {
     /** @return greeting string */
     @WorkflowMethod
     String getGreeting(String name);
   }
 
+  @ActivityInterface
   public interface GreetingActivities {
     String composeGreeting(String greeting, String name);
   }

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

@@ -19,7 +19,8 @@
 
 package io.temporal.samples.hello;
 
-import io.temporal.activity.ActivityMethod;
+import io.temporal.activity.ActivityInterface;
+import io.temporal.activity.ActivityOptions;
 import io.temporal.client.WorkflowClient;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.worker.Worker;
@@ -28,7 +29,9 @@
 import io.temporal.workflow.Functions.Func;
 import io.temporal.workflow.Promise;
 import io.temporal.workflow.Workflow;
+import io.temporal.workflow.WorkflowInterface;
 import io.temporal.workflow.WorkflowMethod;
+import java.time.Duration;
 
 /**
  * Demonstrates asynchronous activity invocation. Requires a local instance of Temporal server to be
@@ -38,13 +41,14 @@ public class HelloAsync {
 
   static final String TASK_LIST = "HelloAsync";
 
+  @WorkflowInterface
   public interface GreetingWorkflow {
     @WorkflowMethod(executionStartToCloseTimeoutSeconds = 15, taskList = TASK_LIST)
     String getGreeting(String name);
   }
 
+  @ActivityInterface
   public interface GreetingActivities {
-    @ActivityMethod(scheduleToCloseTimeoutSeconds = 10)
     String composeGreeting(String greeting, String name);
   }
 
@@ -60,7 +64,9 @@ public static class GreetingWorkflowImpl implements GreetingWorkflow {
      * activity invocations.
      */
     private final GreetingActivities activities =
-        Workflow.newActivityStub(GreetingActivities.class);
+        Workflow.newActivityStub(
+            GreetingActivities.class,
+            ActivityOptions.newBuilder().setScheduleToCloseTimeout(Duration.ofSeconds(10)).build());
 
     @Override
     public String getGreeting(String name) {

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

@@ -20,14 +20,17 @@
 package io.temporal.samples.hello;
 
 import io.temporal.activity.Activity;
-import io.temporal.activity.ActivityMethod;
+import io.temporal.activity.ActivityInterface;
+import io.temporal.activity.ActivityOptions;
 import io.temporal.client.ActivityCompletionClient;
 import io.temporal.client.WorkflowClient;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.worker.Worker;
 import io.temporal.worker.WorkerFactory;
 import io.temporal.workflow.Workflow;
+import io.temporal.workflow.WorkflowInterface;
 import io.temporal.workflow.WorkflowMethod;
+import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
@@ -40,15 +43,16 @@ public class HelloAsyncActivityCompletion {
 
   static final String TASK_LIST = "HelloAsyncActivityCompletion";
 
+  @WorkflowInterface
   public interface GreetingWorkflow {
     /** @return greeting string */
     @WorkflowMethod(executionStartToCloseTimeoutSeconds = 15, taskList = TASK_LIST)
     String getGreeting(String name);
   }
 
   /** Activity interface is just a POJI. * */
+  @ActivityInterface
   public interface GreetingActivities {
-    @ActivityMethod(scheduleToCloseTimeoutSeconds = 10)
     String composeGreeting(String greeting, String name);
   }
 
@@ -61,7 +65,9 @@ public static class GreetingWorkflowImpl implements GreetingWorkflow {
      * activity invocations.
      */
     private final GreetingActivities activities =
-        Workflow.newActivityStub(GreetingActivities.class);
+        Workflow.newActivityStub(
+            GreetingActivities.class,
+            ActivityOptions.newBuilder().setScheduleToCloseTimeout(Duration.ofSeconds(10)).build());
 
     @Override
     public String getGreeting(String name) {