[01/11] drill git commit: DRILL-5730: Mock testing improvements and interface improvements

[arina]

Repository: drill
Updated Branches:
  refs/heads/master 9926eda21 -> a9ea4ec1c


http://git-wip-us.apache.org/repos/asf/drill/blob/186536d5/logical/src/main/java/org/apache/drill/common/expression/LogicalExpression.java
----------------------------------------------------------------------
diff --git 
a/logical/src/main/java/org/apache/drill/common/expression/LogicalExpression.java
 
b/logical/src/main/java/org/apache/drill/common/expression/LogicalExpression.java
index 7b6001d..d491564 100644
--- 
a/logical/src/main/java/org/apache/drill/common/expression/LogicalExpression.java
+++ 
b/logical/src/main/java/org/apache/drill/common/expression/LogicalExpression.java
@@ -31,10 +31,8 @@ import org.apache.drill.common.types.TypeProtos.MajorType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -44,19 +42,19 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 //@JsonDeserialize(using = LogicalExpression.De.class)  // Excluded as we need 
to register this with the DrillConfig.
 @JsonSerialize(using = LogicalExpression.Se.class)
 public interface LogicalExpression extends Iterable<LogicalExpression>{
-  static final Logger logger = 
LoggerFactory.getLogger(LogicalExpression.class);
+  Logger logger = LoggerFactory.getLogger(LogicalExpression.class);
 
-  public abstract MajorType getMajorType();
+  MajorType getMajorType();
 
-  public <T, V, E extends Exception> T accept(ExprVisitor<T, V, E> visitor, V 
value) throws E;
+  <T, V, E extends Exception> T accept(ExprVisitor<T, V, E> visitor, V value) 
throws E;
 
-  public ExpressionPosition getPosition();
+  ExpressionPosition getPosition();
 
-  public int getSelfCost();
-  public int getCumulativeCost();
+  int getSelfCost();
+  int getCumulativeCost();
 
   @SuppressWarnings("serial")
-  public static class De extends StdDeserializer<LogicalExpression> {
+  class De extends StdDeserializer<LogicalExpression> {
     DrillConfig config;
 
     public De(DrillConfig config) {
@@ -65,15 +63,13 @@ public interface LogicalExpression extends 
Iterable<LogicalExpression>{
     }
 
     @Override
-    public LogicalExpression deserialize(JsonParser jp, DeserializationContext 
ctxt) throws IOException,
-        JsonProcessingException {
+    public LogicalExpression deserialize(JsonParser jp, DeserializationContext 
ctxt) throws IOException {
       String expr = jp.getText();
 
       if (expr == null || expr.isEmpty()) {
         return null;
       }
       try {
-        // logger.debug("Parsing expression string '{}'", expr);
         ExprLexer lexer = new ExprLexer(new ANTLRStringStream(expr));
         CommonTokenStream tokens = new CommonTokenStream(lexer);
         ExprParser parser = new ExprParser(tokens);
@@ -92,21 +88,18 @@ public interface LogicalExpression extends 
Iterable<LogicalExpression>{
   }
 
   @SuppressWarnings("serial")
-  public static class Se extends StdSerializer<LogicalExpression> {
+  class Se extends StdSerializer<LogicalExpression> {
 
     protected Se() {
       super(LogicalExpression.class);
     }
 
     @Override
-    public void serialize(LogicalExpression value, JsonGenerator jgen, 
SerializerProvider provider) throws IOException,
-        JsonGenerationException {
+    public void serialize(LogicalExpression value, JsonGenerator jgen, 
SerializerProvider provider) throws IOException {
       StringBuilder sb = new StringBuilder();
       ExpressionStringBuilder esb = new ExpressionStringBuilder();
       value.accept(esb, sb);
       jgen.writeString(sb.toString());
     }
-
   }
-
 }