refactor params

Author: vertical-blank

src/main/java/com/github/vertical_blank/sqlformatter/SqlFormatter.java

@@ -82,20 +82,20 @@ public String format(String query, FormatConfig cfg) {
 
     public String format(String query, String indent, List<?> params) {
       return format(
-          query, FormatConfig.builder().indent(indent).params(Params.Holder.of(params)).build());
+          query, FormatConfig.builder().indent(indent).params(new Params(params)).build());
     }
 
     public String format(String query, List<?> params) {
-      return format(query, FormatConfig.builder().params(Params.Holder.of(params)).build());
+      return format(query, FormatConfig.builder().params(new Params(params)).build());
     }
 
     public String format(String query, String indent, Map<String, ?> params) {
       return format(
-          query, FormatConfig.builder().indent(indent).params(Params.Holder.of(params)).build());
+          query, FormatConfig.builder().indent(indent).params(new Params(params)).build());
     }
 
     public String format(String query, Map<String, ?> params) {
-      return format(query, FormatConfig.builder().params(Params.Holder.of(params)).build());
+      return format(query, FormatConfig.builder().params(new Params(params)).build());
     }
 
     public String format(String query, String indent) {

src/main/java/com/github/vertical_blank/sqlformatter/core/AbstractFormatter.java

@@ -21,7 +21,7 @@ public AbstractFormatter(FormatConfig cfg) {
     this.cfg = cfg;
     this.indentation = new Indentation(cfg.indent);
     this.inlineBlock = new InlineBlock(cfg.maxColumnLength);
-    this.params = new Params(cfg.params);
+    this.params = cfg.params;
     this.previousReservedToken = null;
     this.index = 0;
   }

src/main/java/com/github/vertical_blank/sqlformatter/core/FormatConfig.java

@@ -11,19 +11,19 @@ public class FormatConfig {
 
   public final String indent;
   public final int maxColumnLength;
-  public final Params.Holder params;
+  public final Params params;
   public final boolean uppercase;
   public final Integer linesBetweenQueries;
 
   FormatConfig(
       String indent,
       int maxColumnLength,
-      Params.Holder params,
+      Params params,
       boolean uppercase,
       Integer linesBetweenQueries) {
     this.indent = indent;
     this.maxColumnLength = maxColumnLength;
-    this.params = params;
+    this.params = params == null ? Params.EMPTY : params;
     this.uppercase = uppercase;
     this.linesBetweenQueries = linesBetweenQueries;
   }
@@ -41,7 +41,7 @@ public static FormatConfigBuilder builder() {
   public static class FormatConfigBuilder {
     private String indent = DEFAULT_INDENT;
     private int maxColumnLength = DEFAULT_COLUMN_MAX_LENGTH;
-    private Params.Holder params;
+    private Params params;
     private boolean uppercase;
     private Integer linesBetweenQueries;
 
@@ -69,7 +69,7 @@ public FormatConfigBuilder maxColumnLength(int maxColumnLength) {
      * @param params Collection of params for placeholder replacement
      * @return This
      */
-    public FormatConfigBuilder params(Params.Holder params) {
+    public FormatConfigBuilder params(Params params) {
       this.params = params;
       return this;
     }
@@ -79,15 +79,15 @@ public FormatConfigBuilder params(Params.Holder params) {
      * @return This
      */
     public FormatConfigBuilder params(Map<String, ?> params) {
-      return this.params(Params.Holder.of(params));
+      return params(new Params(params));
     }
 
     /**
      * @param params Collection of params for placeholder replacement
      * @return This
      */
     public FormatConfigBuilder params(List<?> params) {
-      return this.params(Params.Holder.of(params));
+      return params(new Params(params));
     }
 
     /**

src/main/java/com/github/vertical_blank/sqlformatter/core/Params.java

@@ -8,7 +8,40 @@
 /** Handles placeholder replacement with given params. */
 public class Params {
 
-  public interface Holder {
+  public static Params EMPTY = new Params();
+
+  private Holder params;
+
+  /** @param params query param */
+  public Params(Map<String, ?> params) {
+    this.params = new NamedParamHolder(params);
+  }
+
+  /** @param params query param */
+  public Params(List<?> params) {
+    this.params = new IndexedParamHolder(params);
+  }
+
+  private Params() {}
+
+  /**
+   * Returns param value that matches given placeholder with param key.
+   *
+   * @param token token.key Placeholder key token.value Placeholder value
+   * @return param or token.value when params are missing
+   */
+  Object get(Token token) {
+    if (this.params == null || this.params.isEmpty()) {
+      return token.value;
+    }
+    if (!(token.key == null || token.key.isEmpty())) {
+      return this.params.getByName(token.key);
+    } else {
+      return params.get();
+    }
+  }
+
+  private interface Holder {
     boolean isEmpty();
 
     Object get();
@@ -32,8 +65,8 @@ static Holder of(List<?> params) {
     }
   }
 
-  public static class NamedParamHolder implements Holder {
-    private Map<String, ?> params;
+  private static class NamedParamHolder implements Holder {
+    private final Map<String, ?> params;
 
     NamedParamHolder(Map<String, ?> params) {
       this.params = params;
@@ -59,8 +92,8 @@ public String toString() {
     }
   }
 
-  public static class IndexedParamHolder implements Holder {
-    private Queue<?> params;
+  private static class IndexedParamHolder implements Holder {
+    private final Queue<?> params;
 
     IndexedParamHolder(List<?> params) {
       this.params = new PriorityQueue<>(params);
@@ -86,42 +119,6 @@ public String toString() {
     }
   }
 
-  private Holder params;
-  //    private int index;
-
-  /** @param params query param */
-  public Params(Map<String, ?> params) {
-    this.params = new NamedParamHolder(params);
-  }
-
-  /** @param params query param */
-  public Params(List<?> params) {
-    this.params = new IndexedParamHolder(params);
-    //        this.index = 0;
-  }
-
-  /** @param holder query param holder */
-  public Params(Holder holder) {
-    this.params = holder;
-  }
-
-  /**
-   * Returns param value that matches given placeholder with param key.
-   *
-   * @param token token.key Placeholder key token.value Placeholder value
-   * @return param or token.value when params are missing
-   */
-  Object get(Token token) {
-    if (this.params == null || this.params.isEmpty()) {
-      return token.value;
-    }
-    if (!(token.key == null || token.key.isEmpty())) {
-      return this.params.getByName(token.key);
-    } else {
-      return params.get();
-    }
-  }
-
   @Override
   public String toString() {
     return String.valueOf(this.params);