manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jdk11 的一些不推荐语法优化

Browse Source
This commit is contained in:
thinkgem
2020-03-29 18:49:08 +08:00
parent eea35d5831
commit be38ce85c1
11 changed files with 35 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/jeesite/common/collect/MapUtils.java
View File

@@ -84,7 +84,7 @@ public class MapUtils extends org.apache.commons.collections.MapUtils {
* @param clazz
* @param list
*/
public static <T, V> List<T> toObjectList(Class<T> clazz, List<HashMap<String, V>> list) throws IllegalAccessException,
public static <T, V> List<T> toObjectList(Class<T> clazz, List<HashMap<String, V>> list) throws Exception,
InvocationTargetException, NoSuchMethodException, InstantiationException {
List<T> retList = new ArrayList<T>();
if (list != null && !list.isEmpty()) {
@@ -100,9 +100,9 @@ public class MapUtils extends org.apache.commons.collections.MapUtils {
* @param clazz 目标对象的类
* @param map 待转换Map
*/
public static <T, V> T toObject(Class<T> clazz, Map<String, V> map) throws InstantiationException, IllegalAccessException,
public static <T, V> T toObject(Class<T> clazz, Map<String, V> map) throws Exception,
InvocationTargetException {
T object = clazz.newInstance();
T object = clazz.getDeclaredConstructor().newInstance();
return toObject(object, map);
}
@@ -112,9 +112,9 @@ public class MapUtils extends org.apache.commons.collections.MapUtils {
* @param map 待转换Map
* @param toCamelCase 是否去掉下划线
*/
public static <T, V> T toObject(Class<T> clazz, Map<String, V> map, boolean toCamelCase) throws InstantiationException, IllegalAccessException,
public static <T, V> T toObject(Class<T> clazz, Map<String, V> map, boolean toCamelCase) throws Exception,
InvocationTargetException {
T object = clazz.newInstance();
T object = clazz.getDeclaredConstructor().newInstance();
return toObject(object, map, toCamelCase);
}

7
common/src/main/java/com/jeesite/common/lang/NumberUtils.java
View File

@@ -4,6 +4,7 @@
package com.jeesite.common.lang;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
/**
@@ -72,7 +73,7 @@ public class NumberUtils extends org.apache.commons.lang3.math.NumberUtils {
}
BigDecimal b1 = new BigDecimal(Double.toString(v1));
BigDecimal b2 = new BigDecimal(Double.toString(v2));
return b1.divide(b2, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
return b1.divide(b2, scale, RoundingMode.HALF_UP).doubleValue();
}
/**
@@ -81,7 +82,7 @@ public class NumberUtils extends org.apache.commons.lang3.math.NumberUtils {
*/
public static String formatDouble(Double b) {
BigDecimal bg = new BigDecimal(b);
return bg.setScale(2, BigDecimal.ROUND_HALF_UP).toString();
return bg.setScale(2, RoundingMode.HALF_UP).toString();
}
/**
@@ -90,7 +91,7 @@ public class NumberUtils extends org.apache.commons.lang3.math.NumberUtils {
*/
public static String formatScale(double one, long total) {
BigDecimal bg = new BigDecimal(one * 100 / total);
return bg.setScale(0, BigDecimal.ROUND_HALF_UP).toString();
return bg.setScale(0, RoundingMode.HALF_UP).toString();
}
/**

2
common/src/main/java/com/jeesite/common/mapper/XmlMapper.java
View File

@@ -167,7 +167,6 @@ public class XmlMapper extends com.fasterxml.jackson.dataformat.xml.XmlMapper{
* @param element
* @return
*/
@SuppressWarnings("unchecked")
private static Object xmlToMap(Element element) {
// System.out.println(element.getName());
Map<String, Object> map = new LinkedHashMap<String, Object>();
@@ -212,7 +211,6 @@ public class XmlMapper extends com.fasterxml.jackson.dataformat.xml.XmlMapper{
* @param element
* @return
*/
@SuppressWarnings("unchecked")
private static Object xmlToMapWithAttr(Element element) {
// System.out.println(element.getName());
Map<String, Object> map = new LinkedHashMap<String, Object>();

8
common/src/main/java/com/jeesite/common/reflect/ClassUtils.java
View File

@@ -288,14 +288,12 @@ abstract class VFS {
for (int i = 0; vfs == null || !vfs.isValid(); i++) {
Class<? extends VFS> impl = impls.get(i);
try {
vfs = impl.newInstance();
vfs = impl.getDeclaredConstructor().newInstance();
if (vfs == null || !vfs.isValid()) {
log.debug("VFS implementation " + impl.getName() + " is not valid in this environment.");
}
} catch (InstantiationException e) {
log.error("Failed to instantiate " + impl, e);
return null;
} catch (IllegalAccessException e) {
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException | NoSuchMethodException | SecurityException e) {
log.error("Failed to instantiate " + impl, e);
return null;
}

4
common/src/main/java/com/jeesite/common/utils/excel/ExcelExport.java
View File

@@ -230,8 +230,8 @@ public class ExcelExport implements Closeable{
Collections.sort(annotationList, new Comparator<Object[]>() {
@Override
public int compare(Object[] o1, Object[] o2) {
return new Integer(((ExcelField)o1[0]).sort()).compareTo(
new Integer(((ExcelField)o2[0]).sort()));
return Integer.valueOf(((ExcelField)o1[0]).sort()).compareTo(
Integer.valueOf(((ExcelField)o2[0]).sort()));
};
});
// Initialize

12
common/src/main/java/com/jeesite/common/utils/excel/ExcelImport.java
View File

@@ -319,7 +319,7 @@ public class ExcelImport implements Closeable {
* @param cls 导入对象类型
* @param groups 导入分组
*/
public <E> List<E> getDataList(Class<E> cls, String... groups) throws InstantiationException, IllegalAccessException{
public <E> List<E> getDataList(Class<E> cls, String... groups) throws Exception{
return getDataList(cls, false, groups);
}
@@ -329,7 +329,7 @@ public class ExcelImport implements Closeable {
* @param isThrowException 遇见错误是否抛出异常
* @param groups 导入分组
*/
public <E> List<E> getDataList(Class<E> cls, final boolean isThrowException, String... groups) throws InstantiationException, IllegalAccessException{
public <E> List<E> getDataList(Class<E> cls, final boolean isThrowException, String... groups) throws Exception{
return getDataList(cls, new MethodCallback() {
@Override
public Object execute(Object... params) {
@@ -350,7 +350,7 @@ public class ExcelImport implements Closeable {
* @param groups 导入分组
*/
@SuppressWarnings("unchecked")
public <E> List<E> getDataList(Class<E> cls, MethodCallback exceptionCallback, String... groups) throws InstantiationException, IllegalAccessException{
public <E> List<E> getDataList(Class<E> cls, MethodCallback exceptionCallback, String... groups) throws Exception{
List<Object[]> annotationList = ListUtils.newArrayList();
// Get annotation field
Field[] fs = cls.getDeclaredFields();
@@ -380,15 +380,15 @@ public class ExcelImport implements Closeable {
Collections.sort(annotationList, new Comparator<Object[]>() {
@Override
public int compare(Object[] o1, Object[] o2) {
return new Integer(((ExcelField)o1[0]).sort()).compareTo(
new Integer(((ExcelField)o2[0]).sort()));
return Integer.valueOf(((ExcelField)o1[0]).sort()).compareTo(
Integer.valueOf(((ExcelField)o2[0]).sort()));
};
});
//log.debug("Import column count:"+annotationList.size());
// Get excel data
List<E> dataList = ListUtils.newArrayList();
for (int i = this.getDataRowNum(); i < this.getLastDataRowNum(); i++) {
E e = (E)cls.newInstance();
E e = (E)cls.getDeclaredConstructor().newInstance();
Row row = this.getRow(i);
if (row == null){
continue;

6
common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
View File

@@ -213,7 +213,7 @@ public class ServletUtils {
return XmlMapper.toXml(resultMap);
}else{
if (response != null){
response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
}
if (ObjectUtils.toBoolean(PropertiesUtils.getInstance().getProperty("web.jsonp.enabled"))) {
String functionName = request.getParameter("__callback");
@@ -225,7 +225,7 @@ public class ServletUtils {
}
}else{
if (response != null){
response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
}
return JsonMapper.toJson(resultMap);
}
@@ -300,7 +300,7 @@ public class ServletUtils {
if (type == null && StringUtils.isBlank(response.getContentType())){
if ((StringUtils.startsWith(string, "{") && StringUtils.endsWith(string, "}"))
|| (StringUtils.startsWith(string, "[") && StringUtils.endsWith(string, "]"))){
type = MediaType.APPLICATION_JSON_UTF8_VALUE;
type = MediaType.APPLICATION_JSON_VALUE;
}else if (StringUtils.startsWith(string, "<") && StringUtils.endsWith(string, ">")){
if (StringUtils.startsWith(string, "<!DOCTYPE")){
type = MediaType.TEXT_HTML_VALUE+";charset=UTF-8";

3
modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java
View File

@@ -55,9 +55,6 @@ public class ShiroConfig {
@Order(3000)
@ConditionalOnMissingBean(name="shiroFilterProxy")
public FilterRegistrationBean<Filter> shiroFilterProxy(ShiroFilterFactoryBean shiroFilter) throws Exception {
if (Global.isUseCorpModel() != Global.getPropertyToBoolean("user.useCorpModel", "false")){
throw new Exception("\n\nuser.useCorpModel=true? 你是否开启了多租户模式？视乎你的当前版本不是JeeSite专业版。\n");
}
FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>();
bean.setFilter((Filter) shiroFilter.getInstance());
bean.addUrlPatterns("/*");

11
modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java
View File

@@ -5,6 +5,7 @@ package com.jeesite.modules.sys.service.support;
import java.util.List;
import javax.annotation.PostConstruct;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
@@ -48,6 +49,16 @@ public class EmpUserServiceSupport extends CrudService<EmpUserDao, EmpUser>
@Autowired
private EmployeeOfficeDao employeeOfficeDao;
/**
* 租户功能验证
*/
@PostConstruct
private void corpModelValid() throws Exception{
if (Global.isUseCorpModel() != Global.getPropertyToBoolean("user.useCorpModel", "false")){
throw new Exception("\n\nuser.useCorpModel=true? 你开启了多租户模式，视乎你的当前版本不是JeeSite专业版。\n");
}
}
/**
* 获取单条数据
*/

1
parent/pom.xml
View File

@@ -42,6 +42,7 @@
<zxing.version>3.4.0</zxing.version>
<poi.version>4.1.2</poi.version>
<pinyin4j.version>2.5.1</pinyin4j.version>
<groovy.version>3.0.2</groovy.version>
<!-- framework version setting -->
<mybatis.version>3.5.4</mybatis.version>

58
web/src/main/resources/config/j2cache.properties
View File

@@ -1,20 +1,5 @@
#J2Cache configuration
#########################################
# Cache Broadcast Method
# values:
# redis -> use redis publish/subscribe mechanism (using jedis)
# lettuce -> use redis publish/subscribe mechanism (using lettuce)
# jgroups -> use jgroups's multicast
# rabbitmq -> use RabbitMQ publisher/consumer mechanism
# rocketmq -> use RocketMQ publisher/consumer mechanism
# none -> don't notify the other nodes in cluster
# xx.xxxx.xxxx.Xxxxx your own cache broadcast policy classname that implement net.oschina.j2cache.cluster.ClusterPolicy
#########################################
#j2cache.broadcast = redis
j2cache.broadcast = com.jeesite.common.j2cache.cache.support.redis.SpringRedisPubSubPolicy
#########################################
# Cache Clean Mode
# active -> 主动清除，二级缓存过期主动通知各节点清除，优点在于所有节点可以同时收到缓存清除
@@ -24,47 +9,6 @@ j2cache.broadcast = com.jeesite.common.j2cache.cache.support.redis.SpringRedisPu
j2cache.broadcast.cache_clean_mode = passive
#########################################
# Level 1&2 provider
# values:
# none -> disable this level cache
# ehcache -> use ehcache2 as level 1 cache
# ehcache3 -> use ehcache3 as level 1 cache
# caffeine -> use caffeine as level 1 cache(only in memory)
# redis -> use redis as level 2 cache (using jedis)
# lettuce -> use redis as level 2 cache (using lettuce)
# readonly-redis -> use redis as level 2 cache ,but never write data to it. if use this provider, you must uncomment `j2cache.L2.config_section` to make the redis configurations available.
# memcached -> use memcached as level 2 cache (xmemcached),
# [classname] -> use custom provider
#########################################
j2cache.L1.provider_class = caffeine
#j2cache.L2.provider_class = redis
j2cache.L2.provider_class = com.jeesite.common.j2cache.cache.support.redis.SpringRedisProvider
# When L2 provider isn't `redis`, using `L2.config_section = redis` to read redis configurations
j2cache.L2.config_section = redis
# Enable/Disable ttl in redis cache data (if disabled, the object in redis will never expire, default:true)
# NOTICE: redis hash mode (redis.storage = hash) do not support this feature)
j2cache.sync_ttl_to_redis = true
# Whether to cache null objects by default (default false)
j2cache.default_cache_null_object = true
#########################################
# Cache Serialization Provider
# values:
# fst -> using fast-serialization (recommend)
# kyro -> using kyro serialization
# json -> using fst's json serialization (testing)
# fastjson -> using fastjson serialization (embed non-static class not support)
# java -> java standard
# [classname implements Serializer]
#########################################
j2cache.serialization = fst
#########################################
# Caffeine configuration
# caffeine.region.[cacheName] = size, xxxx[s|m|h|d]
@@ -83,8 +27,6 @@ redis.storage = hash
## redis pub/sub channel name
redis.channel = j2cache
## redis pub/sub server (using redis.hosts when empty)
redis.channel.host =
## redis cache namespace optional, default[j2cache]
redis.namespace = jeesite