Replace ConfiguredTargetAndData#getConfiguredTarget()#getConfiguration() with ConfiguredTargetAndData#getConfiguration(). Done using intellij structural replace. PiperOrigin-RevId: 188618282
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java index 9647cb3..fb13cfb 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
@@ -153,7 +153,7 @@ BuildConfiguration config) { for (ConfiguredTargetAndData prerequisite : prerequisiteMap.get(null)) { if (prerequisite.getTarget().getLabel().equals(label) - && (prerequisite.getConfiguredTarget().getConfiguration() == config)) { + && (prerequisite.getConfiguration() == config)) { return prerequisite.getConfiguredTarget(); } }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java index 3d0fbf0..394f572 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -822,8 +822,8 @@ ImmutableListMultimap.Builder<Optional<String>, ConfiguredTargetAndData> result = ImmutableListMultimap.builder(); for (ConfiguredTargetAndData t : deps) { - if (t.getConfiguredTarget().getConfiguration() != null) { - result.put(Optional.of(t.getConfiguredTarget().getConfiguration().getCpu()), t); + if (t.getConfiguration() != null) { + result.put(Optional.of(t.getConfiguration().getCpu()), t); } else { // Source files don't have a configuration, so we add them to all architecture entries. for (String cpu : cpus) { @@ -872,7 +872,7 @@ ImmutableListMultimap.Builder<BuildConfiguration, ConfiguredTargetAndData> result = ImmutableListMultimap.builder(); for (ConfiguredTargetAndData ctad : ctatCollection) { - result.put(ctad.getConfiguredTarget().getConfiguration(), ctad); + result.put(ctad.getConfiguration(), ctad); } return result.build(); }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetContext.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetContext.java index 4f55484..cba5aac 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TargetContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetContext.java
@@ -117,7 +117,7 @@ BuildConfiguration config) { for (ConfiguredTargetAndData prerequisite : directPrerequisites) { if (prerequisite.getTarget().getLabel().equals(label) - && (Objects.equal(prerequisite.getConfiguredTarget().getConfiguration(), config))) { + && (Objects.equal(prerequisite.getConfiguration(), config))) { return prerequisite.getConfiguredTarget(); } }