make standalone project, add to gitignore, formatting

Author: THardy98

.gitignore

@@ -10,7 +10,7 @@ mise.toml
 
 # Ignore Gradle build output directory
 workers/java/bin
-workers/java/build
+workers/java/**/build
 
 /loadgen/kitchen-sink-gen/target/
 

cmd/dev/test.go

@@ -136,9 +136,7 @@ func runJavaHarnessTests(ctx context.Context, repoDir string) error {
 		ctx,
 		harnessDir,
 		"./gradlew",
-		"test",
-		"--tests",
-		"io.temporal.omes.harness.*",
+		":harness:test",
 	); err != nil {
 		return fmt.Errorf("failed Java harness tests: %w", err)
 	}

workers/java/build.gradle

@@ -1,19 +1,22 @@
 plugins {
     id 'java'
-    id 'com.google.protobuf' version '0.9.4'
     id 'com.diffplug.spotless' version '6.18.0'
 }
 
-group 'io.temporal'
-version '0.1.0'
+allprojects {
+    group 'io.temporal'
+    version '0.1.0'
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_10
-    targetCompatibility = JavaVersion.VERSION_1_10
-}
+    repositories {
+        mavenCentral()
+    }
 
-repositories {
-    mavenCentral()
+    plugins.withType(JavaPlugin) {
+        java {
+            sourceCompatibility = JavaVersion.VERSION_1_10
+            targetCompatibility = JavaVersion.VERSION_1_10
+        }
+    }
 }
 
 spotless {
@@ -27,72 +30,27 @@ spotless {
     }
 }
 
-compileJava.dependsOn spotlessJava, generateProto
+compileJava.dependsOn spotlessJava
 
 dependencies {
-    implementation 'ch.qos.logback:logback-classic:1.2.13'
+    implementation project(':harness')
     implementation 'com.google.guava:guava:31.0.1-jre'
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.jayway.jsonpath:json-path:2.6.0'
-    implementation 'info.picocli:picocli:4.6.2'
     implementation 'io.temporal:temporal-sdk:1.34.0'
-    implementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
     implementation 'org.reflections:reflections:0.10.2'
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation "io.micrometer:micrometer-registry-prometheus"
 
     implementation(platform("com.fasterxml.jackson:jackson-bom:2.15.2"))
     implementation "com.fasterxml.jackson.core:jackson-databind"
     implementation "com.fasterxml.jackson.core:jackson-core"
     implementation 'com.google.protobuf:protobuf-java:3.25.5'
     compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
-    testImplementation 'io.temporal:temporal-testing:1.34.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 }
 
 sourceSets {
     main {
         java {
-            srcDirs = [
-                'io/temporal/omes',
-                'harness/src/main/java',
-                "$buildDir/generated/source/proto/main/java",
-                "$buildDir/generated/source/proto/main/grpc",
-            ]
-        }
-        proto {
-            srcDirs = ['../proto/harness/api']
-            include 'api.proto'
-        }
-    }
-    test {
-        java {
-            srcDirs = ['harness/src/test/java']
+            srcDirs = ['io/temporal/omes']
         }
     }
 }
-
-protobuf {
-    protoc {
-        artifact = 'com.google.protobuf:protoc:3.25.5'
-    }
-    plugins {
-        grpc {
-            artifact = 'io.grpc:protoc-gen-grpc-java:1.75.0'
-        }
-    }
-    generateProtoTasks {
-        all().configureEach { task ->
-            task.builtins {
-                java {}
-            }
-            task.plugins {
-                grpc {}
-            }
-        }
-    }
-}
-
-test {
-    useJUnitPlatform()
-}

workers/java/harness/build.gradle

@@ -0,0 +1,54 @@
+plugins {
+    id 'java'
+    id 'com.google.protobuf' version '0.9.4'
+}
+
+compileJava.dependsOn generateProto
+
+dependencies {
+    compileOnly 'io.temporal:temporal-sdk:1.34.0'
+
+    implementation 'ch.qos.logback:logback-classic:1.2.13'
+    implementation 'com.google.protobuf:protobuf-java:3.25.5'
+    implementation 'info.picocli:picocli:4.6.2'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
+    implementation 'io.micrometer:micrometer-registry-prometheus'
+
+    testImplementation 'io.temporal:temporal-testing:1.34.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+}
+
+sourceSets {
+    main {
+        proto {
+            srcDirs = ['../../proto/harness/api']
+            include 'api.proto'
+        }
+    }
+}
+
+protobuf {
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.25.5'
+    }
+    plugins {
+        grpc {
+            artifact = 'io.grpc:protoc-gen-grpc-java:1.75.0'
+        }
+    }
+    generateProtoTasks {
+        all().configureEach { task ->
+            task.builtins {
+                java {}
+            }
+            task.plugins {
+                grpc {}
+            }
+        }
+    }
+}
+
+test {
+    useJUnitPlatform()
+}

workers/java/harness/src/main/java/io/temporal/omes/harness/Harness.java

@@ -29,8 +29,7 @@ public static void run(App app, String... argv) throws Exception {
     }
 
     throw new IllegalArgumentException(
-        String.format(
-            "Unknown command: [%s]. Expected 'worker' or 'project-server'", argv[0]));
+        String.format("Unknown command: [%s]. Expected 'worker' or 'project-server'", argv[0]));
   }
 
   public static final class App {

workers/java/harness/src/main/java/io/temporal/omes/harness/HarnessClients.java

@@ -183,11 +183,11 @@ public String name(String name, Meter.Type type, String baseUnit) {
             .reporter(reporter)
             .reportEvery(com.uber.m3.util.Duration.ofSeconds(1));
     HttpServer scrapeEndpoint =
-        HarnessMetricsUtils.startPrometheusScrapeEndpoint(registry, promHandlerPath, promListenAddress);
+        HarnessMetricsUtils.startPrometheusScrapeEndpoint(
+            registry, promHandlerPath, promListenAddress);
     Runtime.getRuntime()
         .addShutdownHook(
-            new Thread(
-                () -> scrapeEndpoint.stop(1), "omes-java-harness-metrics-shutdown"));
+            new Thread(() -> scrapeEndpoint.stop(1), "omes-java-harness-metrics-shutdown"));
     return scope;
   }
 

