Browse Source

Merge branch 'master' of Kalven/finekit into master

pull/1/head
richie 5 years ago committed by Gogs
parent
commit
570b59fe18
  1. 24
      src/main/java/com/fanruan/api/design/util/GUICoreKit.java
  2. 10
      src/main/java/com/fanruan/api/util/ArrayKit.java
  3. 19
      src/main/java/com/fanruan/api/util/GeneralKit.java
  4. 16
      src/main/java/com/fanruan/api/util/StableKit.java
  5. 166
      src/main/java/com/fanruan/api/util/StringKit.java
  6. 19
      src/main/java/com/fanruan/api/util/TemplateKit.java
  7. 25
      src/test/java/com/fanruan/api/util/GeneralKitTest.java
  8. 14
      src/test/java/com/fanruan/api/util/StableKitTest.java
  9. 142
      src/test/java/com/fanruan/api/util/StringKitTest.java

24
src/main/java/com/fanruan/api/design/util/GUICoreKit.java

@ -0,0 +1,24 @@
package com.fanruan.api.design.util;
import com.fr.design.utils.gui.GUICoreUtils;
import javax.swing.*;
import java.awt.*;
public class GUICoreKit {
public static JPanel createFlowPane(Object... var0) {
return GUICoreUtils.createFlowPane(var0);
}
/**
* 弹出菜单在坐标为x,y处弹出内容为component的菜单
* @param menu
* @param component
* @param x
* @param y
*/
public static void showPopupMenu(JPopupMenu menu, Component component, int x, int y) {
GUICoreUtils.showPopupMenu(menu, component, x, y);
}
}

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

@ -82,4 +82,14 @@ public class ArrayKit {
* @return 返回增加元素后的数组 * @return 返回增加元素后的数组
*/ */
public static <T> T[] addAll(T[] array, T... element){return ArrayUtils.addAll(array, element);}; public static <T> T[] addAll(T[] array, T... element){return ArrayUtils.addAll(array, element);};
/**
* 判断数组是否为不空
* @param array
* @param <T>
* @return 若数组array不空返回true否则返回false
*/
public static <T> boolean isNotEmpty(T[] array) {
return ArrayUtils.isNotEmpty(array);
}
} }

19
src/main/java/com/fanruan/api/util/GeneralKit.java

@ -1,5 +1,6 @@
package com.fanruan.api.util; package com.fanruan.api.util;
import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralUtils; import com.fr.general.GeneralUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -49,4 +50,22 @@ public class GeneralKit {
public static @Nullable Number objectToNumber(Object obj, boolean returnNull) { public static @Nullable Number objectToNumber(Object obj, boolean returnNull) {
return GeneralUtils.objectToNumber(obj, returnNull); return GeneralUtils.objectToNumber(obj, returnNull);
} }
/**
* 读取jar的版本号
* @return 返回jar版本号
*/
public static @Nullable String readBuildNO() {
return GeneralUtils.readBuildNO();
}
/**
* 返回两个对象比较的大小
* @param obj1
* @param obj2
* @return 若相等返回0obj1小于obj2返回负数否则返回正数
*/
public static int compare(Object obj1, Object obj2) {
return ComparatorUtils.compare(obj1, obj2);
}
} }

16
src/main/java/com/fanruan/api/util/StableKit.java

@ -0,0 +1,16 @@
package com.fanruan.api.util;
import com.fr.stable.StableUtils;
public class StableKit {
/**
* 判断class1是否是class2的子类实例化
* @param class1
* @param class2
* @return 返回判断结果
*/
public static boolean classInstanceOf(Class class1, Class class2) {
return StableUtils.classInstanceOf(class1, class2);
}
}

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

