Remove empty `IjarBaseRule` class
And move its children rules to use its ancestor `JavaToolchainBaseRule`
PiperOrigin-RevId: 529125544
Change-Id: Ib3f12e4e81bfba1c324f700bc6c3e333ced55639
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/JavaRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/JavaRules.java
index 4b5f9e7..f74b286 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/JavaRules.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/JavaRules.java
@@ -36,7 +36,6 @@
import com.google.devtools.build.lib.rules.java.JavaPackageConfigurationRule;
import com.google.devtools.build.lib.rules.java.JavaPluginInfo;
import com.google.devtools.build.lib.rules.java.JavaPluginsFlagAliasRule;
-import com.google.devtools.build.lib.rules.java.JavaRuleClasses.IjarBaseRule;
import com.google.devtools.build.lib.rules.java.JavaRuleClasses.JavaRuntimeBaseRule;
import com.google.devtools.build.lib.rules.java.JavaRuleClasses.JavaToolchainBaseRule;
import com.google.devtools.build.lib.rules.java.JavaRuntimeRule;
@@ -65,7 +64,6 @@
builder.addBuildInfoFactory(new BazelJavaBuildInfoFactory());
builder.addRuleDefinition(new BazelJavaRuleClasses.BaseJavaBinaryRule());
- builder.addRuleDefinition(new IjarBaseRule());
builder.addRuleDefinition(new JavaToolchainBaseRule());
builder.addRuleDefinition(new JavaRuntimeBaseRule());
builder.addRuleDefinition(new BazelJavaRuleClasses.JavaBaseRule());
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaImportRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaImportRule.java
index 8f857cf..494cd85 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaImportRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaImportRule.java
@@ -24,7 +24,7 @@
import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
import com.google.devtools.build.lib.packages.RuleClass;
import com.google.devtools.build.lib.rules.java.JavaImportBaseRule;
-import com.google.devtools.build.lib.rules.java.JavaRuleClasses.IjarBaseRule;
+import com.google.devtools.build.lib.rules.java.JavaRuleClasses.JavaToolchainBaseRule;
import com.google.devtools.build.lib.rules.java.JavaSemantics;
/**
@@ -77,7 +77,7 @@
public Metadata getMetadata() {
return RuleDefinition.Metadata.builder()
.name("java_import")
- .ancestors(JavaImportBaseRule.class, IjarBaseRule.class)
+ .ancestors(JavaImportBaseRule.class, JavaToolchainBaseRule.class)
.factoryClass(BaseRuleClasses.EmptyRuleConfiguredTargetFactory.class)
.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java
index cb6d9de..19e67fa 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java
@@ -48,8 +48,8 @@
import com.google.devtools.build.lib.rules.java.JavaConfiguration;
import com.google.devtools.build.lib.rules.java.JavaInfo;
import com.google.devtools.build.lib.rules.java.JavaPluginInfo;
-import com.google.devtools.build.lib.rules.java.JavaRuleClasses.IjarBaseRule;
import com.google.devtools.build.lib.rules.java.JavaRuleClasses.JavaRuntimeBaseRule;
+import com.google.devtools.build.lib.rules.java.JavaRuleClasses.JavaToolchainBaseRule;
import com.google.devtools.build.lib.rules.java.JavaSemantics;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.SerializationConstant;
import com.google.devtools.build.lib.util.FileTypeSet;
@@ -107,7 +107,7 @@
return RuleDefinition.Metadata.builder()
.name("$java_base_rule")
.type(RuleClassType.ABSTRACT)
- .ancestors(IjarBaseRule.class, JavaRuntimeBaseRule.class)
+ .ancestors(JavaToolchainBaseRule.class, JavaRuntimeBaseRule.class)
.build();
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleClasses.java
index ed9a1a7..06a23fd 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleClasses.java
@@ -53,23 +53,6 @@
.build();
}
- /** Common attributes for rules that depend on ijar. */
- public static final class IjarBaseRule implements RuleDefinition {
- @Override
- public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
- return builder.setPreferredDependencyPredicate(JavaSemantics.JAVA_SOURCE).build();
- }
-
- @Override
- public Metadata getMetadata() {
- return RuleDefinition.Metadata.builder()
- .name("$ijar_base_rule")
- .type(RuleClassType.ABSTRACT)
- .ancestors(JavaToolchainBaseRule.class)
- .build();
- }
- }
-
/** Common attributes for rules that use the Java toolchain. */
public static final class JavaToolchainBaseRule implements RuleDefinition {
@Override
