Minor formatter cleanup

Parth-Brahmbhatt · May 28, 2014 · 8c571c3 · 8c571c3
1 parent ce6cf9f
commit 8c571c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/ExpressionFormatter.java b/presto-parser/src/main/java/com/facebook/presto/sql/ExpressionFormatter.java
@@ -82,7 +82,7 @@ public static Function<Expression, String> expressionFormatterFunction()
  @Override
  public String apply(Expression input)
  {
- return ExpressionFormatter.formatExpression(input);
+ return formatExpression(input);
  }
  };
  }
@@ -162,7 +162,7 @@ protected String visitDoubleLiteral(DoubleLiteral node, Void context)
  @Override
  protected String visitGenericLiteral(GenericLiteral node, Void context)
  {
- return "" + node.getType() + " '" + node.getValue() + "'";
+ return node.getType() + " '" + node.getValue() + "'";
  }
 
  @Override

diff --git a/presto-parser/src/main/java/com/facebook/presto/sql/SqlFormatter.java b/presto-parser/src/main/java/com/facebook/presto/sql/SqlFormatter.java
@@ -49,7 +49,6 @@
 import com.facebook.presto.sql.tree.WithQuery;
 import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
-import com.google.common.collect.Iterables;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -60,6 +59,8 @@
 import static com.facebook.presto.sql.ExpressionFormatter.formatSortItems;
 import static com.facebook.presto.sql.ExpressionFormatter.formatStringLiteral;
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static com.google.common.collect.Iterables.transform;
 
 public final class SqlFormatter
 {
@@ -158,7 +159,7 @@ protected Void visitQuerySpecification(QuerySpecification node, Integer indent)
  }
  else {
  builder.append(' ');
- process(Iterables.getOnlyElement(node.getFrom()), indent);
+ process(getOnlyElement(node.getFrom()), indent);
  }
  }
 
@@ -170,7 +171,7 @@ protected Void visitQuerySpecification(QuerySpecification node, Integer indent)
  }
 
  if (!node.getGroupBy().isEmpty()) {
- append(indent, "GROUP BY " + Joiner.on(", ").join(Iterables.transform(node.getGroupBy(), expressionFormatterFunction())))
+ append(indent, "GROUP BY " + Joiner.on(", ").join(transform(node.getGroupBy(), expressionFormatterFunction())))
  .append('\n');
  }
 
@@ -212,7 +213,7 @@ protected Void visitSelect(Select node, Integer indent)
  }
  else {
  builder.append(' ');
- process(Iterables.getOnlyElement(node.getSelectItems()), indent);
+ process(getOnlyElement(node.getSelectItems()), indent);
  }
 
  builder.append('\n');
@@ -343,7 +344,7 @@ protected Void visitValues(Values node, Integer indent)
  protected Void visitRow(Row node, Integer indent)
  {
  builder.append('(')
- .append(Joiner.on(", ").join(Iterables.transform(node.getItems(), expressionFormatterFunction())))
+ .append(Joiner.on(", ").join(transform(node.getItems(), expressionFormatterFunction())))
  .append(')');
 
  return null;