From 552ea7934c617dcb344e1188d9cdd420bf02e8a9 Mon Sep 17 00:00:00 2001 From: winLsy <18332763730@163.com> Date: Wed, 24 Jan 2018 19:19:31 +0800 Subject: [PATCH] =?UTF-8?q?lombok=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/ElasticsearchParamConfig.java | 21 ++----- .../param/FastDFSClientParamConfig.java | 59 ++----------------- .../mybatis/generator/extend/pojo/Db.java | 2 - .../generator/extend/util/PropertiesUtil.java | 2 +- .../code/filter/ValidateCodeFilter.java | 11 ++-- .../micro/fast/oauth/OauthApplication.java | 1 - 6 files changed, 15 insertions(+), 81 deletions(-) diff --git a/boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/param/ElasticsearchParamConfig.java b/boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/param/ElasticsearchParamConfig.java index bd62c9b..30e0d06 100644 --- a/boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/param/ElasticsearchParamConfig.java +++ b/boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/param/ElasticsearchParamConfig.java @@ -1,6 +1,10 @@ package com.micro.fast.elasticsearch.config.param; +import lombok.Getter; +import lombok.Setter; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.security.oauth2.resource.UserInfoRestTemplateFactory; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; import org.springframework.validation.annotation.Validated; @@ -18,6 +22,8 @@ import java.util.ArrayList; @ConfigurationProperties(prefix = "elasticsearch") @AutoConfigureBefore(value = com.micro.fast.elasticsearch.config.ElasticsearchConfig.class) @Validated +@Getter +@Setter public class ElasticsearchParamConfig { /** @@ -32,19 +38,4 @@ public class ElasticsearchParamConfig { @NotNull private ArrayList settings; - public ArrayList getHosts() { - return hosts; - } - - public void setHosts(ArrayList hosts) { - this.hosts = hosts; - } - - public ArrayList getSettings() { - return settings; - } - - public void setSettings(ArrayList settings) { - this.settings = settings; - } } diff --git a/boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/param/FastDFSClientParamConfig.java b/boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/param/FastDFSClientParamConfig.java index 6dc313a..5844c62 100644 --- a/boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/param/FastDFSClientParamConfig.java +++ b/boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/param/FastDFSClientParamConfig.java @@ -1,5 +1,7 @@ package com.micro.fast.fastdfs.config.param; +import lombok.Getter; +import lombok.Setter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; @@ -17,6 +19,8 @@ import javax.validation.constraints.NotNull; @Validated @ConfigurationProperties(prefix = "fastdfs") @AutoConfigureBefore({com.micro.fast.fastdfs.config.FastDFSClientConfig.class}) +@Setter +@Getter public class FastDFSClientParamConfig { private String connectTimeoutInSeconds; @@ -34,59 +38,4 @@ public class FastDFSClientParamConfig { @NotNull private String trackerServers; - public String getConnectTimeoutInSeconds() { - return connectTimeoutInSeconds; - } - - public void setConnectTimeoutInSeconds(String connectTimeoutInSeconds) { - this.connectTimeoutInSeconds = connectTimeoutInSeconds; - } - - public String getNetworkTimeoutInSeconds() { - return networkTimeoutInSeconds; - } - - public void setNetworkTimeoutInSeconds(String networkTimeoutInSeconds) { - this.networkTimeoutInSeconds = networkTimeoutInSeconds; - } - - public String getCharset() { - return charset; - } - - public void setCharset(String charset) { - this.charset = charset; - } - - public String getHttpAntiStealToken() { - return httpAntiStealToken; - } - - public void setHttpAntiStealToken(String httpAntiStealToken) { - this.httpAntiStealToken = httpAntiStealToken; - } - - public String getHttpSecretKey() { - return httpSecretKey; - } - - public void setHttpSecretKey(String httpSecretKey) { - this.httpSecretKey = httpSecretKey; - } - - public String getHttpTrackerHttpPort() { - return httpTrackerHttpPort; - } - - public void setHttpTrackerHttpPort(String httpTrackerHttpPort) { - this.httpTrackerHttpPort = httpTrackerHttpPort; - } - - public String getTrackerServers() { - return trackerServers; - } - - public void setTrackerServers(String trackerServers) { - this.trackerServers = trackerServers; - } } diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/pojo/Db.java b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/pojo/Db.java index ab7d2c1..54b5568 100644 --- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/pojo/Db.java +++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/pojo/Db.java @@ -1,7 +1,5 @@ package com.micro.fast.mybatis.generator.extend.pojo; -import java.io.Serializable; - /** * mybatisGenerator所需要的数据库连接配置 */ diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/util/PropertiesUtil.java b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/util/PropertiesUtil.java index b5f691a..9491c8b 100644 --- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/util/PropertiesUtil.java +++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/util/PropertiesUtil.java @@ -45,7 +45,7 @@ public class PropertiesUtil { } catch (FileNotFoundException e) { e.printStackTrace(); } - //３.将输入流写入到properties对象中 + //3.将输入流写入到properties对象中 if (properties==null){ properties = new Properties(); } diff --git a/boot-starter/boot-starter-security-oauth/src/main/java/com/micro/fast/security/app/validate/code/filter/ValidateCodeFilter.java b/boot-starter/boot-starter-security-oauth/src/main/java/com/micro/fast/security/app/validate/code/filter/ValidateCodeFilter.java index 2c1078c..e41ff03 100644 --- a/boot-starter/boot-starter-security-oauth/src/main/java/com/micro/fast/security/app/validate/code/filter/ValidateCodeFilter.java +++ b/boot-starter/boot-starter-security-oauth/src/main/java/com/micro/fast/security/app/validate/code/filter/ValidateCodeFilter.java @@ -8,8 +8,6 @@ import com.micro.fast.security.app.validate.code.pojo.ValidateCode; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.web.authentication.AuthenticationFailureHandler; -import org.springframework.social.connect.web.HttpSessionSessionStrategy; -import org.springframework.social.connect.web.SessionStrategy; import org.springframework.util.AntPathMatcher; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.filter.OncePerRequestFilter; @@ -19,7 +17,10 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; /** * 图片验证码校验过滤器 @@ -38,10 +39,6 @@ public class ValidateCodeFilter extends OncePerRequestFilter implements Initiali - /** - * session操作工具类 - */ - private SessionStrategy sessionStrategy = new HttpSessionSessionStrategy(); private SecurityProperties securityProperties; diff --git a/ms/oauth/src/main/java/com/micro/fast/oauth/OauthApplication.java b/ms/oauth/src/main/java/com/micro/fast/oauth/OauthApplication.java index 4161ac5..652313a 100644 --- a/ms/oauth/src/main/java/com/micro/fast/oauth/OauthApplication.java +++ b/ms/oauth/src/main/java/com/micro/fast/oauth/OauthApplication.java @@ -1,7 +1,6 @@ package com.micro.fast.oauth; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.SpringCloudApplication; import org.springframework.cloud.netflix.feign.EnableFeignClients;