workers/java/harness/src/main/java/io/temporal/omes/harness/ProjectHarness.java

@@ -1,6 +1,5 @@
 package io.temporal.omes.harness;
 
-import io.grpc.BindableService;
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
 import io.grpc.Status;
@@ -23,7 +22,10 @@ static void runProjectServerCli(
       throws Exception {
     Arguments args = new Arguments();
     new CommandLine(args).parseArgs(argv);
-    Server server = ServerBuilder.forPort(args.port).addService(new ProjectServiceServer(handlers, clientFactory)).build();
+    Server server =
+        ServerBuilder.forPort(args.port)
+            .addService(new ProjectServiceServer(handlers, clientFactory))
+            .build();
     server.start();
     logger.info("Project server listening on port {}", server.getPort());
     server.awaitTermination();
@@ -168,7 +170,10 @@ public void init(Api.InitRequest request, StreamObserver<Api.InitResponse> respo
           handlers.init.init(
               createdClient,
               new ProjectInitContext(
-                  logger, createdRun, request.getTaskQueue(), request.getConfigJson().toByteArray()));
+                  logger,
+                  createdRun,
+                  request.getTaskQueue(),
+                  request.getConfigJson().toByteArray()));
         } catch (Exception e) {
           abort(responseObserver, Status.INTERNAL, "init handler failed: " + messageOf(e));
           return;
@@ -215,8 +220,7 @@ public void execute(
     }
   }
 
-  private static void abort(
-      StreamObserver<?> responseObserver, Status status, String description) {
+  private static void abort(StreamObserver<?> responseObserver, Status status, String description) {
     responseObserver.onError(status.withDescription(description).asRuntimeException());
   }
 

workers/java/harness/src/main/java/io/temporal/omes/harness/WorkerHarness.java

@@ -75,10 +75,7 @@ static void runWorkerCli(
           workerRegistrar,
           logger,
           buildTaskQueues(
-              logger,
-              args.taskQueue,
-              args.taskQueueSuffixIndexStart,
-              args.taskQueueSuffixIndexEnd),
+              logger, args.taskQueue, args.taskQueueSuffixIndexStart, args.taskQueueSuffixIndexEnd),
           args.errOnUnimplemented,
           buildWorkerOptions(args));
 
@@ -330,14 +327,10 @@ static final class Arguments {
   private static final class BooleanFlagConverter implements CommandLine.ITypeConverter<Boolean> {
     @Override
     public Boolean convert(String value) {
-      if ("true".equalsIgnoreCase(value)
-          || "1".equals(value)
-          || "yes".equalsIgnoreCase(value)) {
+      if ("true".equalsIgnoreCase(value) || "1".equals(value) || "yes".equalsIgnoreCase(value)) {
         return true;
       }
-      if ("false".equalsIgnoreCase(value)
-          || "0".equals(value)
-          || "no".equalsIgnoreCase(value)) {
+      if ("false".equalsIgnoreCase(value) || "0".equals(value) || "no".equalsIgnoreCase(value)) {
         return false;
       }
       throw new IllegalArgumentException("Invalid boolean value: " + value);

workers/java/harness/src/test/java/io/temporal/omes/harness/ProjectHarnessEchoWorkflow.java

@@ -4,10 +4,10 @@
 import io.temporal.workflow.WorkflowMethod;
 
 @WorkflowInterface
-  public interface ProjectHarnessEchoWorkflow {
-    @WorkflowMethod
-    String run(String payload);
-  }
+public interface ProjectHarnessEchoWorkflow {
+  @WorkflowMethod
+  String run(String payload);
+}
 
 class ProjectHarnessEchoWorkflowImpl implements ProjectHarnessEchoWorkflow {
   public ProjectHarnessEchoWorkflowImpl() {}
@@ -16,4 +16,4 @@ public ProjectHarnessEchoWorkflowImpl() {}
   public String run(String payload) {
     return payload;
   }
-}
+}

workers/java/harness/src/test/java/io/temporal/omes/harness/ProjectHarnessTest.java

@@ -36,8 +36,7 @@ void projectServerExecutesWorkflowAgainstRealTemporalServer() throws Exception {
                                 WorkflowOptions.newBuilder()
                                     .setWorkflowId(
                                         String.format(
-                                            "%s-%d",
-                                            context.run.executionId, context.iteration))
+                                            "%s-%d", context.run.executionId, context.iteration))
                                     .setTaskQueue(context.taskQueue)
                                     .build());
                         captured.executeClient = client;
@@ -52,13 +51,11 @@ void projectServerExecutesWorkflowAgainstRealTemporalServer() throws Exception {
                       }),
                   config -> environment.getWorkflowClient()))) {
         server.stub.init(
-            ProjectHarnessTestSupport.makeInitRequest()
-                .toBuilder()
+            ProjectHarnessTestSupport.makeInitRequest().toBuilder()
                 .setTaskQueue(taskQueue)
                 .build());
         server.stub.execute(
-            ProjectHarnessTestSupport.makeExecuteRequest()
-                .toBuilder()
+            ProjectHarnessTestSupport.makeExecuteRequest().toBuilder()
                 .setTaskQueue(taskQueue)
                 .build());
       }