Convert ArrayUtils.join to StringUtils.join

alexfu · Mar 28, 2015 · 3265fed · 3265fed
1 parent 4d1aa7b
commit 3265fed
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 30 deletions.
diff --git a/src/main/java/com/alexfu/sqlitequerybuilder/SelectType.java b/src/main/java/com/alexfu/sqlitequerybuilder/SelectType.java
@@ -1,6 +1,6 @@
 package com.alexfu.sqlitequerybuilder;
 
-import com.alexfu.sqlitequerybuilder.utils.ArrayUtils;
+import com.alexfu.sqlitequerybuilder.utils.StringUtils;
 
 public class SelectType implements SegmentBuilder {
 
@@ -26,6 +26,6 @@ public static SelectType ALL(String... fields) {
 
   @Override
   public String build() {
-    return ArrayUtils.join(" ", type, ArrayUtils.join(",", fields));
+    return StringUtils.join(" ", type.toString(), StringUtils.join(",", fields));
   }
 }
diff --git a/src/main/java/com/alexfu/sqlitequerybuilder/builder/JoinOnBuilder.java b/src/main/java/com/alexfu/sqlitequerybuilder/builder/JoinOnBuilder.java
@@ -1,7 +1,7 @@
 package com.alexfu.sqlitequerybuilder.builder;
 
 import com.alexfu.sqlitequerybuilder.SegmentBuilder;
-import com.alexfu.sqlitequerybuilder.utils.ArrayUtils;
+import com.alexfu.sqlitequerybuilder.utils.StringUtils;
 
 public class JoinOnBuilder implements SegmentBuilder {
 
@@ -23,6 +23,6 @@ public SelectJoinBuilder join(String table) {
 
   @Override
   public String build() {
-    return ArrayUtils.join(" ", prefix.build(), "ON", condition);
+    return StringUtils.join(" ", prefix.build(), "ON", condition);
   }
 }
diff --git a/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectAndBuilder.java b/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectAndBuilder.java
@@ -1,7 +1,7 @@
 package com.alexfu.sqlitequerybuilder.builder;
 
 import com.alexfu.sqlitequerybuilder.SegmentBuilder;
-import com.alexfu.sqlitequerybuilder.utils.ArrayUtils;
+import com.alexfu.sqlitequerybuilder.utils.StringUtils;
 
 public class SelectAndBuilder implements SegmentBuilder {
 
@@ -15,6 +15,6 @@ public SelectAndBuilder(SelectWhereBuilder prefix, String condition) {
 
   @Override
   public String build() {
-    return ArrayUtils.join(" ", prefix.build(), "AND", condition);
+    return StringUtils.join(" ", prefix.build(), "AND", condition);
   }
 }
diff --git a/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectFieldBuilder.java b/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectFieldBuilder.java
@@ -1,6 +1,6 @@
 package com.alexfu.sqlitequerybuilder.builder;
 
-import com.alexfu.sqlitequerybuilder.utils.ArrayUtils;
+import com.alexfu.sqlitequerybuilder.utils.StringUtils;
 
 public class SelectFieldBuilder extends SelectBuilder {
 
@@ -12,6 +12,6 @@ public SelectFieldBuilder(String...fields) {
 
   @Override
   public String build() {
-    return ArrayUtils.join(" ", "SELECT", ArrayUtils.join(",", fields));
+    return StringUtils.join(" ", "SELECT", StringUtils.join(",", fields));
   }
 }
diff --git a/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectFromBuilder.java b/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectFromBuilder.java
@@ -1,7 +1,7 @@
 package com.alexfu.sqlitequerybuilder.builder;
 
 import com.alexfu.sqlitequerybuilder.SegmentBuilder;
-import com.alexfu.sqlitequerybuilder.utils.ArrayUtils;
+import com.alexfu.sqlitequerybuilder.utils.StringUtils;
 
 public class SelectFromBuilder implements SegmentBuilder {
 
@@ -31,6 +31,6 @@ public SelectGroupByBuilder groupBy(String column) {
 
   @Override
   public String build() {
-    return ArrayUtils.join(" ", prefix.build(), "FROM", ArrayUtils.join(",", tables));
+    return StringUtils.join(" ", prefix.build(), "FROM", StringUtils.join(",", tables));
   }
 }
diff --git a/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectGroupByBuilder.java b/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectGroupByBuilder.java
@@ -1,7 +1,7 @@
 package com.alexfu.sqlitequerybuilder.builder;
 
 import com.alexfu.sqlitequerybuilder.SegmentBuilder;
-import com.alexfu.sqlitequerybuilder.utils.ArrayUtils;
+import com.alexfu.sqlitequerybuilder.utils.StringUtils;
 
 public class SelectGroupByBuilder implements SegmentBuilder {
 
@@ -15,6 +15,6 @@ public SelectGroupByBuilder(SelectFromBuilder prefix, String column) {
 
   @Override
   public String build() {
-    return ArrayUtils.join(" ", prefix.build(), "GROUP BY", column);
+    return StringUtils.join(" ", prefix.build(), "GROUP BY", column);
   }
 }
diff --git a/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectJoinBuilder.java b/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectJoinBuilder.java
@@ -2,7 +2,7 @@
 
 import com.alexfu.sqlitequerybuilder.SegmentBuilder;
 
-import static com.alexfu.sqlitequerybuilder.utils.ArrayUtils.join;
+import static com.alexfu.sqlitequerybuilder.utils.StringUtils.join;
 
 public class SelectJoinBuilder implements SegmentBuilder {
 

diff --git a/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectLimitBuilder.java b/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectLimitBuilder.java
@@ -1,7 +1,7 @@
 package com.alexfu.sqlitequerybuilder.builder;
 
 import com.alexfu.sqlitequerybuilder.SegmentBuilder;
-import com.alexfu.sqlitequerybuilder.utils.ArrayUtils;
+import com.alexfu.sqlitequerybuilder.utils.StringUtils;
 
 public class SelectLimitBuilder implements SegmentBuilder {
 
@@ -23,12 +23,12 @@ public SelectLimitBuilder offset(int offset) {
   public String build() {
     String offsetString = null;
     if (offset != -1) {
-      offsetString = ArrayUtils.join(" ", "OFFSET", offset);
+      offsetString = StringUtils.join(" ", "OFFSET", String.valueOf(offset));
     }
 
-    String result = ArrayUtils.join(" ", prefix.build(), "LIMIT", limit);
+    String result = StringUtils.join(" ", prefix.build(), "LIMIT", String.valueOf(limit));
     if (offsetString != null) {
-      result = ArrayUtils.join(" ", result, offsetString);
+      result = StringUtils.join(" ", result, offsetString);
     }
     return result;
   }

diff --git a/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectOrderByBuilder.java b/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectOrderByBuilder.java
@@ -1,7 +1,7 @@
 package com.alexfu.sqlitequerybuilder.builder;
 
 import com.alexfu.sqlitequerybuilder.SegmentBuilder;
-import com.alexfu.sqlitequerybuilder.utils.ArrayUtils;
+import com.alexfu.sqlitequerybuilder.utils.StringUtils;
 
 public class SelectOrderByBuilder implements SegmentBuilder {
 
@@ -23,6 +23,6 @@ public SelectOrderTermBuilder desc() {
 
   @Override
   public String build() {
-    return ArrayUtils.join(" ", prefix.build(), "ORDER BY", column);
+    return StringUtils.join(" ", prefix.build(), "ORDER BY", column);
   }
 }
diff --git a/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectOrderTermBuilder.java b/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectOrderTermBuilder.java
@@ -1,7 +1,7 @@
 package com.alexfu.sqlitequerybuilder.builder;
 
 import com.alexfu.sqlitequerybuilder.SegmentBuilder;
-import com.alexfu.sqlitequerybuilder.utils.ArrayUtils;
+import com.alexfu.sqlitequerybuilder.utils.StringUtils;
 
 public class SelectOrderTermBuilder implements SegmentBuilder {
 
@@ -23,6 +23,6 @@ public SelectLimitBuilder limit(int limit) {
 
   @Override
   public String build() {
-    return ArrayUtils.join(" ", prefix.build(), term);
+    return StringUtils.join(" ", prefix.build(), term.toString());
   }
 }
diff --git a/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectTypeBuilder.java b/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectTypeBuilder.java
@@ -1,7 +1,7 @@
 package com.alexfu.sqlitequerybuilder.builder;
 
 import com.alexfu.sqlitequerybuilder.SelectType;
-import com.alexfu.sqlitequerybuilder.utils.ArrayUtils;
+import com.alexfu.sqlitequerybuilder.utils.StringUtils;
 
 public class SelectTypeBuilder extends SelectBuilder {
 
@@ -13,6 +13,6 @@ public SelectTypeBuilder(SelectType type) {
 
   @Override
   public String build() {
-    return ArrayUtils.join(" ", "SELECT", type.build());
+    return StringUtils.join(" ", "SELECT", type.build());
   }
 }
diff --git a/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectWhereBuilder.java b/src/main/java/com/alexfu/sqlitequerybuilder/builder/SelectWhereBuilder.java
@@ -2,7 +2,7 @@
 
 import com.alexfu.sqlitequerybuilder.SegmentBuilder;
 
-import static com.alexfu.sqlitequerybuilder.utils.ArrayUtils.join;
+import static com.alexfu.sqlitequerybuilder.utils.StringUtils.join;
 
 public class SelectWhereBuilder implements SegmentBuilder {
 

diff --git a/.../sqlitequerybuilder/utils/ArrayUtils.java → ...sqlitequerybuilder/utils/StringUtils.java b/.../sqlitequerybuilder/utils/ArrayUtils.java → ...sqlitequerybuilder/utils/StringUtils.java
@@ -1,10 +1,10 @@
 package com.alexfu.sqlitequerybuilder.utils;
 
-public class ArrayUtils {
-  public static String join(String delimeter, Object...array) {
+public class StringUtils {
+  public static String join(String delimeter, String...array) {
     String result = "";
     for (int i = 0, size = array.length; i < size; i++) {
-      result += array[i].toString();
+      result += array[i];
       if (i < size-1) {
         result += delimeter;
       }

diff --git a/...fu/sqlitequerybuilder/ArrayUtilsTest.java → ...u/sqlitequerybuilder/StringUtilsTest.java b/...fu/sqlitequerybuilder/ArrayUtilsTest.java → ...u/sqlitequerybuilder/StringUtilsTest.java
@@ -1,17 +1,17 @@
 package com.alexfu.sqlitequerybuilder;
 
-import com.alexfu.sqlitequerybuilder.utils.ArrayUtils;
+import com.alexfu.sqlitequerybuilder.utils.StringUtils;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class ArrayUtilsTest {
+public class StringUtilsTest {
   @Test
   public void joinsStringsWithCommaDelimeter() {
     String[] strings = {"One", "Two", "Three", "Four", "Five"};
 
     String expected = "One,Two,Three,Four,Five";
-    String result = ArrayUtils.join(",", strings);
+    String result = StringUtils.join(",", strings);
     assertEquals(expected, result);
   }
 }