From 4737957043f22d391a29a3b7b4f09912edfcb62e Mon Sep 17 00:00:00 2001 From: Sola Date: Fri, 15 Dec 2017 08:52:49 +0800 Subject: [PATCH] delombok phase 2 Signed-off-by: Sola --- pom.xml | 6 - .../netsupport/api/manager/TicketPush.java | 56 ++++---- .../sola/netsupport/api/stuff/ToolsCheck.java | 110 ++++++++------- .../love/sola/netsupport/config/Cortana.java | 9 +- .../love/sola/netsupport/config/Settings.java | 54 +++++--- .../config/WxMpXmlInMemoryConfigStorage.java | 16 +-- .../sola/netsupport/session/MapSession.java | 131 ++++++++++-------- 7 files changed, 202 insertions(+), 180 deletions(-) diff --git a/pom.xml b/pom.xml index 25bea55..f27b56d 100644 --- a/pom.xml +++ b/pom.xml @@ -66,12 +66,6 @@ 3.1.0 provided - - org.projectlombok - lombok - 1.16.6 - provided - junit junit diff --git a/src/main/java/love/sola/netsupport/api/manager/TicketPush.java b/src/main/java/love/sola/netsupport/api/manager/TicketPush.java index f19f9f1..c55eb5c 100644 --- a/src/main/java/love/sola/netsupport/api/manager/TicketPush.java +++ b/src/main/java/love/sola/netsupport/api/manager/TicketPush.java @@ -39,34 +39,34 @@ import javax.servlet.http.HttpServletRequest; */ public class TicketPush extends API { - public TicketPush() { - url = "/admin/ticketpush"; - access = Access.LEADER; - authorize = Command.LOGIN; - } + public TicketPush() { + url = "/admin/ticketpush"; + access = Access.LEADER; + authorize = Command.LOGIN; + } - @Override - protected Object process(HttpServletRequest req, WxSession session) throws Exception { - String uid = req.getParameter("uid"); - String desc = req.getParameter("desc"); - if (Checker.hasNull(uid, desc)) { - return Error.PARAMETER_REQUIRED; - } - if (desc.length() > Settings.MAX_DESC_LENGTH) { - return Error.LENGTH_LIMIT_EXCEEDED; - } - Operator op = session.getAttribute(Attribute.OPERATOR); - try (Session s = SQLCore.sf.openSession()) { - s.beginTransaction(); - User u = s.get(User.class, Long.parseLong(uid)); - if (u == null) { - return Error.USER_NOT_FOUND; - } - Ticket t = new Ticket(null, u, desc, null, "Pushed By Admin", null, op, Status.UNCHECKED); - s.save(t); - s.getTransaction().commit(); - return t; - } - } + @Override + protected Object process(HttpServletRequest req, WxSession session) throws Exception { + String uid = req.getParameter("uid"); + String desc = req.getParameter("desc"); + if (Checker.hasNull(uid, desc)) { + return Error.PARAMETER_REQUIRED; + } + if (desc.length() > Settings.MAX_DESC_LENGTH) { + return Error.LENGTH_LIMIT_EXCEEDED; + } + Operator op = session.getAttribute(Attribute.OPERATOR); + try (Session s = SQLCore.sf.openSession()) { + s.beginTransaction(); + User u = s.get(User.class, Long.parseLong(uid)); + if (u == null) { + return Error.USER_NOT_FOUND; + } + Ticket t = new Ticket(u, desc, null, "Pushed By Admin", null, op, Status.UNCHECKED); + s.save(t); + s.getTransaction().commit(); + return t; + } + } } diff --git a/src/main/java/love/sola/netsupport/api/stuff/ToolsCheck.java b/src/main/java/love/sola/netsupport/api/stuff/ToolsCheck.java index b51513b..64dfd91 100644 --- a/src/main/java/love/sola/netsupport/api/stuff/ToolsCheck.java +++ b/src/main/java/love/sola/netsupport/api/stuff/ToolsCheck.java @@ -41,64 +41,62 @@ import java.util.Date; */ public class ToolsCheck extends API { - public ToolsCheck() { - url = "/admin/toolscheck"; - access = Access.MEMBER; - authorize = Command.LOGIN; - } + public ToolsCheck() { + url = "/admin/toolscheck"; + access = Access.MEMBER; + authorize = Command.LOGIN; + } - @Override - protected Object process(HttpServletRequest req, WxSession session) throws Exception { - if (req.getMethod().equals("GET")) { - return query(req, session); - } else if (req.getMethod().equals("POST")) { - return submit(req, session); - } - return null; - } + @Override + protected Object process(HttpServletRequest req, WxSession session) throws Exception { + if (req.getMethod().equals("GET")) { + return query(req, session); + } else if (req.getMethod().equals("POST")) { + return submit(req, session); + } + return null; + } - private Object submit(HttpServletRequest req, WxSession session) { - Operator op = session.getAttribute(Attribute.OPERATOR); - int status = Integer.valueOf(getParameterWithDefault(req.getParameter("status"), "0")); - String remark = req.getParameter("remark"); - if (status != 0 && StringUtils.isBlank(remark)) { - return Error.PARAMETER_REQUIRED; - } - try (Session s = SQLCore.sf.openSession()) { - s.beginTransaction(); - s.save(new love.sola.netsupport.pojo.ToolsCheck( - null, - op, - op.getBlock(), - new Date(), - status, - remark - ) - ); - s.getTransaction().commit(); - return Error.OK; - } - } + private Object submit(HttpServletRequest req, WxSession session) { + Operator op = session.getAttribute(Attribute.OPERATOR); + int status = Integer.valueOf(getParameterWithDefault(req.getParameter("status"), "0")); + String remark = req.getParameter("remark"); + if (status != 0 && StringUtils.isBlank(remark)) { + return Error.PARAMETER_REQUIRED; + } + try (Session s = SQLCore.sf.openSession()) { + s.beginTransaction(); + s.save(new love.sola.netsupport.pojo.ToolsCheck( + op, + op.getBlock(), + new Date(), + status, + remark + )); + s.getTransaction().commit(); + return Error.OK; + } + } - private Object query(HttpServletRequest req, WxSession session) { - int status = Integer.valueOf(getParameterWithDefault(req.getParameter("status"), "0")); - Date after = getDay(getParameterAsDate(req.getParameter("after"), getToday())); - Date before = getDay(getParameterAsDate(req.getParameter("before"), getToday())); - before = DateUtils.addDays(before, 1); - int block = Integer.valueOf(getParameterWithDefault(req.getParameter("block"), "0")); - try (Session s = SQLCore.sf.openSession()) { - Criteria query = s.createCriteria(love.sola.netsupport.pojo.ToolsCheck.class); - query.add( - Restrictions.sqlRestriction( - "{alias}.status & ? = ?", - new Object[]{status, status}, - new Type[]{IntegerType.INSTANCE, IntegerType.INSTANCE} - ) - ); - query.add(Restrictions.between("checkTime", after, before)); - if (block != 0) query.add(Restrictions.eq("block", block)); - return query.list(); - } - } + private Object query(HttpServletRequest req, WxSession session) { + int status = Integer.valueOf(getParameterWithDefault(req.getParameter("status"), "0")); + Date after = getDay(getParameterAsDate(req.getParameter("after"), getToday())); + Date before = getDay(getParameterAsDate(req.getParameter("before"), getToday())); + before = DateUtils.addDays(before, 1); + int block = Integer.valueOf(getParameterWithDefault(req.getParameter("block"), "0")); + try (Session s = SQLCore.sf.openSession()) { + Criteria query = s.createCriteria(love.sola.netsupport.pojo.ToolsCheck.class); + query.add( + Restrictions.sqlRestriction( + "{alias}.status & ? = ?", + new Object[]{status, status}, + new Type[]{IntegerType.INSTANCE, IntegerType.INSTANCE} + ) + ); + query.add(Restrictions.between("checkTime", after, before)); + if (block != 0) query.add(Restrictions.eq("block", block)); + return query.list(); + } + } } diff --git a/src/main/java/love/sola/netsupport/config/Cortana.java b/src/main/java/love/sola/netsupport/config/Cortana.java index 4e3c4d8..afd87c5 100644 --- a/src/main/java/love/sola/netsupport/config/Cortana.java +++ b/src/main/java/love/sola/netsupport/config/Cortana.java @@ -17,7 +17,6 @@ package love.sola.netsupport.config; -import lombok.Data; import org.yaml.snakeyaml.Yaml; import java.io.InputStream; @@ -42,15 +41,19 @@ public class Cortana { String[] replies; } - @Data public static class Rule { String[] regexp; String[] replies; + + public Rule() { + } } - @Data public static class RawConfig { Map rules; + + public RawConfig() { + } } } diff --git a/src/main/java/love/sola/netsupport/config/Settings.java b/src/main/java/love/sola/netsupport/config/Settings.java index 21bd9d0..6e760a0 100644 --- a/src/main/java/love/sola/netsupport/config/Settings.java +++ b/src/main/java/love/sola/netsupport/config/Settings.java @@ -17,40 +17,48 @@ package love.sola.netsupport.config; -import lombok.ToString; import love.sola.netsupport.sql.TableConfig; /** * @author Sola {@literal } */ -@ToString public class Settings { - public static final int MAX_DESC_LENGTH = 255; + public static final int MAX_DESC_LENGTH = 255; - public static Settings I; + public static Settings I; - static { - I = TableConfig.getSettings(); - } + static { + I = TableConfig.getSettings(); + } + + public String Wechat_AppId; + public String Wechat_Secret; + public String Wechat_Token; + public String Wechat_AesKey; - // -------------------------------------------- // - // CONFIGURATIONS - // -------------------------------------------- // - public String Wechat_AppId; - public String Wechat_Secret; - public String Wechat_Token; - public String Wechat_AesKey; + public int Check_Spam_Cache_Expire_Time; + public int Check_Spam_Interval; - public int Check_Spam_Cache_Expire_Time; - public int Check_Spam_Interval; + public int User_Session_Max_Inactive; + public int User_Wechat_Cache_Expire_Time; - public int User_Session_Max_Inactive; - public int User_Wechat_Cache_Expire_Time; - - //No arg constructor for Yaml.loadAs - public Settings() { - I = this; - } + //No arg constructor for Yaml.loadAs + public Settings() { + I = this; + } + @Override + public String toString() { + return "Settings{" + + "Wechat_AppId='" + Wechat_AppId + '\'' + + ", Wechat_Secret='" + Wechat_Secret + '\'' + + ", Wechat_Token='" + Wechat_Token + '\'' + + ", Wechat_AesKey='" + Wechat_AesKey + '\'' + + ", Check_Spam_Cache_Expire_Time=" + Check_Spam_Cache_Expire_Time + + ", Check_Spam_Interval=" + Check_Spam_Interval + + ", User_Session_Max_Inactive=" + User_Session_Max_Inactive + + ", User_Wechat_Cache_Expire_Time=" + User_Wechat_Cache_Expire_Time + + '}'; + } } diff --git a/src/main/java/love/sola/netsupport/config/WxMpXmlInMemoryConfigStorage.java b/src/main/java/love/sola/netsupport/config/WxMpXmlInMemoryConfigStorage.java index 576fcf8..d9a1c89 100644 --- a/src/main/java/love/sola/netsupport/config/WxMpXmlInMemoryConfigStorage.java +++ b/src/main/java/love/sola/netsupport/config/WxMpXmlInMemoryConfigStorage.java @@ -19,7 +19,6 @@ package love.sola.netsupport.config; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.annotations.XStreamAlias; -import lombok.ToString; import me.chanjar.weixin.common.util.xml.XStreamInitializer; import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage; @@ -29,15 +28,14 @@ import java.io.InputStream; * @author chanjarster */ @XStreamAlias("wechat-config") -@ToString public class WxMpXmlInMemoryConfigStorage extends WxMpInMemoryConfigStorage { - @SuppressWarnings("unchecked") - public static T fromXml(Class clazz, InputStream is) { - XStream xstream = XStreamInitializer.getInstance(); - xstream.alias("wechat-config", clazz); - xstream.processAnnotations(clazz); - return (T) xstream.fromXML(is); - } + @SuppressWarnings("unchecked") + public static T fromXml(Class clazz, InputStream is) { + XStream xstream = XStreamInitializer.getInstance(); + xstream.alias("wechat-config", clazz); + xstream.processAnnotations(clazz); + return (T) xstream.fromXML(is); + } } diff --git a/src/main/java/love/sola/netsupport/session/MapSession.java b/src/main/java/love/sola/netsupport/session/MapSession.java index b8a4fb6..db385da 100644 --- a/src/main/java/love/sola/netsupport/session/MapSession.java +++ b/src/main/java/love/sola/netsupport/session/MapSession.java @@ -32,74 +32,95 @@ */ package love.sola.netsupport.session; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.UUID; +import java.util.*; /** * @author Sola {@literal } */ -@EqualsAndHashCode(of = "id") public final class MapSession implements WxSession, Serializable { - @Getter - private final String id; - private Map sessionAttrs = new HashMap(); - @Getter - private long creationTime = System.currentTimeMillis(); - @Getter - @Setter - private long lastAccessedTime = creationTime; - @Getter - private boolean invalidated = false; + private final String id; + private Map sessionAttrs = new HashMap(); + private long creationTime = System.currentTimeMillis(); + private long lastAccessedTime = creationTime; + private boolean invalidated = false; - /** - * Creates a new instance with a secure randomly generated identifier. - */ - public MapSession() { - this(UUID.randomUUID().toString()); - } + /** + * Creates a new instance with a secure randomly generated identifier. + */ + public MapSession() { + this(UUID.randomUUID().toString()); + } - /** - * Creates a new instance with the specified id. This is preferred to the - * default constructor when the id is known to prevent unnecessary consumption on - * entropy which can be slow. - * - * @param id the identifier to use - */ - public MapSession(String id) { - this.id = id; - } + /** + * Creates a new instance with the specified id. This is preferred to the + * default constructor when the id is known to prevent unnecessary consumption on + * entropy which can be slow. + * + * @param id the identifier to use + */ + public MapSession(String id) { + this.id = id; + } - @SuppressWarnings("unchecked") - public T getAttribute(String attributeName) { - return (T) sessionAttrs.get(attributeName); - } + @SuppressWarnings("unchecked") + public T getAttribute(String attributeName) { + return (T) sessionAttrs.get(attributeName); + } - public Set getAttributeNames() { - return sessionAttrs.keySet(); - } + public Set getAttributeNames() { + return sessionAttrs.keySet(); + } - public void setAttribute(String attributeName, Object attributeValue) { - if (attributeValue == null) { - removeAttribute(attributeName); - } else { - sessionAttrs.put(attributeName, attributeValue); - } - } + public void setAttribute(String attributeName, Object attributeValue) { + if (attributeValue == null) { + removeAttribute(attributeName); + } else { + sessionAttrs.put(attributeName, attributeValue); + } + } - public void removeAttribute(String attributeName) { - sessionAttrs.remove(attributeName); - } + public void removeAttribute(String attributeName) { + sessionAttrs.remove(attributeName); + } - public void invalidate() { - invalidated = true; - } + public void invalidate() { + invalidated = true; + } + public long getLastAccessedTime() { + return lastAccessedTime; + } + + public void setLastAccessedTime(long lastAccessedTime) { + this.lastAccessedTime = lastAccessedTime; + } + + @Override + public String getId() { + + return id; + } + + public long getCreationTime() { + return creationTime; + } + + public boolean isInvalidated() { + return invalidated; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof MapSession)) return false; + MapSession that = (MapSession) o; + return Objects.equals(id, that.id); + } + + @Override + public int hashCode() { + return Objects.hash(id); + } } \ No newline at end of file