Kill the deps map
PiperOrigin-RevId: 206025645
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java
index 9458112..5fcb35d 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java
@@ -19,7 +19,6 @@
import static com.google.devtools.build.buildjar.javac.plugins.dependency.DependencyModule.StrictJavaDeps.ERROR;
import com.google.auto.value.AutoValue;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableSet;
import com.google.devtools.build.buildjar.JarOwner;
import com.google.devtools.build.buildjar.javac.plugins.BlazeJavaCompilerPlugin;
@@ -41,7 +40,6 @@
import com.sun.tools.javac.util.Log.WriterKind;
import com.sun.tools.javac.util.Name;
import java.io.IOException;
-import java.io.InputStream;
import java.io.PrintWriter;
import java.io.UncheckedIOException;
import java.nio.file.Path;
@@ -51,7 +49,6 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.Properties;
import java.util.Set;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
@@ -72,10 +69,6 @@
private static final Attributes.Name INJECTING_RULE_KIND =
new Attributes.Name("Injecting-Rule-Kind");
- @VisibleForTesting
- static String targetMapping =
- "com/google/devtools/build/buildjar/javac/resources/target.properties";
-
private ImplicitDependencyExtractor implicitDependencyExtractor;
private CheckingTreeScanner checkingTreeScanner;
private final DependencyModule dependencyModule;
@@ -89,8 +82,6 @@
/** Strict deps diagnostics. */
private final List<SjdDiagnostic> diagnostics;
- private static Properties targetMap;
-
private PrintWriter errWriter;
@AutoValue
@@ -120,7 +111,6 @@
this.dependencyModule = dependencyModule;
toplevels = new HashSet<>();
trees = new HashSet<>();
- targetMap = new Properties();
missingTargets = new HashSet<>();
diagnostics = new ArrayList<>();
}
@@ -141,17 +131,6 @@
new CheckingTreeScanner(dependencyModule, diagnostics, missingTargets, platformJars);
context.put(CheckingTreeScanner.class, checkingTreeScanner);
}
- initTargetMap();
- }
-
- private void initTargetMap() {
- try (InputStream is = getClass().getClassLoader().getResourceAsStream(targetMapping)) {
- if (is != null) {
- targetMap.load(is);
- }
- } catch (IOException ex) {
- throw new AssertionError("Error loading Strict Java Deps mapping file: " + targetMapping, ex);
- }
}
/**
@@ -216,10 +195,7 @@
.sorted(Comparator.comparing((JarOwner owner) -> owner.label().get()))
// for dependencies that are missing we canonicalize and remap the target so we don't
// suggest private build labels.
- .map(
- owner ->
- owner.withLabel(
- owner.label().map(label -> canonicalizeTarget(remapTarget(label)))))
+ .map(owner -> owner.withLabel(owner.label().map(label -> canonicalizeTarget(label))))
.collect(toImmutableSet());
errWriter.print(
dependencyModule.getFixMessage().get(canonicalizedMissing, canonicalizedLabel));
@@ -310,7 +286,7 @@
// owner is of the form "//label/of:rule <Aspect name>" where <Aspect name> is
// optional.
Optional<String> canonicalTargetName =
- owner.label().map(label -> canonicalizeTarget(remapTarget(label)));
+ owner.label().map(label -> canonicalizeTarget(label));
missingTargets.add(owner);
String toolInfo =
owner.aspect().isPresent()
@@ -484,15 +460,6 @@
return suppressions.build();
}
- /** Replace the given target with a configured replacement. Package private for testing. */
- static String remapTarget(String target) {
- String replacement = targetMap.getProperty(target);
- if (replacement != null) {
- return replacement;
- }
- return target;
- }
-
/** Returns the canonical version of the target name. Package private for testing. */
static String canonicalizeTarget(String target) {
int colonIndex = target.indexOf(':');