@ -1,6 +1,7 @@
package com.fanruan.api.util; package com.fanruan.api.util;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import java.io.UnsupportedEncodingException;
/** /**
* @author richie * @author richie
@ -95,4 +96,169 @@ public class StringKit {
return StringUtils.trim(string); return StringUtils.trim(string);
} }
/**
*如果String为空则返回空字符串否则返回String本身的值保证String不空
* @param text
* @return
*/
public static String alwaysNotNull(String text) {
return StringUtils.alwaysNotNull(text);
}
/**
* 获取text字符串中去除结尾suffix字符串的部分
* @param text
* @param suffix
* @return 若text字符串结尾是suffix则返回去除suffix的部分否则返回text
*/
public static String cutStringEndWith(String text, String suffix) {
return StringUtils.cutStringEndWith(text, suffix);
}
/**获取text字符串去除开头startString部分
*
* @param text
* @param startString
* @return 若text字符串开头是suffix则返回去除startString部分否则返回text
*/
public static String cutStringStartWith(String text, String startString) {
return StringUtils.cutStringStartWith(text, startString);
}
/**
* 去掉text字符串两边的空格或ASCII码小于空格的字符
* @param text
* @return 若text只含空格字符或ASCII码小于空格的字符返回null否则返回去除两边空字符后的text
*/
public static String trimToNull(String text) {
return StringUtils.trimToNull(text);
}
/**
* 令text以startString开头
* @param text
* @param startString
* @return 若text不以startString开头在text前添加startString若text以startString开头返回text
*/
public static String perfectStart(String text, String startString) {
return StringUtils.perfectStart(text, startString);
}
/**
* 令text以suffix结尾
* @param text
* @param suffix
* @return 若text不以suffix结尾在text后添加suffix若text以suffix结尾返回text
*/
public static String perfectEnd(String text, String suffix) {
return StringUtils.perfectEnd(text, suffix);
}
/**
* 令text的开头结尾都是str
* @param text
* @param str
* @return 若text的开头或结尾不是str在相应位置添加str若开头结尾都是text返回text
*/
public static String perfectSurround(String text, String str) {
return StringUtils.perfectSurround(text, str);
}
/**
* 返回text长度
* @param text
* @return 若text为null返回0否则返回text长度
*/
public static int getLength(String text) {
return StringUtils.getLength(text);
}
/**
* 判断text1和text2在去掉开头或结尾的ignoreStr部分是否相等
* @param text1
* @param text2
* @param ignoreStr
* @return 如果text1和txet2去掉开头结尾的ignoreStr后相等返回true不等返回false
*/
public static boolean equalsIgnore(String text1, String text2, String ignoreStr) {
return StringUtils.equalsIgnore(text1, text2, ignoreStr);
}
/**
* 将str加入到strArr字符串数组的每个字符串后方不包括最后一个字符串同时将结果字符串数组连接起来形成新的字符串
* @param str
* @param strArr
* @return 若strArr为空则返回null若strArr长度为0返回""空字符串否则返回连接后的字符串
*/
public static String join(String str, String[] strArr) {
return StringUtils.join(str, strArr);
}
/**
* 将text字符串中的A-J转换成0-9,工具函数
* @param text
* @return 返回转换后的字符串
*/
public static String parseVersion(String text) {
return StringUtils.parseVersion(text);
}
/**
* 判断text是否是json中数组的string形式
* @param text
* @return 若是数组的String形式返回true否则返回flase
*/
public static boolean isArrayType(String text) {
return StringUtils.isArrayType(text);
}
/**
*从原本json数组类型的String取出其中的每一个用逗号间隔元素作为String二维数组返回值
* @param text
* @return 取出text中用逗号间隔的元素
*/
public static String[][] stringToArray(String text) {
return StringUtils.stringToArray(text);
}
/**
*对text中每个字符用charsetName为名的编码方式解码后返回解码后字节长度从0到bytelength的部分以String形式返回
* @param text
* @param charsetName
* @param byteLength
* @return 若text为空或byteLength小于等于0返回空字符串否则以String形式返回解码后字节长度从0到bytelength的部分
*/
public static String subStringByByteLength(String text, String charsetName, int byteLength) throws UnsupportedEncodingException {
return StringUtils.subStringByByteLength(text, charsetName, byteLength);
}
/**
* 比较text和compareStr两字符串值是否相等
* @param text
* @param compareStr
* @return 若text和compareStr两字符串的值相同返回true否则返回false
*/
public static boolean equals(String text, String compareStr) {
return StringUtils.equals(text, compareStr);
}
/**
* 比较text和compareStr两字符串忽略大小写的情况下值是否相等
* @param text
* @param compareStr
* @return 在忽略大小写的情况下若text和compareStr两字符串的值相同返回true否则返回false
*/
public static boolean equalsIgnoreCase(String text, String compareStr) {
return StringUtils.equalsIgnoreCase(text, compareStr);
}
/**
* 扩展text的长度至stringLength不足则以空格填充
* @param text
* @param stringLength
* @return 若text长度比stringLength则将text扩充到stringLength长度否则返回text
*/
public static String rightPad(String text, int stringLength) {
return StringUtils.rightPad(text, stringLength);
}
} }

