#30 simplify condition

Blynk-Technologies · Sep 1, 2019 · 8bebee6 · 8bebee6
1 parent cfc6dae
commit 8bebee6
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/main/java/ru/yandex/clickhouse/ClickHousePreparedStatementParameter.java b/src/main/java/ru/yandex/clickhouse/ClickHousePreparedStatementParameter.java
@@ -12,7 +12,7 @@ public final class ClickHousePreparedStatementParameter {
     private final String stringValue;
     private final boolean quoteNeeded;
 
-    public static ClickHousePreparedStatementParameter fromObject(Object x,
+    static ClickHousePreparedStatementParameter fromObject(Object x,
         TimeZone dateTimeZone, TimeZone dateTimeTimeZone) {
         if (x == null) {
             return NULL_PARAM;
@@ -22,24 +22,25 @@ public static ClickHousePreparedStatementParameter fromObject(Object x,
             ClickHouseValueFormatter.needsQuoting(x));
     }
 
-    public static ClickHousePreparedStatementParameter nullParameter() {
+    static ClickHousePreparedStatementParameter nullParameter() {
         return NULL_PARAM;
     }
 
-    public ClickHousePreparedStatementParameter(String stringValue,
-        boolean quoteNeeded) {
+    ClickHousePreparedStatementParameter(String stringValue, boolean quoteNeeded) {
         this.stringValue = stringValue == null
             ? ClickHouseValueFormatter.NULL_MARKER
             : stringValue;
         this.quoteNeeded = quoteNeeded;
     }
 
     String getRegularValue() {
-        return !ClickHouseValueFormatter.NULL_MARKER.equals(stringValue)
-            ? quoteNeeded
-                ? "'" + stringValue + "'"
-                : stringValue
-            : "null";
+        if (ClickHouseValueFormatter.NULL_MARKER.equals(stringValue)) {
+            return "null";
+        }
+        if (quoteNeeded) {
+            return "'" + stringValue + "'";
+        }
+        return stringValue;
     }
 
     String getBatchValue() {