commit 331c76fbf15dcb24adb4c758e7f4371d030bf7d6
author jcater <jcater@google.com> Wed Apr 01 07:27:52 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Apr 01 07:28:54 2020 -0700
tree 8d6796ee5245b67c755c4c5646a54734b2288fbf
parent 693048da3632616560d3791eac128f49b529f378

Rename RecursivePkgKey.getRepository to getRepositoryName for consistency.

This fixes an odd problem with AutoCodec and interface jars.

PiperOrigin-RevId: 304180797

src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunction.java
index 004adcf..7543678 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunction.java
@@ -55,7 +55,7 @@
     ProcessPackageDirectoryResult packageExistenceAndSubdirDeps =
         processPackageDirectory.getPackageExistenceAndSubdirDeps(
             recursivePkgKey.getRootedPath(),
-            recursivePkgKey.getRepository(),
+            recursivePkgKey.getRepositoryName(),
             recursivePkgKey.getExcludedPaths(),
             env);
     if (env.valuesMissing()) {
@@ -68,7 +68,7 @@
               ImmutableList.of(
                   CollectTargetsInPackageValue.key(
                       PackageIdentifier.create(
-                          recursivePkgKey.getRepository(),
+                          recursivePkgKey.getRepositoryName(),
                           recursivePkgKey.getRootedPath().getRootRelativePath()),
                       filteringPolicy)),
               keysToRequest);

src/main/java/com/google/devtools/build/lib/skyframe/PrepareTestSuitesUnderDirectoryFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareTestSuitesUnderDirectoryFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareTestSuitesUnderDirectoryFunction.java
index 843073a..f26ec1e 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareTestSuitesUnderDirectoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareTestSuitesUnderDirectoryFunction.java
@@ -42,7 +42,10 @@
         new ProcessPackageDirectory(directories, PrepareTestSuitesUnderDirectoryValue::key);
     ProcessPackageDirectoryResult packageExistenceAndSubdirDeps =
         processPackageDirectory.getPackageExistenceAndSubdirDeps(
-            argument.getRootedPath(), argument.getRepository(), argument.getExcludedPaths(), env);
+            argument.getRootedPath(),
+            argument.getRepositoryName(),
+            argument.getExcludedPaths(),
+            env);
     if (env.valuesMissing()) {
       return null;
     }
@@ -53,7 +56,7 @@
               ImmutableList.of(
                   CollectTestSuitesInPackageValue.key(
                       PackageIdentifier.create(
-                          argument.getRepository(),
+                          argument.getRepositoryName(),
                           argument.getRootedPath().getRootRelativePath()))),
               keysToRequest);
     }

src/main/java/com/google/devtools/build/lib/skyframe/RecursiveDirectoryTraversalFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveDirectoryTraversalFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveDirectoryTraversalFunction.java
index 007702a..5fabef0 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveDirectoryTraversalFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveDirectoryTraversalFunction.java
@@ -51,7 +51,7 @@
     return new ProcessPackageDirectory(directories, this::getSkyKeyForSubdirectory)
         .getPackageExistenceAndSubdirDeps(
             recursivePkgKey.getRootedPath(),
-            recursivePkgKey.getRepository(),
+            recursivePkgKey.getRepositoryName(),
             recursivePkgKey.getExcludedPaths(),
             env);
   }
@@ -135,7 +135,7 @@
       PathFragment rootRelativePath = recursivePkgKey.getRootedPath().getRootRelativePath();
       SkyKey packageErrorMessageKey =
           PackageErrorMessageValue.key(
-              PackageIdentifier.create(recursivePkgKey.getRepository(), rootRelativePath));
+              PackageIdentifier.create(recursivePkgKey.getRepositoryName(), rootRelativePath));
       Map<SkyKey, SkyValue> dependentSkyValues =
           env.getValues(Iterables.concat(childDeps, ImmutableList.of(packageErrorMessageKey)));
       if (env.valuesMissing()) {

src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgKey.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgKey.java
index 9a5a12f..aeb49d4 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgKey.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgKey.java
@@ -50,7 +50,7 @@
     this.excludedPaths = Preconditions.checkNotNull(excludedPaths);
   }
 
-  public RepositoryName getRepository() {
+  public RepositoryName getRepositoryName() {
     return repositoryName;
   }