19
src/main/java/com/fanruan/api/util/TemplateKit.java

@ -0,0 +1,19 @@
package com.fanruan.api.util;
import com.fr.base.TemplateUtils;
import java.util.Map;
public class TemplateKit {
/**
* 根据参数, 来计算文档字符串
* @param tpl
* @param map
* @return 返回计算后的值
* @throws Exception
*/
public static String renderParameter4Tpl(String tpl, Map map) throws Exception {
return TemplateUtils.renderParameter4Tpl(tpl, map);
}
}

25
src/test/java/com/fanruan/api/util/GeneralKitTest.java

@ -1,6 +1,8 @@
package com.fanruan.api.util; package com.fanruan.api.util;
import com.fanruan.api.Prepare; import com.fanruan.api.Prepare;
import com.fr.general.GeneralUtils;
import com.fr.third.javax.persistence.criteria.CriteriaBuilder;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
@ -15,4 +17,27 @@ public class GeneralKitTest extends Prepare {
public void getMacAddress() throws Exception{ public void getMacAddress() throws Exception{
Assert.assertEquals(GeneralKit.getMacAddress(), com.fr.general.GeneralUtils.getMacAddress()); Assert.assertEquals(GeneralKit.getMacAddress(), com.fr.general.GeneralUtils.getMacAddress());
} }
@Test
public void objectToString() {
Integer s = new Integer(1);
Assert.assertEquals(GeneralKit.objectToString(s),"1");
}
@Test
public void readBuildNO() {
Assert.assertEquals(GeneralKit.readBuildNO(), GeneralUtils.readBuildNO());
}
@Test
public void compare() {
Integer s = new Integer(1);
Integer s3 = new Integer(1);
Integer s1 = new Integer(2);
Integer s2 = new Integer(0);
Assert.assertEquals(GeneralKit.compare(s,s1),-1);
Assert.assertEquals(GeneralKit.compare(s,s3),0);
Assert.assertEquals(GeneralKit.compare(s,s2),1);
}
} }

14
src/test/java/com/fanruan/api/util/StableKitTest.java

@ -0,0 +1,14 @@
package com.fanruan.api.util;
import org.junit.Test;
import static org.junit.Assert.*;
public class StableKitTest {
@Test
public void classInstanceOf() {
assertEquals(StableKit.classInstanceOf(Integer.class,Object.class),true);
assertEquals(StableKit.classInstanceOf(Object.class,Integer.class),false);
}
}

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

