Merge pull request #1 in TC/finekit from ~ZHAOJUNZHE/finekit:master to master

* commit '20cad8dcad923c4288a09899f5eff94fc853b934':
  feat: 新增常量设置
  feat:对stringkit进行方法的补充，增加相应的单测
  feat: 增加arrayKit内容

src/main/java/com/fanruan/api/util/ArrayKit.java

@@ -1,9 +1,49 @@
 package com.fanruan.api.util;
 
+import java.io.IOException;
+import java.lang.reflect.Array;
+import com.fr.stable.ArrayUtils;
+
 /**
  * @author richie
  * @version 10.0
  * Created by richie on 2019-08-16
  */
 public class ArrayKit {
+    public static final String[] EMPTY_STRING_ARRAY = new String[0];
+    /**
+     * 判断数组是否为空
+     *
+     * @param array 源数组
+     * @return 返回数组判断为空的结果
+     */
+    public static boolean isEmpty(Object[] array) {
+        return ArrayUtils.isEmpty(array);
+    }
+    /**
+     * 移除目标数组中对应下标的元素
+     *
+     * @param array 源数组
+     * @param number 要移除的元素的下标
+     * @return 返回移除元素后的数组
+     */
+    public static <T> T[] remove(T[] array, int number) {
+        return ArrayUtils.remove(array, number);
+    }
+    /**
+     * 给目标数组中增加单个元素
+     *
+     * @param array 源数组
+     * @param element 要增加的元素
+     * @return 返回增加元素后的数组
+     */
+    public static <T> T[] add(T[] array, T element) {return ArrayUtils.add(array, element);};
+    /**
+     * 给目标数组中增加多个元素
+     *
+     * @param array 源数组
+     * @param element 要增加的元素
+     * @return 返回增加元素后的数组
+     */
+    public static <T> T[] addAll(T[] array, T... element){return ArrayUtils.addAll(array, element);};
 }

src/main/java/com/fanruan/api/util/StringKit.java

@@ -85,5 +85,14 @@ public class StringKit {
     public static boolean isNotBlank(String text) {
         return StringUtils.isNotBlank(text);
     }
+    /**
+     * 对字符串做trim操作
+     *
+     * @param string 源字符串
+     * @return 返回操作后的字符串
+     */
+    public static String trim(String string) {
+        return StringUtils.trim(string);
+    }
 
 }

src/main/java/com/fanruan/constants/Constants.java

@@ -0,0 +1,6 @@
+package com.fanruan.constants;
+import com.fr.stable.EncodeConstants;
+
+public class Constants {
+    public static final String ENCODING_UTF_8 = EncodeConstants.ENCODING_UTF_8;
+}

src/test/java/com/fanruan/api/util/ArrayKitTest.java

