No longer allow QueryExpressionMapper#map to throw a QueryException. This was unnecessary.

--
MOS_MIGRATED_REVID=126457804

10 files changed, 16 insertions, 20 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/query2/AbstractBlazeQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/AbstractBlazeQueryEnvironment.java
index c2d6e24816..0292f08458 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/AbstractBlazeQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/AbstractBlazeQueryEnvironment.java
@@ -148,8 +148,7 @@ public abstract class AbstractBlazeQueryEnvironment<T>
   @Override
   public abstract void close();
 
-  public QueryExpression transformParsedQuery(QueryExpression queryExpression)
-      throws QueryException {
+  public QueryExpression transformParsedQuery(QueryExpression queryExpression) {
     return queryExpression;
   }
 
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 ce5aa14181..1546b4e94e 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
@@ -243,7 +243,7 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target>
     }
 
     @Override
-    public QueryExpression map(FunctionExpression functionExpression) throws QueryException {
+    public QueryExpression map(FunctionExpression functionExpression) {
       if (functionExpression.getFunction().getName().equals(new RdepsFunction().getName())) {
         List<Argument> args = functionExpression.getArgs();
         QueryExpression universeExpression = args.get(0).getExpression();
@@ -267,8 +267,7 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target>
   }
 
   @Override
-  public final QueryExpression transformParsedQuery(QueryExpression queryExpression)
-      throws QueryException {
+  public final QueryExpression transformParsedQuery(QueryExpression queryExpression) {
     QueryExpression transformedQueryExpression = getTransformedQueryExpression(queryExpression);
     LOG.info(String.format(
         "transformed query [%s] to [%s]",
@@ -279,8 +278,7 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target>
     return transformedQueryExpression;
   }
 
-  protected QueryExpression getTransformedQueryExpression(QueryExpression queryExpression)
-      throws QueryException {
+  protected QueryExpression getTransformedQueryExpression(QueryExpression queryExpression) {
     if (universeScope.size() != 1) {
       return queryExpression;
     }
diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/BinaryOperatorExpression.java b/src/main/java/com/google/devtools/build/lib/query2/engine/BinaryOperatorExpression.java
index 241aa522c7..8da82b2f72 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/engine/BinaryOperatorExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/engine/BinaryOperatorExpression.java
@@ -92,7 +92,7 @@ public class BinaryOperatorExpression extends QueryExpression {
   }
 
   @Override
-  public QueryExpression getMapped(QueryExpressionMapper mapper) throws QueryException {
+  public QueryExpression getMapped(QueryExpressionMapper mapper) {
     return mapper.map(this);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/FunctionExpression.java b/src/main/java/com/google/devtools/build/lib/query2/engine/FunctionExpression.java
index 790abf9372..f6fcc27ef5 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/engine/FunctionExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/engine/FunctionExpression.java
@@ -60,7 +60,7 @@ public class FunctionExpression extends QueryExpression {
   }
 
   @Override
-  public QueryExpression getMapped(QueryExpressionMapper mapper) throws QueryException {
+  public QueryExpression getMapped(QueryExpressionMapper mapper) {
     return mapper.map(this);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/LetExpression.java b/src/main/java/com/google/devtools/build/lib/query2/engine/LetExpression.java
index b5805d4544..a1cc7a7cbf 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/engine/LetExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/engine/LetExpression.java
@@ -89,7 +89,7 @@ class LetExpression extends QueryExpression {
   }
 
   @Override
-  public QueryExpression getMapped(QueryExpressionMapper mapper) throws QueryException {
+  public QueryExpression getMapped(QueryExpressionMapper mapper) {
     return mapper.map(this);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/QueryExpression.java b/src/main/java/com/google/devtools/build/lib/query2/engine/QueryExpression.java
index 73688ec84d..2c6d331b3d 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/engine/QueryExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/engine/QueryExpression.java
@@ -102,7 +102,7 @@ public abstract class QueryExpression {
   public abstract void collectTargetPatterns(Collection<String> literals);
 
   /* Implementations should just be {@code return mapper.map(this)}. */
-  public abstract QueryExpression getMapped(QueryExpressionMapper mapper) throws QueryException;
+  public abstract QueryExpression getMapped(QueryExpressionMapper mapper);
 
   /**
    * Returns this query expression pretty-printed.
diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/QueryExpressionMapper.java b/src/main/java/com/google/devtools/build/lib/query2/engine/QueryExpressionMapper.java
index 896e80596f..f04ed1ec4b 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/engine/QueryExpressionMapper.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/engine/QueryExpressionMapper.java
@@ -26,12 +26,11 @@ import com.google.devtools.build.lib.query2.engine.QueryEnvironment.Argument;
  * override these methods in order to implement an arbitrary transformation.
  */
 public class QueryExpressionMapper {
-  public QueryExpression map(TargetLiteral targetLiteral) throws QueryException {
+  public QueryExpression map(TargetLiteral targetLiteral) {
     return targetLiteral;
   }
 
-  public QueryExpression map(BinaryOperatorExpression binaryOperatorExpression)
-      throws QueryException {
+  public QueryExpression map(BinaryOperatorExpression binaryOperatorExpression) {
     boolean changed = false;
     ImmutableList.Builder<QueryExpression> mappedOperandsBuilder = ImmutableList.builder();
     for (QueryExpression operand : binaryOperatorExpression.getOperands()) {
@@ -47,7 +46,7 @@ public class QueryExpressionMapper {
         : binaryOperatorExpression;
   }
 
-  public QueryExpression map(FunctionExpression functionExpression) throws QueryException {
+  public QueryExpression map(FunctionExpression functionExpression) {
     boolean changed = false;
     ImmutableList.Builder<Argument> mappedArgumentBuilder = ImmutableList.builder();
     for (Argument argument : functionExpression.getArgs()) {
@@ -71,7 +70,7 @@ public class QueryExpressionMapper {
         : functionExpression;
   }
 
-  public QueryExpression map(LetExpression letExpression) throws QueryException {
+  public QueryExpression map(LetExpression letExpression) {
     boolean changed = false;
     QueryExpression mappedVarExpr = letExpression.getVarExpr().getMapped(this);
     if (mappedVarExpr != letExpression.getVarExpr()) {
@@ -86,7 +85,7 @@ public class QueryExpressionMapper {
         : letExpression;
   }
 
-  public QueryExpression map(SetExpression setExpression) throws QueryException {
+  public QueryExpression map(SetExpression setExpression) {
     return setExpression;
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/SetExpression.java b/src/main/java/com/google/devtools/build/lib/query2/engine/SetExpression.java
index 8297829c63..1369d8ace6 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/engine/SetExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/engine/SetExpression.java
@@ -61,7 +61,7 @@ class SetExpression extends QueryExpression {
   }
 
   @Override
-  public QueryExpression getMapped(QueryExpressionMapper mapper) throws QueryException {
+  public QueryExpression getMapped(QueryExpressionMapper mapper) {
     return mapper.map(this);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/TargetLiteral.java b/src/main/java/com/google/devtools/build/lib/query2/engine/TargetLiteral.java
index b3f9b812fd..72847bf16d 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/engine/TargetLiteral.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/engine/TargetLiteral.java
@@ -67,7 +67,7 @@ public final class TargetLiteral extends QueryExpression {
   }
 
   @Override
-  public QueryExpression getMapped(QueryExpressionMapper mapper) throws QueryException {
+  public QueryExpression getMapped(QueryExpressionMapper mapper) {
     return mapper.map(this);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommand.java
index 1ec51f01b2..f3470d6015 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/QueryCommand.java
@@ -146,12 +146,12 @@ public final class QueryCommand implements BlazeCommand {
       QueryExpression expr;
       try {
         expr = QueryExpression.parse(query, queryEnv);
-        expr = queryEnv.transformParsedQuery(expr);
       } catch (QueryException e) {
         env.getReporter()
             .handle(Event.error(null, "Error while parsing '" + query + "': " + e.getMessage()));
         return ExitCode.COMMAND_LINE_ERROR;
       }
+      expr = queryEnv.transformParsedQuery(expr);
 
       PrintStream output = null;
       OutputFormatterCallback<Target> callback;