chore: clean up the WithJava API

backend/controller/leases/lease_integration_test.go

@@ -20,7 +20,6 @@ import (
 func TestLease(t *testing.T) {
 	in.Run(t,
 		in.WithLanguages("go", "java"),
-		in.WithJava(),
 		in.CopyModule("leases"),
 		in.Build("leases"),
 		// checks if leases work in a unit test environment

integration/harness.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"sync"
 	"syscall"
 	"testing"
@@ -78,8 +79,9 @@ func WithEnvar(key, value string) Option {
 	}
 }
 
-// WithJava is a Run* option that ensures the Java runtime is built.
-func WithJava() Option {
+// BuildJava is a Run* option that ensures the Java runtime is built.
+// If the test languages contain java this is not necessary, as it is implied
+func BuildJava() Option {
 	return func(o *options) {
 		o.requireJava = true
 	}
@@ -176,7 +178,7 @@ func run(t *testing.T, actionsOrOptions ...ActionOrOption) {
 		Infof("Building ftl")
 		err = ftlexec.Command(ctx, log.Debug, rootDir, "just", "build", "ftl").RunBuffered(ctx)
 		assert.NoError(t, err)
-		if opts.requireJava {
+		if opts.requireJava || slices.Contains(opts.languages, "java") {
 			err = ftlexec.Command(ctx, log.Debug, rootDir, "just", "build-java", "-DskipTests").RunBuffered(ctx)
 			assert.NoError(t, err)
 		}

java-runtime/java_integration_test.go

@@ -105,7 +105,6 @@ func TestJavaToGoCall(t *testing.T) {
 	//tests = append(tests, PairedPrefixVerbTest("nilvalue", "optionalTestObjectOptionalFieldsVerb", ftl.None[any]())...)
 
 	in.Run(t,
-		in.WithJava(),
 		in.WithLanguages("java"),
 		in.CopyModule("gomodule"),
 		in.CopyModule("javamodule"),