@@ -0,0 +1,101 @@
+package com.fanruan.api.util;
+import com.fr.general.Inter;
+import com.fr.stable.ArrayUtils;
+import com.fanruan.api.Prepare;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ArrayKitTest extends Prepare {
+    @Test
+    public void isEmpty() throws Exception{
+        Object emptyArray []=new Object[0];
+        Object notEmptyArray [] = new Object[1];
+        Assert.assertEquals(ArrayKit.isEmpty(emptyArray), true);
+        Assert.assertEquals(ArrayKit.isEmpty(notEmptyArray), false);
+
+    }
+
+    @Test
+    public void remove() throws Exception{
+        Integer intTestArray [] = {1,2,3,4};
+        Integer intTestResult [] = {1,2,3};
+        Boolean booleanTestArray [] = {true, true, true, false};
+        Boolean booleanTestResult [] = {true, true, true};
+        Byte byteTestArray [] = {100,101,102,103};
+        Byte byteTestResult [] = {100,101,102};
+        Character charTestArray [] = {'a','b','c','d'};
+        Character charTestResult [] = {'a','b','c'};
+        Double doubleTestArray [] = {1.1,2.2,3.3,4.4};
+        Double doubleTestResult [] = {1.1,2.2,3.3};
+        Float floatTestArray [] = {1.1f,2.2f,3.3f,4.4f};
+        Float floatTestResult [] = {1.1f,2.2f,3.3f};
+        Long longTestArray [] = {1L,2L,3L,4L};
+        Long longTestResult [] = {1L,2L,3L};
+        Short shortTestArray [] = {1,2,3,4};
+        Short shortTestResult [] = {1,2,3};
+        Assert.assertEquals(ArrayKit.remove(intTestArray, 3), intTestResult);
+        Assert.assertEquals(ArrayKit.remove(booleanTestArray, 3), booleanTestResult);
+        Assert.assertEquals(ArrayKit.remove(byteTestArray, 3), byteTestResult);
+        Assert.assertEquals(ArrayKit.remove(charTestArray, 3), charTestResult);
+        Assert.assertEquals(ArrayKit.remove(doubleTestArray, 3), doubleTestResult);
+        Assert.assertEquals(ArrayKit.remove(floatTestArray, 3), floatTestResult);
+        Assert.assertEquals(ArrayKit.remove(longTestArray, 3), longTestResult);
+        Assert.assertEquals(ArrayKit.remove(shortTestArray, 3), shortTestResult);
+    }
+
+    @Test
+    public void add() throws Exception{
+        Integer intTestArray [] = {1,2,3,4};
+        Integer intTestResult [] = {1,2,3,4,5};
+        Boolean booleanTestArray [] = {true, true, true, false};
+        Boolean booleanTestResult [] = {true, true, true, false, true};
+        Byte byteTestArray [] = {1};
+        Byte byteTestResult [] = {1,0};
+        Character charTestArray [] = {'a','b','c','d'};
+        Character charTestResult [] = {'a','b','c','d','e'};
+        Double doubleTestArray [] = {1.1,2.2,3.3,4.4};
+        Double doubleTestResult [] = {1.1,2.2,3.3,4.4,5.5};
+        Float floatTestArray [] = {1.1f,2.2f,3.3f,4.4f};
+        Float floatTestResult [] = {1.1f,2.2f,3.3f,4.4f,5.5f};
+        Long longTestArray [] = {1L,2L,3L,4L};
+        Long longTestResult [] = {1L,2L,3L,4L,5L};
+        Short shortTestArray [] = {1,2,3,4};
+        Short shortTestResult [] = {1,2,3,4,5};
+        Assert.assertEquals(ArrayKit.add(intTestArray, 5), intTestResult);
+        Assert.assertEquals(ArrayKit.add(booleanTestArray, true), booleanTestResult);
+        Assert.assertEquals(ArrayKit.add(byteTestArray, new Byte("0")), byteTestResult);
+        Assert.assertEquals(ArrayKit.add(charTestArray, 'e'), charTestResult);
+        Assert.assertEquals(ArrayKit.add(doubleTestArray, 5.5), doubleTestResult);
+        Assert.assertEquals(ArrayKit.add(floatTestArray, 5.5f), floatTestResult);
+        Assert.assertEquals(ArrayKit.add(longTestArray, 5L), longTestResult);
+        Assert.assertEquals(ArrayKit.add(shortTestArray, new Short("5")), shortTestResult);
+    }
+
+    @Test
+    public void addAll() throws Exception{
+        Integer intTestArray [] = {1,2,3,4};
+        Integer intTestResult [] = {1,2,3,4,5,6};
+        Boolean booleanTestArray [] = {true, true, true, false};
+        Boolean booleanTestResult [] = {true, true, true, false, true,true};
+        Byte byteTestArray [] = {1};
+        Byte byteTestResult [] = {1,0,0};
+        Character charTestArray [] = {'a','b','c','d'};
+        Character charTestResult [] = {'a','b','c','d','e','f'};
+        Double doubleTestArray [] = {1.1,2.2,3.3,4.4};
+        Double doubleTestResult [] = {1.1,2.2,3.3,4.4,5.5,6.6};
+        Float floatTestArray [] = {1.1f,2.2f,3.3f,4.4f};
+        Float floatTestResult [] = {1.1f,2.2f,3.3f,4.4f,5.5f,6.6f};
+        Long longTestArray [] = {1L,2L,3L,4L};
+        Long longTestResult [] = {1L,2L,3L,4L,5L,6L};
+        Short shortTestArray [] = {1,2,3,4};
+        Short shortTestResult [] = {1,2,3,4,5,6};
+        Assert.assertEquals(ArrayKit.addAll(intTestArray, 5,6), intTestResult);
+        Assert.assertEquals(ArrayKit.addAll(booleanTestArray, true, true), booleanTestResult);
+        Assert.assertEquals(ArrayKit.addAll(byteTestArray, new Byte("0"), new Byte("0")), byteTestResult);
+        Assert.assertEquals(ArrayKit.addAll(charTestArray, 'e','f'), charTestResult);
+        Assert.assertEquals(ArrayKit.addAll(doubleTestArray, 5.5,6.6), doubleTestResult);
+        Assert.assertEquals(ArrayKit.addAll(floatTestArray, 5.5f,6.6f), floatTestResult);
+        Assert.assertEquals(ArrayKit.addAll(longTestArray, 5L,6L), longTestResult);
+        Assert.assertEquals(ArrayKit.addAll(shortTestArray, new Short("5"),new Short("6")), shortTestResult);
+    }
+}

src/test/java/com/fanruan/api/util/StringKitTest.java

@@ -1,5 +1,6 @@
 package com.fanruan.api.util;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -26,4 +27,13 @@ public class StringKitTest {
     @Test
     public void isNotBlank() {
     }
+    @Test
+    public void trim(){
+        String stringHaveBlank = "  abc  ";
+        String stringWithoutBlank = "abc";
+        String blankString = "   ";
+        Assert.assertEquals(StringKit.trim(stringHaveBlank), "abc");
+        Assert.assertEquals(StringKit.trim(stringWithoutBlank), "abc");
+        Assert.assertEquals(StringKit.trim(blankString), "");
+    }
 }