Some cleanup changes.
--
MOS_MIGRATED_REVID=87821306
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AbstractConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/AbstractConfiguredTarget.java
index e574978..0650a12 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AbstractConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AbstractConfiguredTarget.java
@@ -106,6 +106,6 @@
@Override
public ImmutableCollection<String> getKeys() {
- return ImmutableList.<String>builder().add("label").add("files").build();
+ return ImmutableList.of("label", "files");
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java
index 2e4c251..37f06c3 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java
@@ -137,10 +137,10 @@
*/
public static <T extends TransitiveInfoProvider> void checkProvider(Class<T> clazz) {
if (!clazz.isInterface()) {
- Preconditions.checkArgument(Modifier.isFinal(clazz.getModifiers()),
- clazz.getName() + " has to be final");
+ Preconditions.checkArgument(
+ Modifier.isFinal(clazz.getModifiers()), "%s has to be final", clazz.getName());
Preconditions.checkArgument(clazz.isAnnotationPresent(Immutable.class),
- clazz.getName() + " has to be tagged with @Immutable");
+ "%s has to be tagged with @Immutable", clazz.getName());
}
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index a84bb94..5bf199d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -420,13 +420,8 @@
try {
ConfiguredTarget ct = getConfiguredTarget(label, ctg.getConfiguration());
keys.add(Preconditions.checkNotNull(ct.getProvider(ConfigMatchingProvider.class)));
- } catch (NoSuchPackageException e) {
- // All lookups should succeed because we should not be looking up any targets in error.
- throw new IllegalStateException(e);
- } catch (NoSuchTargetException e) {
- // All lookups should succeed because we should not be looking up any targets in error.
- throw new IllegalStateException(e);
- } catch (NoSuchConfiguredTargetException e) {
+ } catch (
+ NoSuchPackageException | NoSuchTargetException | NoSuchConfiguredTargetException e) {
// All lookups should succeed because we should not be looking up any targets in error.
throw new IllegalStateException(e);
}
@@ -781,7 +776,7 @@
for (ExtraArtifactSet set : builder.build()) {
boolean filterMatches = filter == null || filter.isIncluded(set.getLabel().toString());
if (filterMatches) {
- Iterables.addAll(artifactsToBuild, set.getArtifacts());
+ artifactsToBuild.addAll(set.getArtifacts());
}
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
index bc45ba3..921e4e7 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
@@ -247,9 +247,7 @@
public void registerAction(Action... actions) {
Preconditions.checkState(enabled);
if (allowRegisteringActions) {
- for (Action action : actions) {
- this.actions.add(action);
- }
+ Collections.addAll(this.actions, actions);
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
index 416d92e..abc9c22 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
@@ -122,7 +122,7 @@
}
} else {
// Map all depArtifacts to the respective label using the multimaps.
- Iterables.addAll(mapGet(tempLabelMap, label), files);
+ mapGet(tempLabelMap, label).addAll(files);
}
}
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 d265533..92687d6 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
@@ -255,7 +255,7 @@
names.add(fragment.getSimpleName());
}
result.append("all of [");
- result.append(Joiner.on(",").join(names));
+ Joiner.on(",").appendTo(result, names);
result.append("], but these were all disabled");
return result.toString();
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
index 64cddb1..b7bd55e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
@@ -148,7 +148,7 @@
Preconditions.checkNotNull(config);
visitTargetVisibility(node, outgoingEdges.get(null));
Rule rule = ((OutputFile) target).getGeneratingRule();
- outgoingEdges.get(null).add(new Dependency(rule.getLabel(), config));
+ outgoingEdges.put(null, new Dependency(rule.getLabel(), config));
} else if (target instanceof InputFile) {
visitTargetVisibility(node, outgoingEdges.get(null));
} else if (target instanceof EnvironmentGroup) {
@@ -508,8 +508,9 @@
Iterable<BuildConfiguration> toConfigurations = config.evaluateTransition(
rule, attribute, toTarget);
for (BuildConfiguration toConfiguration : toConfigurations) {
- outgoingEdges.get(entry.getKey()).add(new Dependency(
- label, toConfiguration, requiredAspects(aspect, attribute, toTarget)));
+ outgoingEdges.put(
+ entry.getKey(),
+ new Dependency(label, toConfiguration, requiredAspects(aspect, attribute, toTarget)));
}
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java b/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java
index 8feb28e..ae70699 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java
@@ -110,7 +110,7 @@
}
if (attrValue.charAt(start + scannedLength) != ' ') {
- result.append(attrValue.substring(restart, start + scannedLength));
+ result.append(attrValue, restart, start + scannedLength);
restart = start + scannedLength;
continue;
}
@@ -149,7 +149,7 @@
return attrValue;
}
- result.append(attrValue.substring(restart, start));
+ result.append(attrValue, restart, start);
if (multiple) {
Collections.sort(paths);
Joiner.on(' ').appendTo(result, paths);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PrerequisiteArtifacts.java b/src/main/java/com/google/devtools/build/lib/analysis/PrerequisiteArtifacts.java
index 60c78d5..7594f4b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/PrerequisiteArtifacts.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/PrerequisiteArtifacts.java
@@ -71,7 +71,7 @@
}
private PrerequisiteArtifacts filter(Predicate<String> fileType, boolean errorsForNonMatching) {
- ImmutableList.Builder<Artifact> filtered = new ImmutableList.Builder<Artifact>();
+ ImmutableList.Builder<Artifact> filtered = new ImmutableList.Builder<>();
for (Artifact artifact : artifacts) {
if (fileType.apply(artifact.getFilename())) {
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 1bbcd72..eef371b 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
@@ -1313,8 +1313,7 @@
boolean allowedWithWarning = attribute.getAllowedRuleClassesWarningPredicate()
.apply(ruleClass);
reportBadPrerequisite(attribute, prerequisiteTarget.getTargetKind(), prerequisiteLabel,
- "expected " + attribute.getAllowedRuleClassesPredicate().toString(),
- allowedWithWarning);
+ "expected " + attribute.getAllowedRuleClassesPredicate(), allowedWithWarning);
}
} else if (prerequisiteTarget instanceof FileTarget) {
if (!attribute.getAllowedFileTypesPredicate()
@@ -1335,7 +1334,7 @@
} else {
// The file exists but has a bad extension
reportBadPrerequisite(attribute, "file", prerequisiteLabel,
- "expected " + attribute.getAllowedFileTypesPredicate().toString(), false);
+ "expected " + attribute.getAllowedFileTypesPredicate(), false);
}
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
index aa7f429..a790e72 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
@@ -108,7 +108,7 @@
Preconditions.checkState(!runfiles.isEmpty());
Map<PathFragment, Artifact> symlinks = getRunfilesSymlinks();
- if (executable != null && !symlinks.values().contains(executable)) {
+ if (executable != null && !symlinks.containsValue(executable)) {
throw new IllegalStateException("main program " + executable + " not included in runfiles");
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/WorkspaceStatusAction.java b/src/main/java/com/google/devtools/build/lib/analysis/WorkspaceStatusAction.java
index 5b3bd27..986b085 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/WorkspaceStatusAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/WorkspaceStatusAction.java
@@ -16,7 +16,6 @@
import com.google.common.base.Splitter;
import com.google.common.base.Supplier;
-import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.actions.AbstractAction;
import com.google.devtools.build.lib.actions.ActionOwner;
@@ -130,10 +129,10 @@
*/
public static Map<String, String> parseValues(Path file) throws IOException {
HashMap<String, String> result = new HashMap<>();
- Splitter lineSplitter = Splitter.on(" ").limit(2);
- for (String line : Splitter.on("\n").split(
- new String(FileSystemUtils.readContentAsLatin1(file)))) {
- List<String> items = ImmutableList.copyOf(lineSplitter.split(line));
+ Splitter lineSplitter = Splitter.on(' ').limit(2);
+ for (String line :
+ Splitter.on('\n').split(new String(FileSystemUtils.readContentAsLatin1(file)))) {
+ List<String> items = lineSplitter.splitToList(line);
if (items.size() != 2) {
continue;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
index daac95e..724b1a7 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
@@ -54,7 +54,7 @@
import java.nio.charset.Charset;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -688,9 +688,7 @@
this.executableArgs = Lists.newArrayList();
executableArgs.add("-Xverify:none");
executableArgs.addAll(jvmArgs);
- for (String arg : launchArgs) {
- executableArgs.add(arg);
- }
+ Collections.addAll(executableArgs, launchArgs);
inputsBuilder.add(deployJar);
this.isShellCommand = false;
return this;
@@ -774,7 +772,7 @@
*/
public Builder addExecutableArguments(String... arguments) {
Preconditions.checkState(executableArgs != null);
- executableArgs.addAll(Arrays.asList(arguments));
+ Collections.addAll(executableArgs, arguments);
return this;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index 5fac33d..967074a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -18,7 +18,6 @@
import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
-import com.google.common.base.Predicates;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -1074,12 +1073,12 @@
private String buildMnemonic() {
// See explanation at getShortName().
String platformSuffix = (options.platformSuffix != null) ? options.platformSuffix : "";
- ArrayList<String> nameParts = new ArrayList<String>();
+ ArrayList<String> nameParts = new ArrayList<>();
for (Fragment fragment : fragments.values()) {
nameParts.add(fragment.getOutputDirectoryName());
}
nameParts.add(getCompilationMode() + platformSuffix);
- return Joiner.on('-').join(Iterables.filter(nameParts, Predicates.notNull()));
+ return Joiner.on('-').skipNulls().join(nameParts);
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
index afe408f..8b44f654 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
@@ -174,7 +174,7 @@
public String toString() {
StringBuilder stringBuilder = new StringBuilder();
for (FragmentOptions options : fragmentOptionsMap.values()) {
- stringBuilder.append(options.toString());
+ stringBuilder.append(options);
}
return stringBuilder.toString();
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java b/src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java
index 207d49a..7d92bce 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/DefaultsPackage.java
@@ -99,7 +99,7 @@
}
private String labelsToString(Set<Label> labels) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (Label label : labels) {
if (result.length() != 0) {
result.append(", ");
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/PerLabelOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/PerLabelOptions.java
index 1e921e5..66da6736 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/PerLabelOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/PerLabelOptions.java
@@ -61,7 +61,7 @@
String optionsPiece = input.substring(atIndex + 1);
List<String> optionsList = new ArrayList<>();
for (String option : optionsPiece.split("(?<!\\\\),")) { // Split on ',' but not on '\,'
- if (option != null && !option.trim().equals("")) {
+ if (option != null && !option.trim().isEmpty()) {
optionsList.add(option.replace("\\,", ","));
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnderConverter.java b/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnderConverter.java
index 1f7b660..8da1fbb 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnderConverter.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnderConverter.java
@@ -60,7 +60,7 @@
public RunUnderLabel(String input, Label runUnderLabel, List<String> runUnderList) {
this.input = input;
this.runUnderLabel = runUnderLabel;
- this.runUnderList = new ArrayList<String>(runUnderList.subList(1, runUnderList.size()));
+ this.runUnderList = new ArrayList<>(runUnderList.subList(1, runUnderList.size()));
}
@Override public String getValue() { return input; }
@@ -97,7 +97,7 @@
public RunUnderCommand(String input, String runUnderCommand, List<String> runUnderList) {
this.input = input;
this.runUnderCommand = runUnderCommand;
- this.runUnderList = new ArrayList<String>(runUnderList.subList(1, runUnderList.size()));
+ this.runUnderList = new ArrayList<>(runUnderList.subList(1, runUnderList.size()));
}
@Override public String getValue() { return input; }
