Minor cleanup: move all code from JavaConfigurationLoader to the ctor of JavaConfiguration.

RELNOTES: None.
PiperOrigin-RevId: 181593727

2 files changed, 5 insertions, 16 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
index 7290f13c42..4e8d9ceac2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
@@ -176,8 +176,6 @@ public final class JavaConfiguration extends Fragment {
   private final boolean useLegacyBazelJavaTest;
 
   JavaConfiguration(
-      boolean generateJavaDeps,
-      List<String> defaultJvmFlags,
       JavaOptions javaOptions)
       throws InvalidConfigurationException {
     this.commandLineJavacFlags =
@@ -186,9 +184,10 @@ public final class JavaConfiguration extends Fragment {
     this.useIjars = javaOptions.useIjars;
     this.useHeaderCompilation = javaOptions.headerCompilation;
     this.headerCompilationDisableJavacFallback = javaOptions.headerCompilationDisableJavacFallback;
-    this.generateJavaDeps = generateJavaDeps;
+    this.generateJavaDeps =
+        javaOptions.javaDeps || javaOptions.javaClasspath != JavaClasspathMode.OFF;
     this.javaClasspath = javaOptions.javaClasspath;
-    this.defaultJvmFlags = ImmutableList.copyOf(defaultJvmFlags);
+    this.defaultJvmFlags = ImmutableList.copyOf(javaOptions.jvmOpts);
     this.checkedConstraints = ImmutableList.copyOf(javaOptions.checkedConstraints);
     this.strictJavaDeps = javaOptions.strictJavaDeps;
     this.proguardBinary = javaOptions.proguard;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfigurationLoader.java
index fb72792bba..18076eea9d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfigurationLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfigurationLoader.java
@@ -20,7 +20,6 @@ import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment;
 import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
-import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaClasspathMode;
 
 /**
  * A loader that creates JavaConfiguration instances based on JavaBuilder configurations and
@@ -32,19 +31,10 @@ public class JavaConfigurationLoader implements ConfigurationFragmentFactory {
     return ImmutableSet.<Class<? extends FragmentOptions>>of(JavaOptions.class);
   }
 
-
   @Override
   public JavaConfiguration create(ConfigurationEnvironment env, BuildOptions buildOptions)
-      throws InvalidConfigurationException, InterruptedException {
-    JavaOptions javaOptions = buildOptions.get(JavaOptions.class);
-    return create(javaOptions);
-  }
-
-  private JavaConfiguration create(JavaOptions javaOptions)
-      throws InvalidConfigurationException {
-    boolean generateJavaDeps =
-        javaOptions.javaDeps || javaOptions.javaClasspath != JavaClasspathMode.OFF;
-    return new JavaConfiguration(generateJavaDeps, javaOptions.jvmOpts, javaOptions);
+    throws InvalidConfigurationException {
+    return new JavaConfiguration(buildOptions.get(JavaOptions.class));
   }
 
   @Override