@ -14,18 +14,32 @@ public class StringKitTest {
@Test @Test
public void isEmpty() { public void isEmpty() {
assertEquals(StringKit.isEmpty(""),true);
assertEquals(StringKit.isEmpty("asd"),false);
} }
@Test @Test
public void isNotEmpty() { public void isNotEmpty() {
assertEquals(StringKit.isNotEmpty("asd"),true);
assertEquals(StringKit.isNotEmpty(""),false);
} }
@Test @Test
public void isBlank() { public void isBlank() {
assertEquals(StringKit.isNotBlank(null),false);
assertEquals(StringKit.isNotBlank(""),false);
assertEquals(StringKit.isNotBlank(" "),false);
assertEquals(StringKit.isNotBlank("bob"),true);
assertEquals(StringKit.isNotBlank(" bob "),true);
} }
@Test @Test
public void isNotBlank() { public void isNotBlank() {
assertEquals(StringKit.isBlank(null),true);
assertEquals(StringKit.isBlank(""),true);
assertEquals(StringKit.isBlank(" "),true);
assertEquals(StringKit.isBlank("bob"),false);
assertEquals(StringKit.isBlank(" bob "),false);
} }
@Test @Test
public void trim(){ public void trim(){
@ -36,4 +50,132 @@ public class StringKitTest {
Assert.assertEquals(StringKit.trim(stringWithoutBlank), "abc"); Assert.assertEquals(StringKit.trim(stringWithoutBlank), "abc");
Assert.assertEquals(StringKit.trim(blankString), ""); Assert.assertEquals(StringKit.trim(blankString), "");
} }
@Test
public void alwaysNotNull() {
assertEquals(StringKit.alwaysNotNull(null),"");
assertEquals(StringKit.alwaysNotNull(""),"");
assertEquals(StringKit.alwaysNotNull("asd"),"asd");
}
@Test
public void cutStringEndWith() {
assertEquals(StringKit.cutStringEndWith("bob is","is"), "bob ");
assertEquals(StringKit.cutStringEndWith("","is"), "");
}
@Test
public void cutStringStartWith() {
assertEquals(StringKit.cutStringStartWith("bob is","bob "), "is");
assertEquals(StringKit.cutStringStartWith("","is"), "");
}
@Test
public void trimToNull() {
assertEquals(StringKit.trimToNull(" "),null);
assertEquals(StringKit.trimToNull(" s "),"s");
}
@Test
public void perfectStart() {
assertEquals(StringKit.perfectStart("bobob","bob"),"bobob");
assertEquals(StringKit.perfectStart("sbobob","bob"),"bobsbobob");
}
@Test
public void perfectEnd() {
assertEquals(StringKit.perfectEnd("bobob","bob"),"bobob");
assertEquals(StringKit.perfectEnd("bobobs","bob"),"bobobsbob");
}
@Test
public void perfectSurround() {
assertEquals(StringKit.perfectSurround("bobob","bob"),"bobob");
assertEquals(StringKit.perfectSurround("sbobobs","bob"),"bobsbobobsbob");
}
@Test
public void getLength() {
assertEquals(StringKit.getLength("asd"),3);
assertEquals(StringKit.getLength(""),0);
assertEquals(StringKit.getLength(null),0);
}
@Test
public void equalsIgnore() {
assertEquals(StringKit.equalsIgnore("asd","asd","qwewqe"),true);
assertEquals(StringKit.equalsIgnore("asd","as","d"),true);
assertEquals(StringKit.equalsIgnore("asd","asdd","d"),false);
}
@Test
public void join() {
String[] s = new String[3];
String[] s1 = new String[0];
s[0]= new String("qqq");
s[1]= new String("www");
s[2]= new String("eee");
assertEquals(StringKit.join("asd",s),"qqqasdwwwasdeee");
assertEquals(StringKit.join("",s),"qqqwwweee");
assertEquals(StringKit.join("asd",null),null);
assertEquals(StringKit.join("asd",s1),"");
}
@Test
public void parseVersion() {
assertEquals(StringKit.parseVersion("BCD123"),"123123");
}
@Test
public void isArrayType() {
assertEquals(StringKit.isArrayType("[[]]"),true);
assertEquals(StringKit.isArrayType("[["),false);
}
@Test
public void stringToArray() {
String[][] s = new String[1][3];
s[0][0] = new String("a");
s[0][1] = new String("b");
s[0][2] = new String("c");
assertEquals(StringKit.stringToArray("[[a,b,c]]"),s);
}
@Test
public void subStringByByteLength() {
try {
assertEquals(StringKit.subStringByByteLength("asd", "UTF-8", 1), "a");
assertEquals(StringKit.subStringByByteLength(" ", "UTF-8", 1), "");
assertEquals(StringKit.subStringByByteLength("asd", "UTF-8", 0), "");
}catch (Exception e){
}
}
@Test
public void equals() {
String s = new String("asd");
String s1 = new String("asd");
String s2 = new String("asds");
assertEquals(StringKit.equals(s, s1), true);
assertEquals(StringKit.equals(s, s2), false);
assertEquals(StringKit.equals(null, null), true);
}
@Test
public void equalsIgnoreCase() {
String s = new String("Asd");
String s1 = new String("asd");
String s2 = new String("asds");
assertEquals(StringKit.equalsIgnoreCase(s, s1), true);
assertEquals(StringKit.equalsIgnoreCase(s, s2), false);
assertEquals(StringKit.equalsIgnoreCase(null, null), true);
}
@Test
public void rightPad() {
assertEquals(StringKit.rightPad("asd",5), "asd ");
assertEquals(StringKit.rightPad("asd",-1), "asd");
}
} }
Loading…
Cancel
Save