Browse Source

Update to Java 14

Updated Picocli to 4.5.0.
Updated JGit to 5.8.1.
Updated SLF4J to 1.7.30.
Updated Log4J to 2.13.3.
Updated MySQL connector to 8.0.21.
Updated MSSQL connector to 8.4.0.
Updated MariaDB connector 2.6.2.
Updated PostgreSQL connector 42.2.15.
Updated Hsqldb to 2.5.1.
Updated H2 to 1.4.200.
Updated Derby client to 10.15.2.0.
Updated Owner to 1.0.12.
Updated L2J Commons to 2.6.3.0.

Minor fixes and optimizations.
Zoey76 4 năm trước cách đây
mục cha
commit
163279e7d9

+ 2 - 1
.gitignore

@@ -2,4 +2,5 @@
 .project
 .settings/
 target/
-dumps/
+dumps/
+*.iml

+ 2 - 2
bitbucket-pipelines.yml

@@ -1,4 +1,4 @@
-image: maven:3.6.3-jdk-11-slim
+image: openjdk:14-alpine
 
 pipelines:
    default:
@@ -6,7 +6,7 @@ pipelines:
          caches:
           - maven
          script:
-          - mvn install
+          - /bin/sh mvnw install
          artifacts:
           - target/*.zip
       - step:

+ 19 - 19
pom.xml

@@ -3,31 +3,31 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.l2jserver</groupId>
 	<artifactId>l2j-server-cli</artifactId>
-	<version>1.0.4</version>
+	<version>1.0.5</version>
 	<name>L2J Server Command Line</name>
 	<properties>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.source>14</maven.compiler.source>
+		<maven.compiler.target>14</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- Dependencies -->
-		<picocli.version>3.9.3</picocli.version>
-		<jgit.version>5.2.1.201812262042-r</jgit.version>
-		<slf4j.version>1.7.25</slf4j.version>
-		<log4j.version>2.11.1</log4j.version>
-		<mysql-connector-java.version>8.0.17</mysql-connector-java.version>
-		<mariadb-java-client.version>2.4.3</mariadb-java-client.version>
-		<mssql-jdbc.version>7.4.1.jre11</mssql-jdbc.version>
-		<postgresql.version>42.2.6</postgresql.version>
-		<hsqldb.version>2.5.0</hsqldb.version>
-		<h2.version>1.4.199</h2.version>
-		<derbyclient.version>10.15.1.3</derbyclient.version>
+		<picocli.version>4.5.0</picocli.version>
+		<jgit.version>5.8.1.202007141445-r</jgit.version>
+		<slf4j.version>1.7.30</slf4j.version>
+		<log4j.version>2.13.3</log4j.version>
+		<mysql-connector-java.version>8.0.21</mysql-connector-java.version>
+		<mariadb-java-client.version>2.6.2</mariadb-java-client.version>
+		<mssql-jdbc.version>8.4.0.jre14</mssql-jdbc.version>
+		<postgresql.version>42.2.15</postgresql.version>
+		<hsqldb.version>2.5.1</hsqldb.version>
+		<h2.version>1.4.200</h2.version>
+		<derbyclient.version>10.15.2.0</derbyclient.version>
 		<asciitable.version>0.3.2</asciitable.version>
-		<owner.version>1.0.10</owner.version>
-		<l2j-server-commons.version>2.6.1.1</l2j-server-commons.version>
+		<owner.version>1.0.12</owner.version>
+		<l2j-server-commons.version>2.6.3.0</l2j-server-commons.version>
 		<!-- Plugins -->
-		<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
-		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-		<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
+		<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
+		<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+		<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
 	</properties>
 	<repositories>
 		<repository>

+ 11 - 5
src/main/java/com/l2jserver/cli/L2JServerCLI.java

@@ -54,13 +54,19 @@ import picocli.CommandLine.Command;
 public class L2JServerCLI implements Callable<Void> {
 	
 	@Override
-	public Void call() throws Exception {
+	public Void call() {
+		System.out.println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
+		System.out.println("~                                     ~");
+		System.out.println("~ (>^_^)> Welcome to L2J CLI  <(^_^<) ~");
+		System.out.println("~                                     ~");
+		System.out.println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
+		System.out.println();
 		try (var isr = new InputStreamReader(System.in); //
 			var br = new BufferedReader(isr)) {
 			while (true) {
-				System.out.print("> ");
-				final String[] args = br.readLine().split(" ");
-				CommandLine.call(new L2JServerCLI(), args);
+				System.out.print(">>> ");
+				final var args = br.readLine().split(" ");
+				new CommandLine(new L2JServerCLI()).execute(args);
 			}
 		} catch (Exception ex) {
 			ex.printStackTrace();
@@ -69,6 +75,6 @@ public class L2JServerCLI implements Callable<Void> {
 	}
 	
 	public static void main(String[] args) {
-		CommandLine.call(new L2JServerCLI(), args);
+		new CommandLine(new L2JServerCLI()).execute(args);
 	}
 }

+ 4 - 4
src/main/java/com/l2jserver/cli/command/CodeCommand.java

@@ -62,20 +62,20 @@ public class CodeCommand extends AbstractCommand {
 		try {
 			switch (cloneType) {
 				case BOTH: {
-					LOG.info("Clonning L2J Server");
+					LOG.info("Cloning L2J Server");
 					cloneRepository(coreRepository, coreDirectory);
 					
-					LOG.info("Clonning L2J DataPack");
+					LOG.info("Cloning L2J DataPack");
 					cloneRepository(datapackRepository, datapackDirectory);
 					break;
 				}
 				case CORE: {
-					LOG.info("Clonning L2J Server");
+					LOG.info("Cloning L2J Server");
 					cloneRepository(coreRepository, coreDirectory);
 					break;
 				}
 				case DATAPACK: {
-					LOG.info("Clonning L2J DataPack");
+					LOG.info("Cloning L2J DataPack");
 					cloneRepository(datapackRepository, datapackDirectory);
 					break;
 				}

+ 1 - 1
src/main/java/com/l2jserver/cli/command/account/AccountListCommand.java

@@ -43,6 +43,6 @@ public class AccountListCommand extends AbstractCommand {
 	public void run() {
 		System.out.println("Listing " + accountListType.name().toLowerCase() + " accounts...");
 		
-		AccountDAO.getInstance().listAccounts(accountListType).entrySet().forEach(a -> System.out.println(a.getKey() + " (" + a.getValue() + ")"));
+		AccountDAO.getInstance().listAccounts(accountListType).forEach((key, value) -> System.out.println(key + " (" + value + ")"));
 	}
 }

+ 3 - 3
src/main/java/com/l2jserver/cli/config/Configuration.java

@@ -29,11 +29,11 @@ public enum Configuration {
 	
 	INSTANCE;
 	
-	private LoginServerConfiguration loginServer;
+	private final LoginServerConfiguration loginServer;
 	
-	private GameServerConfiguration gameServer;
+	private final GameServerConfiguration gameServer;
 	
-	private Configuration() {
+	Configuration() {
 		loginServer = ConfigFactory.create(LoginServerConfiguration.class);
 		gameServer = ConfigFactory.create(GameServerConfiguration.class);
 	}

+ 3 - 3
src/main/java/com/l2jserver/cli/dao/AbstractDAO.java

@@ -46,9 +46,9 @@ class AbstractDAO {
 	
 	private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss");
 	
-	private ConnectionFactory connectionFactory;
+	private final ConnectionFactory connectionFactory;
 	
-	private String database;
+	private final String database;
 	
 	AbstractDAO(ServerConfiguration server) {
 		this.database = server.getDatabaseName();
@@ -96,7 +96,7 @@ class AbstractDAO {
 				
 				line = line.trim();
 				if (!line.isEmpty()) {
-					sb.append(line + System.getProperty("line.separator"));
+					sb.append(line).append(System.getProperty("line.separator"));
 				}
 				
 				if (line.endsWith(";")) {

+ 2 - 2
src/main/java/com/l2jserver/cli/database/ConnectionFactory.java

@@ -30,9 +30,9 @@ import java.util.Properties;
  */
 public class ConnectionFactory {
 	
-	private String url;
+	private final String url;
 	
-	private String databaseName;
+	private final String databaseName;
 	
 	private final Properties properties = new Properties();
 	

+ 0 - 1
src/main/java/com/l2jserver/cli/model/ServerNames.java

@@ -31,7 +31,6 @@ public class ServerNames {
 	private static final Map<Integer, String> SERVERS = new HashMap<>();
 	
 	static {
-		SERVERS.put(0, "Bartz");
 		SERVERS.put(0, "Bartz");
 		SERVERS.put(1, "Sieghardt");
 		SERVERS.put(2, "Kain");

+ 1 - 1
src/main/java/com/l2jserver/cli/util/FileWriterStdout.java

@@ -38,7 +38,7 @@ public class FileWriterStdout extends BufferedWriter {
 	}
 	
 	public void println(String line) throws IOException {
-		append(line + System.lineSeparator());
+		append(line).append(System.lineSeparator());
 	}
 	
 	public void print(String text) throws IOException {

+ 8 - 7
src/main/java/com/l2jserver/cli/util/LoggerProgressMonitor.java

@@ -35,14 +35,14 @@ public class LoggerProgressMonitor extends BatchingProgressMonitor {
 	
 	@Override
 	protected void onUpdate(String taskName, int workCurr) {
-		StringBuilder s = new StringBuilder();
+		final var s = new StringBuilder();
 		format(s, taskName, workCurr);
 		send(s);
 	}
 	
 	@Override
 	protected void onEndTask(String taskName, int workCurr) {
-		StringBuilder s = new StringBuilder();
+		final var s = new StringBuilder();
 		format(s, taskName, workCurr);
 		s.append("\n");
 		send(s);
@@ -60,14 +60,14 @@ public class LoggerProgressMonitor extends BatchingProgressMonitor {
 	
 	@Override
 	protected void onUpdate(String taskName, int cmp, int totalWork, int pcnt) {
-		StringBuilder s = new StringBuilder();
+		final var s = new StringBuilder();
 		format(s, taskName, cmp, totalWork, pcnt);
 		send(s);
 	}
 	
 	@Override
 	protected void onEndTask(String taskName, int cmp, int totalWork, int pcnt) {
-		StringBuilder s = new StringBuilder();
+		final var s = new StringBuilder();
 		format(s, taskName, cmp, totalWork, pcnt);
 		s.append("\n");
 		send(s);
@@ -81,9 +81,10 @@ public class LoggerProgressMonitor extends BatchingProgressMonitor {
 			s.append(' ');
 		
 		String endStr = String.valueOf(totalWork);
-		String curStr = String.valueOf(cmp);
-		while (curStr.length() < endStr.length())
-			curStr = " " + curStr;
+		StringBuilder curStr = new StringBuilder(String.valueOf(cmp));
+		while (curStr.length() < endStr.length()) {
+			curStr.insert(0, " ");
+		}
 		if (pcnt < 100)
 			s.append(' ');
 		if (pcnt < 10)