commit b4a1bb96c5b5802dd920b1f971e248bcc737680c
author lberki <lberki@google.com> Thu Aug 24 14:20:11 2017 +0200
committer Damien Martin-Guillerez <dmarting@google.com> Thu Aug 24 17:43:13 2017 +0200
tree 7a637a5029d3c30d0a087a4272ebaedc59ac5545
parent 097baed566ccb246ba7c748e256a429e27b7420f

Extract a string constant into a final field.

PiperOrigin-RevId: 166329484

src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
index 79475b2..3490db7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
@@ -86,7 +86,8 @@
             ActionAnalysisMetadata action = analysisEnvironment.getLocalGeneratingAction(artifact);
             if (action instanceof JavaCompileAction) {
               addOutputs(metadataFilesBuilder, action, JavaSemantics.COVERAGE_METADATA);
-            } else if (action != null && action.getMnemonic().equals("JavaResourceJar")) {
+            } else if (action != null
+                && action.getMnemonic().equals(ResourceJarActionBuilder.MNEMONIC)) {
               // recurse on resource jar actions
               collectMetadataArtifacts(
                   action.getInputs(), analysisEnvironment, metadataFilesBuilder);

src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java
index af7d596..0d9cf42 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java
@@ -35,6 +35,8 @@
 
 /** Builds the action to package the resources for a Java rule into a jar. */
 public class ResourceJarActionBuilder {
+  public static final String MNEMONIC = "JavaResourceJar";
+
   private Artifact outputJar;
   private Map<PathFragment, Artifact> resources = ImmutableMap.of();
   private NestedSet<Artifact> resourceJars = NestedSetBuilder.emptySet(Order.STABLE_ORDER);
@@ -141,7 +143,7 @@
             .addInputs(classpathResources)
             .setCommandLine(command.build())
             .setProgressMessage("Building Java resource jar")
-            .setMnemonic("JavaResourceJar")
+            .setMnemonic(MNEMONIC)
             .build(ruleContext));
   }