commit 54a16f096141710c7cad256d9f715be9fceb71a9
author Nathan Harmata <nharmata@google.com> Tue Dec 13 17:49:27 2016 +0000
committer John Cater <jcater@google.com> Tue Dec 13 21:04:55 2016 +0000
tree 810df81bd020d92fac1170648f6e47cf8e96f17f
parent b79e2f689a58d2943ed84c9bcebfb7c538ad6b07

Rephrase query transformation in terms of composition of QueryExpressionMappers.

--
PiperOrigin-RevId: 141904124
MOS_MIGRATED_REVID=141904124

src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java

diff --git a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
index 78a850b..9a52eba 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
@@ -308,7 +308,8 @@
 
   @Override
   public final QueryExpression transformParsedQuery(QueryExpression queryExpression) {
-    QueryExpression transformedQueryExpression = getTransformedQueryExpression(queryExpression);
+    QueryExpressionMapper mapper = getQueryExpressionMapper();
+    QueryExpression transformedQueryExpression = queryExpression.getMapped(mapper);
     LOG.info(String.format(
         "transformed query [%s] to [%s]",
         Ascii.truncate(
@@ -318,14 +319,13 @@
     return transformedQueryExpression;
   }
 
-  protected QueryExpression getTransformedQueryExpression(QueryExpression queryExpression) {
+  protected QueryExpressionMapper getQueryExpressionMapper() {
     if (universeScope.size() != 1) {
-      return queryExpression;
+      return QueryExpressionMapper.identity();
     }
     TargetPattern.Parser targetPatternParser = new TargetPattern.Parser(parserPrefix);
     String universeScopePattern = Iterables.getOnlyElement(universeScope);
-    return queryExpression.getMapped(
-        new RdepsToAllRdepsQueryExpressionMapper(targetPatternParser, universeScopePattern));
+    return new RdepsToAllRdepsQueryExpressionMapper(targetPatternParser, universeScopePattern);
   }
 
   @Override