1 files changed, 8 insertions, 7 deletions
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/JUnit4Bazel.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/JUnit4Bazel.java
index b5125471c0..5ea00cd9ca 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/JUnit4Bazel.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/JUnit4Bazel.java
@@ -163,8 +163,8 @@ public final class JUnit4Bazel {
                 requestMemoizingSupplier, topLevelSuiteNameSupplier, builderSupplier));
 
     this.provideTestSuiteModelSupplierMemoizingSupplier =
-        new MemoizingSupplier<>(TestSuiteModelSupplierFactory.create(
-                jUnit4TestModelBuilderMemoizingSupplier));
+        new MemoizingSupplier<Supplier<TestSuiteModel>>(
+            TestSuiteModelSupplierFactory.create(jUnit4TestModelBuilderMemoizingSupplier));
 
     this.stdoutStreamMemoizingSupplier = new MemoizingSupplier<>(StdoutStreamFactory.create());
 
@@ -172,7 +172,7 @@ public final class JUnit4Bazel {
         new MemoizingSupplier<>(JUnit4OptionsFactory.create(builder.config));
 
     this.configMemoizingSupplier =
-        new MemoizingSupplier<>(JUnit4ConfigFactory.create(optionsMemoizingSupplier));
+        new MemoizingSupplier<Object>(JUnit4ConfigFactory.create(optionsMemoizingSupplier));
 
     this.signalHandlersSupplier =
         SignalHandlersFactory.create(SignalHandlerInstallerFactory.create());
@@ -187,10 +187,11 @@ public final class JUnit4Bazel {
         StackTraceListenerFactory.create(jUnit4TestStackTraceListenerMemoizingSupplier);
 
     this.provideXmlStreamMemoizingSupplier =
-        new MemoizingSupplier<>(ProvideXmlStreamFactory.create(configMemoizingSupplier));
+        new MemoizingSupplier<OutputStream>(
+            ProvideXmlStreamFactory.create(configMemoizingSupplier));
 
     this.jUnit4TestXmlListenerMemoizingSupplier =
-        new MemoizingSupplier<>(JUnit4TestXmlListenerFactory.create(
+        new MemoizingSupplier<Object>(JUnit4TestXmlListenerFactory.create(
             provideTestSuiteModelSupplierMemoizingSupplier,
             cancellableRequestFactorySupplier,
             signalHandlersSupplier,
@@ -203,7 +204,7 @@ public final class JUnit4Bazel {
         new MemoizingSupplier<>(CurrentRunningTestFactory.create(builder.jUnit4RunnerModule));
 
     this.jUnit4TestNameListenerMemoizingSupplier =
-        new MemoizingSupplier<>(
+        new MemoizingSupplier<Object>(
             JUnit4TestNameListenerFactory.create(provideCurrentRunningTestMemoizingSupplier));
 
     this.nameListenerSupplier = NameListenerFactory.create(jUnit4TestNameListenerMemoizingSupplier);
@@ -238,7 +239,7 @@ public final class JUnit4Bazel {
   }
 
   /**
-   * A builder for instantiating {@ JUnit4Bazel}.
+   * A builder for instantiating {@link JUnit4Bazel}.
    */
   public static final class Builder {
     private JUnit4InstanceModules.SuiteClass suiteClass;