代码规范调整，空指针异常检测

src/main/java/com/uas/platform/b2bManage/model/UseType.java

@@ -109,8 +109,9 @@ public enum UseType {
      * @return 状态的编码
      */
     public String code() {
-        if (this == NONE)
+        if (this == NONE) {
             return "";
+        }
         return this.code;
     }
 

src/main/java/com/uas/platform/b2bManage/page/PageInfo.java

@@ -53,8 +53,9 @@ public class PageInfo implements Pageable {
 			this.pageNumber = 1;
 		}
 		this.offset = this.pageSize * (this.pageNumber - 1);
-		if (params.getFilter() != null)
+		if (params.getFilter() != null) {
 			this.filters = JSONObject.parseObject(params.getFilter());
+		}
 		if (params.getSorting() != null) {
 			JSONObject sorting = JSONObject.parseObject(params.getSorting());
 			LinkedList<Sort.Order> orders = new LinkedList<Sort.Order>();
@@ -95,14 +96,16 @@ public class PageInfo implements Pageable {
 	}
 
 	public void filter(String key, Object value) {
-		if (filters == null)
+		if (filters == null) {
 			filters = new HashMap<String, Object>();
+		}
 		filters.put(key, value);
 	}
 
 	public void filter(String key, Object value, Boolean ignoreCase) {
-		if (filters == null)
+		if (filters == null) {
 			filters = new HashMap<String, Object>();
+		}
 		filters.put(key, value);
 		if (ignoreCaseMap == null) {
 			ignoreCaseMap = new HashMap<String, Boolean>();
@@ -113,8 +116,9 @@ public class PageInfo implements Pageable {
 	}
 
 	public void filterAll(Map<String, Object> filters) {
-		if (this.filters == null)
+		if (this.filters == null) {
 			this.filters = new HashMap<String, Object>();
+		}
 		this.filters.putAll(filters);
 	}
 
@@ -125,8 +129,9 @@ public class PageInfo implements Pageable {
 	 */
 	public void expression(CriterionExpression expression) {
 		if (expression != null) {
-			if (expressions == null)
+			if (expressions == null) {
 				expressions = new HashSet<CriterionExpression>();
+			}
 			expressions.add(expression);
 		}
 	}
@@ -138,8 +143,9 @@ public class PageInfo implements Pageable {
 	 */
 	public void orExpression(CriterionExpression expression) {
 		if (expression != null) {
-			if (orExpressions == null)
+			if (orExpressions == null) {
 				orExpressions = new HashSet<CriterionExpression>();
+			}
 			orExpressions.add(expression);
 		}
 	}
@@ -192,18 +198,22 @@ public class PageInfo implements Pageable {
 		this.orExpressions = orExpressions;
 	}
 
+	@Override
 	public int getPageNumber() {
 		return pageNumber;
 	}
 
+	@Override
 	public int getPageSize() {
 		return pageSize;
 	}
 
+	@Override
 	public int getOffset() {
 		return offset;
 	}
 
+	@Override
 	public Sort getSort() {
 		return sort;
 	}
@@ -322,56 +332,58 @@ public class PageInfo implements Pageable {
 		int i = 0;
 		for (String valKey : keys) {
 			val = valueMap.get(valKey);
-			if (valKey.equals("ne")) {// 不等于 {"ne": "something"}
+			if ("ne".equals(valKey)) {// 不等于 {"ne": "something"}
 				Path<String> path = PredicateUtils.getPath(root, field,
 						String.class);
-				if (val != null)
+				if (val != null) {
 					predicates[i++] = builder.notEqual(path,
 							String.valueOf(val));
-				else
+				} else {
 					predicates[i++] = builder.isNotNull(path);
-			} else if (valKey.equals("eq")) {// 等于 {"eq": "something"}
+				}
+			} else if ("eq".equals(valKey)) {// 等于 {"eq": "something"}
 				Path<String> path = PredicateUtils.getPath(root, field,
 						String.class);
-				if (val != null)
+				if (val != null) {
 					predicates[i++] = builder.equal(path, String.valueOf(val));
-				else
+				} else {
 					predicates[i++] = builder.isNull(path);
-			} else if (valKey.equals("gt")) {// 大于 {"gt": "something"}
+				}
+			} else if ("gt".equals(valKey)) {// 大于 {"gt": "something"}
 				Path<String> path = PredicateUtils.getPath(root, field,
 						String.class);
 				predicates[i++] = builder
 						.greaterThan(path, String.valueOf(val));
-			} else if (valKey.equals("lt")) {// 小于 {"lt": "something"}
+			} else if ("lt".equals(valKey)) {// 小于 {"lt": "something"}
 				Path<String> path = PredicateUtils.getPath(root, field,
 						String.class);
 				predicates[i++] = builder.lessThan(path, String.valueOf(val));
-			} else if (valKey.equals("gte")) {// 大于等于 {"gte": "something"}
+			} else if ("gte".equals(valKey)) {// 大于等于 {"gte": "something"}
 				Path<String> path = PredicateUtils.getPath(root, field,
 						String.class);
 				predicates[i++] = builder.greaterThanOrEqualTo(path,
 						String.valueOf(val));
-			} else if (valKey.equals("lte")) {// 小于等于 {"lte": "something"}
+			} else if ("lte".equals(valKey)) {// 小于等于 {"lte": "something"}
 				Path<String> path = PredicateUtils.getPath(root, field,
 						String.class);
 				predicates[i++] = builder.lessThanOrEqualTo(path,
 						String.valueOf(val));
-			} else if (valKey.equals("gtd")) {// 日期大于 {"gtd": 1441269176697}
+			} else if ("gtd".equals(valKey)) {// 日期大于 {"gtd": 1441269176697}
 				Path<Date> path = PredicateUtils.getPath(root, field,
 						Date.class);
 				predicates[i++] = builder.greaterThan(path,
 						new Date(Long.parseLong(String.valueOf(val))));
-			} else if (valKey.equals("ltd")) {// 日期小于 {"ltd": 1441269176697}
+			} else if ("ltd".equals(valKey)) {// 日期小于 {"ltd": 1441269176697}
 				Path<Date> path = PredicateUtils.getPath(root, field,
 						Date.class);
 				predicates[i++] = builder.lessThan(path,
 						new Date(Long.parseLong(String.valueOf(val))));
-			} else if (valKey.equals("gted")) {// 日期大于等于 {"gted": 1441269176697}
+			} else if ("gted".equals(valKey)) {// 日期大于等于 {"gted": 1441269176697}
 				Path<Date> path = PredicateUtils.getPath(root, field,
 						Date.class);
 				predicates[i++] = builder.greaterThanOrEqualTo(path, new Date(
 						Long.parseLong(String.valueOf(val))));
-			} else if (valKey.equals("lted")) {// 日期小于等于 {"lted": 1441269176697}
+			} else if ("lted".equals(valKey)) {// 日期小于等于 {"lted": 1441269176697}
 				Path<Date> path = PredicateUtils.getPath(root, field,
 						Date.class);
 				predicates[i++] = builder.lessThanOrEqualTo(path,
@@ -385,18 +397,22 @@ public class PageInfo implements Pageable {
 		return builder.and(predicates);
 	}
 
+	@Override
 	public Pageable next() {
 		return null;
 	}
 
+	@Override
 	public Pageable previousOrFirst() {
 		return null;
 	}
 
+	@Override
 	public Pageable first() {
 		return null;
 	}
 
+	@Override
 	public boolean hasPrevious() {
 		return false;
 	}

src/main/java/com/uas/platform/b2bManage/page/criteria/PredicateFactory.java

@@ -20,8 +20,9 @@ public class PredicateFactory<T> implements Specification<T> {
 
 	private List<CriterionExpression> expressions = new ArrayList<CriterionExpression>();
 
-	public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query,
-			CriteriaBuilder builder) {
+	@Override
+    public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query,
+                                 CriteriaBuilder builder) {
 		if (!expressions.isEmpty()) {
 			List<Predicate> predicates = new ArrayList<Predicate>();
 			for (CriterionExpression c : expressions) {

src/main/java/com/uas/platform/b2bManage/page/criteria/PredicateUtils.java

@@ -21,8 +21,9 @@ public class PredicateUtils {
 	 * @return
 	 */
 	public static SimpleExpression eq(String param, Object value, boolean ignoreNull) {
-		if (StringUtils.isEmpty(value))
-			return null;
+		if (StringUtils.isEmpty(value)) {
+            return null;
+        }
 		return new SimpleExpression(param, value, CriterionExpression.Operator.EQ);
 	}
 
@@ -35,8 +36,9 @@ public class PredicateUtils {
 	 * @return
 	 */
 	public static SimpleExpression ne(String param, Object value, boolean ignoreNull) {
-		if (ignoreNull && StringUtils.isEmpty(value))
-			return null;
+		if (ignoreNull && StringUtils.isEmpty(value)) {
+            return null;
+        }
 		return new SimpleExpression(param, value, CriterionExpression.Operator.NE);
 	}
 
@@ -49,8 +51,9 @@ public class PredicateUtils {
 	 * @return
 	 */
 	public static SimpleExpression like(String param, String value, boolean ignoreNull) {
-		if (ignoreNull && StringUtils.isEmpty(value))
-			return null;
+		if (ignoreNull && StringUtils.isEmpty(value)) {
+            return null;
+        }
 		return new SimpleExpression(param, value, CriterionExpression.Operator.LIKE);
 	}
 	
@@ -63,8 +66,9 @@ public class PredicateUtils {
 	 * @return
 	 */
 	public static SimpleExpression like(String param, String value, boolean ignoreNull, boolean ignoreCase) {
-		if (ignoreNull && StringUtils.isEmpty(value))
-			return null;
+		if (ignoreNull && StringUtils.isEmpty(value)) {
+            return null;
+        }
 		return new SimpleExpression(param, value, CriterionExpression.Operator.LIKE, ignoreCase);
 	}
 
@@ -77,8 +81,9 @@ public class PredicateUtils {
 	 * @return
 	 */
 	public static SimpleExpression like(String param, String value, MatchMode matchMode, boolean ignoreNull) {
-		if (ignoreNull && StringUtils.isEmpty(value))
-			return null;
+		if (ignoreNull && StringUtils.isEmpty(value)) {
+            return null;
+        }
 		return new SimpleExpression(param, value, CriterionExpression.Operator.LIKE);
 	}
 
@@ -91,8 +96,9 @@ public class PredicateUtils {
 	 * @return
 	 */
 	public static SimpleExpression gt(String param, Object value, boolean ignoreNull) {
-		if (ignoreNull && StringUtils.isEmpty(value))
-			return null;
+		if (ignoreNull && StringUtils.isEmpty(value)) {
+            return null;
+        }
 		return new SimpleExpression(param, value, CriterionExpression.Operator.GT);
 	}
 
@@ -105,8 +111,9 @@ public class PredicateUtils {
 	 * @return
 	 */
 	public static SimpleExpression lt(String param, Object value, boolean ignoreNull) {
-		if (ignoreNull && StringUtils.isEmpty(value))
-			return null;
+		if (ignoreNull && StringUtils.isEmpty(value)) {
+            return null;
+        }
 		return new SimpleExpression(param, value, CriterionExpression.Operator.LT);
 	}
 
@@ -119,8 +126,9 @@ public class PredicateUtils {
 	 * @return
 	 */
 	public static SimpleExpression gte(String param, Object value, boolean ignoreNull) {
-		if (ignoreNull && StringUtils.isEmpty(value))
-			return null;
+		if (ignoreNull && StringUtils.isEmpty(value)) {
+            return null;
+        }
 		return new SimpleExpression(param, value, CriterionExpression.Operator.GTE);
 	}
 
@@ -133,8 +141,9 @@ public class PredicateUtils {
 	 * @return
 	 */
 	public static SimpleExpression lte(String param, Object value, boolean ignoreNull) {
-		if (ignoreNull && StringUtils.isEmpty(value))
-			return null;
+		if (ignoreNull && StringUtils.isEmpty(value)) {
+            return null;
+        }
 		return new SimpleExpression(param, value, CriterionExpression.Operator.LTE);
 	}
 

src/main/java/com/uas/platform/b2bManage/page/criteria/SimpleExpression.java

@@ -61,7 +61,8 @@ public class SimpleExpression implements CriterionExpression {
 		return operator;
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
 	public Predicate toPredicate(Root<?> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 		Path expression = null;
 		if (param.contains(".")) {

src/main/java/com/uas/platform/b2bManage/service/impl/EnterpriseBaseInfoServiceImpl.java

@@ -54,6 +54,7 @@ public class EnterpriseBaseInfoServiceImpl extends BaseService implements Enterp
             }
         }
         return baseInfoDao.findAll(new Specification<EnterpriseBaseInfo>() {
+            @Override
             public Predicate toPredicate(Root<EnterpriseBaseInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
                 query.where(info.getPredicates(root, query, builder));
                 return null;

src/main/java/com/uas/platform/b2bManage/support/DSUtils.java

@@ -67,7 +67,8 @@ public class DSUtils {
 		String currSrc = SpObserver.getSp();
 		ExecutorService executor = Executors.newSingleThreadExecutor();
 		FutureTask<Boolean> future = new FutureTask<Boolean>(new Callable<Boolean>() {
-			public Boolean call() {
+			@Override
+            public Boolean call() {
 				SpObserver.putSp(ds.getId());
 				jdbcTemplate.execute("select 1 from dual");
 				return true;

src/main/java/com/uas/platform/b2bManage/support/MultiDataSource.java

@@ -22,15 +22,18 @@ public class MultiDataSource extends DruidDataSource implements DataSource, Appl
 	private DruidDataSource dataSource = null;
 	private Properties connectionProperties = null;
 
-	public DruidPooledConnection getConnection() throws SQLException {
+	@Override
+    public DruidPooledConnection getConnection() throws SQLException {
 		return getDataSource().getConnection();
 	}
 
-	public Connection getConnection(String arg0, String arg1) throws SQLException {
+	@Override
+    public Connection getConnection(String arg0, String arg1) throws SQLException {
 		return getDataSource().getConnection(arg0, arg1);
 	}
 
-	public PrintWriter getLogWriter() {
+	@Override
+    public PrintWriter getLogWriter() {
 		return getDataSource().getLogWriter();
 	}
 
@@ -42,24 +45,28 @@ public class MultiDataSource extends DruidDataSource implements DataSource, Appl
 		this.connectionProperties = connectionProperties;
 	}
 
-	public int getLoginTimeout() {
+	@Override
+    public int getLoginTimeout() {
 		return getDataSource().getLoginTimeout();
 	}
 
-	public void setLogWriter(PrintWriter arg0) throws SQLException {
+	@Override
+    public void setLogWriter(PrintWriter arg0) throws SQLException {
 		getDataSource().setLogWriter(arg0);
 	}
 
-	public void setLoginTimeout(int arg0) {
+	@Override
+    public void setLoginTimeout(int arg0) {
 		getDataSource().setLoginTimeout(arg0);
 	}
 
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+	@Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		this.applicationContext = applicationContext;
 	}
 
 	public DruidDataSource getDataSource(String dataSourceName) {
-		if (dataSourceName == null || dataSourceName.equals("")) {
+		if (dataSourceName == null || "".equals(dataSourceName)) {
 			return this.dataSource;
 		}
 		return this.applicationContext.getBean(dataSourceName, DruidDataSource.class);

src/main/java/com/uas/platform/b2bManage/web/filter/SSOInterceptor.java

@@ -9,7 +9,6 @@ import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.encry.Md5Utils;
 import org.apache.log4j.Logger;
 import org.springframework.http.HttpStatus;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -20,6 +19,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -45,7 +45,10 @@ public class SSOInterceptor extends HandlerInterceptorAdapter implements Filter
 
     private final boolean authenticate(HttpServletRequest request, HttpServletResponse response) throws IOException {
         Cookie[] cookies = request.getCookies();
-        List<Cookie> cookieList = Arrays.asList(cookies);
+        List<Cookie> cookieList = new ArrayList<>();
+        if (null != cookies) {
+            cookieList = Arrays.asList(cookies);
+        }
         final boolean[] cookieExist = {false};
         boolean cookieFlag = checkCookie(cookieExist, cookieList, request);
         if (!cookieFlag) {
@@ -55,6 +58,7 @@ public class SSOInterceptor extends HandlerInterceptorAdapter implements Filter
                 return true;
             }
         }
+        // 通过HttpServletRequest获取登录信息
         logSession(request);
         User user = SystemSession.getUser();
         // 未登录则要求登录
@@ -109,7 +113,7 @@ public class SSOInterceptor extends HandlerInterceptorAdapter implements Filter
     /**
      * 将user信息放在当前线程里面
      *
-     * @param request
+     * @param request HttpServletRequest
      */
     private void logSession(HttpServletRequest request) throws UnsupportedEncodingException {
         Object user = request.getSession().getAttribute("user");
@@ -127,18 +131,6 @@ public class SSOInterceptor extends HandlerInterceptorAdapter implements Filter
         request.getSession().invalidate();
     }
 
-    /**
-     * 验证成功，获取用户信息
-     *
-     * @param request HttpServletRequest
-     */
-    protected void onAuthenticateSuccess(HttpServletRequest request) {
-        User user = (User) request.getAttribute("user");
-        if (user != null) {
-            SystemSession.setUser(user);
-        }
-    }
-
     /**
      * 验证失败重新登录
      *
@@ -160,6 +152,7 @@ public class SSOInterceptor extends HandlerInterceptorAdapter implements Filter
 
     /**
      * 清除登录信息
+     *
      * @param session HttpSession
      */
     private void removeLocalSession(HttpSession session) {