commit b3f54f673259604ea526c560d4abd144bd267295
author michajlo <michajlo@google.com> Wed Nov 20 16:23:43 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Nov 20 16:26:03 2019 -0800
tree 7d0736c0e3e3da729fd4a8f377e18404fa2d0e64
parent dbe76ceade3ea4561072fac9b4252b06293ee32a

Remove Package#name and Package#nameFragment

This removes room for them to diverge from the source of truth -
Package#packageIdentifier. These member variables most probably existed due to
a combination of inertia and optimization for when PathFragments were more...
involved.

PiperOrigin-RevId: 281629337

src/main/java/com/google/devtools/build/lib/packages/Package.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
index 34644e5..a6b0508 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Package.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -92,16 +92,6 @@
    */
   private final PackageIdentifier packageIdentifier;
 
-  /**
-   * The name of the package, e.g. "foo/bar".
-   */
-  private final String name;
-
-  /**
-   * Like name, but in the form of a PathFragment.
-   */
-  private final PathFragment nameFragment;
-
   /** The filename of this package's BUILD file. */
   private RootedPath filename;
 
@@ -227,8 +217,6 @@
   protected Package(PackageIdentifier packageId, String runfilesPrefix) {
     this.packageIdentifier = packageId;
     this.workspaceName = runfilesPrefix;
-    this.nameFragment = packageId.getPackageFragment();
-    this.name = nameFragment.getPathString();
   }
 
   /** Returns this packages' identifier. */
@@ -454,14 +442,14 @@
    * may not be unique!
    */
   public String getName() {
-    return name;
+    return packageIdentifier.getPackageFragment().getPathString();
   }
 
   /**
    * Like {@link #getName}, but has type {@code PathFragment}.
    */
   public PathFragment getNameFragment() {
-    return nameFragment;
+    return packageIdentifier.getPackageFragment();
   }
 
   /**
@@ -595,12 +583,22 @@
       // it's invalid on Windows.
       suffix = "";
     } else if (filename.isDirectory()) {
-      suffix = "; however, a source directory of this name exists.  (Perhaps add "
-          + "'exports_files([\"" + targetName + "\"])' to " + name + "/BUILD, or define a "
-          + "filegroup?)";
+      suffix =
+          "; however, a source directory of this name exists.  (Perhaps add "
+              + "'exports_files([\""
+              + targetName
+              + "\"])' to "
+              + getName()
+              + "/BUILD, or define a "
+              + "filegroup?)";
     } else if (filename.exists()) {
-      suffix = "; however, a source file of this name exists.  (Perhaps add "
-          + "'exports_files([\"" + targetName + "\"])' to " + name + "/BUILD?)";
+      suffix =
+          "; however, a source file of this name exists.  (Perhaps add "
+              + "'exports_files([\""
+              + targetName
+              + "\"])' to "
+              + getName()
+              + "/BUILD?)";
     } else {
       suffix = SpellChecker.didYouMean(targetName, targets.keySet());
     }
@@ -618,7 +616,7 @@
     String msg =
         String.format(
             "target '%s' not declared in package '%s'%s defined by %s",
-            targetName, name, suffix, filename.asPath().getPathString());
+            targetName, getName(), suffix, filename.asPath().getPathString());
     return new NoSuchTargetException(label, msg);
   }
 
@@ -710,7 +708,9 @@
 
   @Override
   public String toString() {
-    return "Package(" + name + ")="
+    return "Package("
+        + getName()
+        + ")="
         + (targets != null ? getTargets(Rule.class) : "initializing...");
   }