delombok phase 2

Signed-off-by: Sola <dev@sola.love>

pom.xml

@@ -66,12 +66,6 @@
 			<version>3.1.0</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>1.16.6</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

src/main/java/love/sola/netsupport/api/manager/TicketPush.java

@@ -62,7 +62,7 @@ public class TicketPush extends API {
             if (u == null) {
                 return Error.USER_NOT_FOUND;
             }
-			Ticket t = new Ticket(null, u, desc, null, "Pushed By Admin", null, op, Status.UNCHECKED);
+            Ticket t = new Ticket(u, desc, null, "Pushed By Admin", null, op, Status.UNCHECKED);
             s.save(t);
             s.getTransaction().commit();
             return t;

src/main/java/love/sola/netsupport/api/stuff/ToolsCheck.java

@@ -67,14 +67,12 @@ public class ToolsCheck extends API {
         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;
         }

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<String, Rule> rules;
+
+		public RawConfig() {
+		}
 	}
 
 }

src/main/java/love/sola/netsupport/config/Settings.java

@@ -17,13 +17,11 @@
 
 package love.sola.netsupport.config;
 
-import lombok.ToString;
 import love.sola.netsupport.sql.TableConfig;
 
 /**
  * @author Sola {@literal <dev@sola.love>}
  */
-@ToString
 public class Settings {
 
     public static final int MAX_DESC_LENGTH = 255;
@@ -34,9 +32,6 @@ public class Settings {
         I = TableConfig.getSettings();
     }
     
-	// -------------------------------------------- //
-	// CONFIGURATIONS
-	// -------------------------------------------- //
     public String Wechat_AppId;
     public String Wechat_Secret;
     public String Wechat_Token;
@@ -53,4 +48,17 @@ public class 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 +
+                '}';
+    }
 }

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,7 +28,6 @@ import java.io.InputStream;
  * @author chanjarster
  */
 @XStreamAlias("wechat-config")
-@ToString
 public class WxMpXmlInMemoryConfigStorage extends WxMpInMemoryConfigStorage {
 
     @SuppressWarnings("unchecked")

src/main/java/love/sola/netsupport/session/MapSession.java

@@ -32,31 +32,18 @@
  */
 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.*;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
 
 /**
  * @author Sola {@literal <dev@sola.love>}
  */
-@EqualsAndHashCode(of = "id")
 public final class MapSession implements WxSession, Serializable {
 
-	@Getter
     private final String id;
     private Map<String, Object> sessionAttrs = new HashMap<String, Object>();
-	@Getter
     private long creationTime = System.currentTimeMillis();
-	@Getter
-	@Setter
     private long lastAccessedTime = creationTime;
-	@Getter
     private boolean invalidated = false;
 
     /**
@@ -102,4 +89,38 @@ public final class MapSession implements WxSession, Serializable {
         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);
+    }
 }