Merge branch 'hotfix/optimizeUnuse' into 'master'

optimize unuse



See merge request !8

pom.xml

@@ -3,7 +3,6 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>cn.quantgroup</groupId>
     <artifactId>xyqb-user2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>

src/main/java/cn/quantgroup/xyqb/controller/external/queryLog/UserQueryLogController.java → src/main/java/cn/quantgroup/xyqb/controller/external/querylog/UserQueryLogController.java

-package cn.quantgroup.xyqb.controller.external.queryLog;
+package cn.quantgroup.xyqb.controller.external.querylog;
 
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.Address;
@@ -240,9 +240,7 @@ public class UserQueryLogController {
             }
             if (columns.contains("address")) {
                 Optional<Address> oad = addresslist.stream().filter(addr -> Objects.equals(addr.getUserId(), ud.getUserId())).findFirst();
-                if (oad.isPresent()) {
-                    uqi.setAddress(oad.get().toString());
-                }
+                oad.ifPresent(address -> uqi.setAddress(address.toString()));
             }
             if (columns.contains("bankCard") && phonesCards != null) {
                 uqi.setBankCards(phonesCards.get(ud.getPhoneNo()));
@@ -446,9 +444,7 @@ public class UserQueryLogController {
             }
             if (columns.contains("address")) {
                 Optional<Address> oad = addresslist.stream().filter(addr -> Objects.equals(addr.getUserId(), ud.getUserId())).findFirst();
-                if (oad.isPresent()) {
-                    uqi.setAddress(oad.get().toString());
-                }
+                oad.ifPresent(address -> uqi.setAddress(address.toString()));
             }
             if (columns.contains("bankCard") && phonesCards != null) {
                 uqi.setBankCards(phonesCards.get(ud.getPhoneNo()));

src/main/java/cn/quantgroup/xyqb/service/http/impl/HttpServiceImpl.java

@@ -46,10 +46,7 @@ import javax.net.ssl.SSLContext;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @author mengfan.feng
@@ -209,7 +206,7 @@ public class HttpServiceImpl implements IHttpService {
      */
     private void setParameter(RequestBuilder requestBuilder, Map<String, String> parameters, String method) {
         if (MapUtils.isNotEmpty(parameters)) {
-            parameters = Maps.filterValues(parameters, s -> s != null);
+            parameters = Maps.filterValues(parameters, Objects::nonNull);
 
             Set<Map.Entry<String, String>> entrys = parameters.entrySet();
             /************** Get 请求 **************/
@@ -242,7 +239,7 @@ public class HttpServiceImpl implements IHttpService {
                 .setHeader("Connection", "keep-alive");
 
         if (MapUtils.isNotEmpty(headers)) {
-            headers = Maps.filterValues(headers, s -> s != null);
+            headers = Maps.filterValues(headers, Objects::nonNull);
 
             Set<Map.Entry<String, String>> entrys = headers.entrySet();
             for (Map.Entry<String, String> entry : entrys) {

src/main/java/cn/quantgroup/xyqb/util/XmlUtil.java

-package cn.quantgroup.xyqb.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import java.io.StringWriter;
-
-/**
- * XML <=> Object
- *
- * @author mengfan.feng
- * @time 2015-07-25 18:47
- */
-@SuppressWarnings("unchecked")
-public class XmlUtil {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(XmlUtil.class);
-
-    /**
-     * Disable new
-     */
-    private XmlUtil() {
-    }
-
-    /**
-     * Object => XML
-     *
-     * @param obj
-     * @param clazz
-     * @param <T>
-     * @return
-     */
-    public static <T> String xml(Object obj, Class<T> clazz) {
-        return doXml(obj, clazz, "UTF-8", false);
-    }
-
-    /**
-     * Object => XML
-     *
-     * @param obj
-     * @param clazz
-     * @param charset
-     * @param <T>
-     * @return
-     */
-    public static <T> String xml(Object obj, Class<T> clazz, String charset) {
-        return doXml(obj, clazz, charset, false);
-    }
-
-    /**
-     * Object => XML pretty
-     *
-     * @param obj
-     * @param clazz
-     * @param <T>
-     * @return
-     */
-    public static <T> String xmlPretty(Object obj, Class<T> clazz) {
-        return doXml(obj, clazz, "UTF-8", true);
-    }
-
-    /**
-     * Object => XML pretty
-     *
-     * @param obj
-     * @param clazz
-     * @param charset
-     * @param <T>
-     * @return
-     */
-    public static <T> String xmlPretty(Object obj, Class<T> clazz, String charset) {
-        return doXml(obj, clazz, charset, true);
-    }
-
-    /**
-     * Object => XML
-     *
-     * @param obj
-     * @param clazz
-     * @param pretty
-     * @param <T>
-     * @return
-     */
-    private static <T> String doXml(Object obj, Class<T> clazz, String charset, boolean pretty) {
-        if (obj == null || clazz == null) {
-            return null;
-        }
-
-        StringWriter writer = null;
-        try {
-            JAXBContext context = JAXBContext.newInstance(clazz);
-            Marshaller marshaller = context.createMarshaller();
-            marshaller.setProperty(Marshaller.JAXB_ENCODING, charset);
-            marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, pretty);
-            writer = new StringWriter();
-            marshaller.marshal(obj, writer);
-            return writer.toString();
-        } catch (Exception e) {
-            LOGGER.error("Parse Object to XML error\nXML:{}\nClass<T>:{}", obj.getClass().getName(), clazz.getName(), e);
-            return null;
-        } finally {
-            if (writer != null) {
-                try {
-                    writer.close();
-                } catch (Exception e) {
-                    LOGGER.error("Close Writer error", e);
-                }
-            }
-        }
-    }
-}

src/main/java/cn/quantgroup/xyqb/util/log/WithOutPhoneLoggingEvent.java

-package cn.quantgroup.xyqb.util.log;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.classic.spi.IThrowableProxy;
-import ch.qos.logback.classic.spi.LoggerContextVO;
-import cn.quantgroup.xyqb.util.Utils;
-import org.slf4j.Marker;
-
-import java.util.Map;
-
-/**
- * Created by ocean on 2017/5/4.
- */
-public class WithOutPhoneLoggingEvent implements ILoggingEvent {
-
-    private ILoggingEvent event;
-
-    transient String withOutPhoneFormattedMessage;
-
-    public WithOutPhoneLoggingEvent(ILoggingEvent event) {
-        this.event = event;
-    }
-
-    @Override
-    public String getThreadName() {
-        return this.event.getThreadName();
-    }
-
-    @Override
-    public Level getLevel() {
-        return this.event.getLevel();
-    }
-
-    @Override
-    public String getMessage() {
-        return this.event.getMessage();
-    }
-
-    @Override
-    public Object[] getArgumentArray() {
-        return this.event.getArgumentArray();
-    }
-
-    @Override
-    public String getFormattedMessage() {
-        if (withOutPhoneFormattedMessage != null) {
-            return withOutPhoneFormattedMessage;
-        }
-        // 用正则找到手机号，并打上掩码，替换进去
-        withOutPhoneFormattedMessage = Utils.coverPhone(event.getFormattedMessage());
-        return withOutPhoneFormattedMessage;
-    }
-
-    @Override
-    public String getLoggerName() {
-        return this.event.getLoggerName();
-    }
-
-    @Override
-    public LoggerContextVO getLoggerContextVO() {
-        return this.event.getLoggerContextVO();
-    }
-
-    @Override
-    public IThrowableProxy getThrowableProxy() {
-        return this.event.getThrowableProxy();
-    }
-
-    @Override
-    public StackTraceElement[] getCallerData() {
-        return this.event.getCallerData();
-    }
-
-    @Override
-    public boolean hasCallerData() {
-        return this.event.hasCallerData();
-    }
-
-    @Override
-    public Marker getMarker() {
-        return this.event.getMarker();
-    }
-
-    @Override
-    public Map<String, String> getMDCPropertyMap() {
-        return this.event.getMDCPropertyMap();
-    }
-
-    @Override
-    public Map<String, String> getMdc() {
-        return this.event.getMdc();
-    }
-
-    @Override
-    public long getTimeStamp() {
-        return this.event.getTimeStamp();
-    }
-
-    @Override
-    public void prepareForDeferredProcessing() {
-        this.getFormattedMessage();
-        this.getThreadName();
-        // fixes http://jira.qos.ch/browse/LBCLASSIC-104
-        this.getMDCPropertyMap();
-    }
-
-}

src/main/java/cn/quantgroup/xyqb/util/log/WithOutPhoneRollingFileAppender.java

-package cn.quantgroup.xyqb.util.log;
-
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.rolling.RollingFileAppender;
-
-/**
- * Created by ocean on 2017/5/4.
- */
-public class WithOutPhoneRollingFileAppender<E> extends RollingFileAppender<E> {
-
-    @Override
-    public void doAppend(E eventObject) {
-        if (eventObject instanceof ILoggingEvent) {
-            eventObject = (E) new WithOutPhoneLoggingEvent((ILoggingEvent) eventObject);
-        }
-        super.doAppend(eventObject);
-    }
-}