Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92 from P0nk/project-improvements

Browse Source 
Project improvements - bump deps, get rid of commons-io
This commit is contained in:
Ponk
2022-08-11 01:26:31 +02:00
committed by GitHub
parent 76f4b681fe 65f8a6e335
commit 1c0aebf6aa
4 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pom.xml
View File

@@ -19,19 +19,18 @@
<mainClass>net.server.Server</mainClass> <mainClass>net.server.Server</mainClass>
<!-- Maven plugins --> <!-- Maven plugins -->
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> <!-- For running unit tests --> <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version> <!-- For running unit tests -->
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <!-- Disabled. (for building thin jar) --> <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version> <!-- Disabled. (for building thin jar) -->
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version> <!-- For packaging the executable fat jar --> <maven-assembly-plugin.version>3.4.2</maven-assembly-plugin.version> <!-- For packaging the executable fat jar -->
<!-- Dependencies --> <!-- Dependencies -->
<slf4j-api.version>1.7.36</slf4j-api.version> <!-- Logging facade --> <slf4j-api.version>1.7.36</slf4j-api.version> <!-- Logging facade -->
<log4j.version>2.18.0</log4j.version> <!-- Slf4j implementation --> <log4j.version>2.18.0</log4j.version> <!-- Slf4j implementation -->
<graalvm.version>22.2.0</graalvm.version> <!-- ScriptEngine implementation --> <graalvm.version>22.2.0</graalvm.version> <!-- ScriptEngine implementation -->
<netty.version>4.1.79.Final</netty.version> <!-- Networking --> <netty.version>4.1.79.Final</netty.version> <!-- Networking -->
<junit.version>5.8.2</junit.version> <!-- Unit test --> <junit.version>5.9.0</junit.version> <!-- Unit test -->
<yamlbeans.version>1.15</yamlbeans.version> <!-- Config file --> <yamlbeans.version>1.15</yamlbeans.version> <!-- Config file -->
<jcip-annotations.version>1.0</jcip-annotations.version> <!-- Annotations for concurrency documentation --> <jcip-annotations.version>1.0</jcip-annotations.version> <!-- Annotations for concurrency documentation -->
<commons-io.version>2.11.0</commons-io.version> <!-- Util library used by some of our tools -->
<HikariCP.version>5.0.1</HikariCP.version> <!-- Database connection pool --> <HikariCP.version>5.0.1</HikariCP.version> <!-- Database connection pool -->
<mysql-connector-java.version>8.0.30</mysql-connector-java.version> <!-- MySQL JDBC driver --> <mysql-connector-java.version>8.0.30</mysql-connector-java.version> <!-- MySQL JDBC driver -->
</properties> </properties>
@@ -47,11 +46,6 @@
<artifactId>jcip-annotations</artifactId> <artifactId>jcip-annotations</artifactId>
<version>${jcip-annotations.version}</version> <version>${jcip-annotations.version}</version>
</dependency> </dependency>
<dependency> <!-- only used for some tools -->
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
<!-- Database --> <!-- Database -->
<dependency> <dependency>
@@ -169,6 +163,9 @@
<manifest> <manifest>
<mainClass>${mainClass}</mainClass> <mainClass>${mainClass}</mainClass>
</manifest> </manifest>
<manifestEntries>
<Multi-Release>true</Multi-Release>
</manifestEntries>
</archive> </archive>
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>

59
src/main/java/tools/mapletools/EventMethodFiller.java
View File

@@ -1,11 +1,10 @@
package tools.mapletools; package tools.mapletools;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.*; import java.util.*;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -20,14 +19,28 @@ import java.util.regex.Pattern;
* Estimated parse time: 10 seconds * Estimated parse time: 10 seconds
*/ */
public class EventMethodFiller { public class EventMethodFiller {
private static final Collection<String> RELEVANT_FILE_EXTENSIONS = Set.of("sql", "js", "txt", "java");
private static boolean foundMatchingDataOnFile(String fileContent, Pattern pattern) { private static boolean foundMatchingDataOnFile(String fileContent, Pattern pattern) {
Matcher matcher = pattern.matcher(fileContent); Matcher matcher = pattern.matcher(fileContent);
return matcher.find(); return matcher.find();
} }
private static void fileSearchMatchingData(File file, Map<Pattern, String> functions) { private static void filterDirectorySearchMatchingData(String directoryPath, Map<Pattern, String> functions)
throws IOException {
Files.walk(Path.of(directoryPath))
.filter(EventMethodFiller::isRelevantFile)
.forEach(path -> fileSearchMatchingData(path, functions));
}
private static boolean isRelevantFile(Path path) {
String fileName = path.getFileName().toString();
return RELEVANT_FILE_EXTENSIONS.stream().anyMatch(fileName::endsWith);
}
private static void fileSearchMatchingData(Path file, Map<Pattern, String> functions) {
try { try {
String fileContent = FileUtils.readFileToString(file, "UTF-8"); String fileContent = Files.readString(file);
List<String> fillFunctions = new LinkedList<>(); List<String> fillFunctions = new LinkedList<>();
for (Map.Entry<Pattern, String> f : functions.entrySet()) { for (Map.Entry<Pattern, String> f : functions.entrySet()) {
@@ -37,37 +50,25 @@ public class EventMethodFiller {
} }
if (!fillFunctions.isEmpty()) { if (!fillFunctions.isEmpty()) {
System.out.println("Filling out " + file.getName() + "..."); System.out.println("Filling out " + file.getFileName().toString() + "...");
FileWriter fileWriter = new FileWriter(file, true); try (PrintWriter printWriter = new PrintWriter(Files.newBufferedWriter(file, StandardOpenOption.APPEND))) {
PrintWriter printWriter = new PrintWriter(fileWriter); printWriter.println();
printWriter.println();
printWriter.println(); printWriter.println("// ---------- FILLER FUNCTIONS ----------");
printWriter.println();
printWriter.println("// ---------- FILLER FUNCTIONS ----------");
printWriter.println();
for (String s : fillFunctions) {
printWriter.println(s);
printWriter.println(); printWriter.println();
}
printWriter.close(); for (String s : fillFunctions) {
printWriter.println(s);
printWriter.println();
}
}
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
private static void filterDirectorySearchMatchingData(String directoryPath, Map<Pattern, String> functions) {
Iterator iter = FileUtils.iterateFiles(new File(directoryPath), new String[]{"sql", "js", "txt", "java"}, true);
while (iter.hasNext()) {
File file = (File) iter.next();
fileSearchMatchingData(file, functions);
}
}
private static Pattern compileJsFunctionPattern(String function) { private static Pattern compileJsFunctionPattern(String function) {
String jsFunction = "function(\\s)+"; String jsFunction = "function(\\s)+";
return Pattern.compile(jsFunction + function); return Pattern.compile(jsFunction + function);
@@ -95,7 +96,7 @@ public class EventMethodFiller {
return functions; return functions;
} }
public static void main(String[] args) { public static void main(String[] args) throws IOException {
filterDirectorySearchMatchingData(ToolConstants.SCRIPTS_PATH + "/event", getFunctions()); filterDirectorySearchMatchingData(ToolConstants.SCRIPTS_PATH + "/event", getFunctions());
} }

56
src/main/java/tools/mapletools/MapInfoRetriever.java
View File

@@ -1,14 +1,14 @@
package tools.mapletools; package tools.mapletools;
import org.apache.commons.io.FileUtils;
import provider.wz.WZFiles; import provider.wz.WZFiles;
import java.io.*; import java.io.BufferedReader;
import java.nio.charset.StandardCharsets; import java.io.IOException;
import java.io.PrintWriter;
import java.io.UncheckedIOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List; import java.util.List;
/** /**
@@ -21,7 +21,6 @@ public class MapInfoRetriever {
private static final Path OUTPUT_FILE = ToolConstants.getOutputFile("map_info_report.txt"); private static final Path OUTPUT_FILE = ToolConstants.getOutputFile("map_info_report.txt");
private static final List<Integer> missingInfo = new ArrayList<>(); private static final List<Integer> missingInfo = new ArrayList<>();
private static BufferedReader bufferedReader = null;
private static byte status = 0; private static byte status = 0;
private static boolean hasInfo; private static boolean hasInfo;
@@ -41,11 +40,11 @@ public class MapInfoRetriever {
return (d.trim()); return (d.trim());
} }
private static void forwardCursor(int st) { private static void forwardCursor(BufferedReader reader, int st) {
String line = null; String line = null;
try { try {
while (status >= st && (line = bufferedReader.readLine()) != null) { while (status >= st && (line = reader.readLine()) != null) {
simpleToken(line); simpleToken(line);
} }
} catch (Exception e) { } catch (Exception e) {
@@ -61,7 +60,7 @@ public class MapInfoRetriever {
} }
} }
private static boolean translateToken(String token) { private static boolean translateToken(BufferedReader reader, String token) {
String d; String d;
int temp; int temp;
@@ -76,7 +75,7 @@ public class MapInfoRetriever {
} }
temp = status; temp = status;
forwardCursor(temp); forwardCursor(reader, temp);
} }
status += 1; status += 1;
@@ -86,45 +85,40 @@ public class MapInfoRetriever {
} }
private static void searchMapDirectory(int mapArea) { private static void searchMapDirectory(int mapArea) {
final File mapDirectory = new File(WZFiles.MAP.getFilePath() + "/Map/Map" + mapArea); final Path mapDirectory = Path.of(WZFiles.MAP.getFilePath() + "/Map/Map" + Integer.toString(mapArea));
System.out.println("Parsing map area " + mapArea);
try { try {
Iterator<File> iter = FileUtils.iterateFiles(mapDirectory, new String[]{"xml"}, true); Files.walk(mapDirectory)
System.out.println("Parsing map area " + mapArea); .filter(MapInfoRetriever::isRelevantFile)
.forEach(MapInfoRetriever::searchMapFile);
while (iter.hasNext()) { } catch (UncheckedIOException | IOException e) {
File file = iter.next(); System.err.println("Directory " + mapDirectory.getFileName().toString() + " does not exist");
searchMapFile(file);
}
} catch (UncheckedIOException e) {
System.err.println("Directory " + mapDirectory.getPath() + " does not exist");
} }
} }
private static void searchMapFile(File file) { private static boolean isRelevantFile(Path file) {
return file.getFileName().toString().endsWith(".xml");
}
private static void searchMapFile(Path file) {
// This will reference one line at a time // This will reference one line at a time
String line = null; String line = null;
try { try (BufferedReader reader = Files.newBufferedReader(file)) {
InputStreamReader fileReader = new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8);
bufferedReader = new BufferedReader(fileReader);
hasInfo = false; hasInfo = false;
status = 0; status = 0;
while ((line = bufferedReader.readLine()) != null) { while ((line = reader.readLine()) != null) {
if (translateToken(line)) { if (translateToken(reader, line)) {
break; break;
} }
} }
if (!hasInfo) { if (!hasInfo) {
missingInfo.add(Integer.valueOf(file.getName().split(".img.xml")[0])); missingInfo.add(Integer.valueOf(file.getFileName().toString().split(".img.xml")[0]));
} }
bufferedReader.close();
fileReader.close();
} catch (IOException ex) { } catch (IOException ex) {
System.out.println("Error reading file '" + file.getName() + "'"); System.out.println("Error reading file '" + file.getFileName().toString() + "'");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

44
src/main/java/tools/mapletools/QuestItemFetcher.java
View File

@@ -1,13 +1,14 @@
package tools.mapletools; package tools.mapletools;
import org.apache.commons.io.FileUtils;
import provider.wz.WZFiles; import provider.wz.WZFiles;
import server.ItemInformationProvider; import server.ItemInformationProvider;
import tools.DatabaseConnection; import tools.DatabaseConnection;
import tools.Pair; import tools.Pair;
import java.io.*; import java.io.BufferedReader;
import java.nio.charset.StandardCharsets; import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.sql.Connection; import java.sql.Connection;
@@ -19,7 +20,7 @@ import java.util.*;
/** /**
* @author RonanLana * @author RonanLana
* <p> * <p>
* This application haves 2 objectives: fetch missing drop data relevant to quests, * This application has 2 objectives: fetch missing drop data relevant to quests,
* and update the questid from items that are labeled as "Quest Item" on the DB. * and update the questid from items that are labeled as "Quest Item" on the DB.
* <p> * <p>
* Running it should generate a report file under "output" folder with the search results. * Running it should generate a report file under "output" folder with the search results.
@@ -28,6 +29,7 @@ import java.util.*;
*/ */
public class QuestItemFetcher { public class QuestItemFetcher {
private static final Path OUTPUT_FILE = ToolConstants.getOutputFile("quest_report.txt"); private static final Path OUTPUT_FILE = ToolConstants.getOutputFile("quest_report.txt");
private static final Collection<String> RELEVANT_FILE_EXTENSIONS = Set.of(".sql", ".js", ".txt", ".java");
private static final int INITIAL_STRING_LENGTH = 50; private static final int INITIAL_STRING_LENGTH = 50;
private static final int INITIAL_LENGTH = 200; private static final int INITIAL_LENGTH = 200;
private static final boolean DISPLAY_EXTRA_INFO = true; // display items with zero quantity over the quest act WZ private static final boolean DISPLAY_EXTRA_INFO = true; // display items with zero quantity over the quest act WZ
@@ -335,22 +337,28 @@ public class QuestItemFetcher {
} }
} }
private static void filterDirectorySearchMatchingData(String path, List<Pair<Integer, Integer>> itemsWithQuest) { private static void filterDirectorySearchMatchingData(String filePath, List<Pair<Integer, Integer>> itemsWithQuest) {
Iterator<File> iter = FileUtils.iterateFiles(new File(path), new String[]{"sql", "js", "txt", "java"}, true); try {
Files.walk(Path.of(filePath))
while (iter.hasNext()) { .filter(QuestItemFetcher::isRelevantFile)
File file = iter.next(); .forEach(path -> fileSearchMatchingData(path, itemsWithQuest));
fileSearchMatchingData(file, itemsWithQuest); } catch (IOException e) {
throw new RuntimeException("Error during recursive file walk", e);
} }
} }
private static boolean isRelevantFile(Path file) {
String fileName = file.getFileName().toString();
return RELEVANT_FILE_EXTENSIONS.stream().anyMatch(fileName::endsWith);
}
private static boolean foundMatchingDataOnFile(String fileContent, String searchStr) { private static boolean foundMatchingDataOnFile(String fileContent, String searchStr) {
return fileContent.contains(searchStr); return fileContent.contains(searchStr);
} }
private static void fileSearchMatchingData(File file, List<Pair<Integer, Integer>> itemsWithQuest) { private static void fileSearchMatchingData(Path file, List<Pair<Integer, Integer>> itemsWithQuest) {
try { try {
String fileContent = FileUtils.readFileToString(file, StandardCharsets.UTF_8); String fileContent = Files.readString(file);
List<Pair<Integer, Integer>> copyItemsWithQuest = new ArrayList<>(itemsWithQuest); List<Pair<Integer, Integer>> copyItemsWithQuest = new ArrayList<>(itemsWithQuest);
for (Pair<Integer, Integer> iq : copyItemsWithQuest) { for (Pair<Integer, Integer> iq : copyItemsWithQuest) {
@@ -359,7 +367,7 @@ public class QuestItemFetcher {
} }
} }
} catch (IOException ioe) { } catch (IOException ioe) {
System.out.println("Failed to read file: " + file.getAbsolutePath()); System.out.println("Failed to read file: " + file.getFileName().toAbsolutePath().toString());
ioe.printStackTrace(); ioe.printStackTrace();
} }
} }
@@ -374,7 +382,7 @@ public class QuestItemFetcher {
List<Map.Entry<Integer, Integer>> list = new ArrayList<>(map.size()); List<Map.Entry<Integer, Integer>> list = new ArrayList<>(map.size());
list.addAll(map.entrySet()); list.addAll(map.entrySet());
list.sort((o1, o2) -> o1.getKey() - o2.getKey()); list.sort(Comparator.comparingInt(Map.Entry::getKey));
return list; return list;
} }
@@ -383,7 +391,7 @@ public class QuestItemFetcher {
List<Map.Entry<Integer, int[]>> list = new ArrayList<>(map.size()); List<Map.Entry<Integer, int[]>> list = new ArrayList<>(map.size());
list.addAll(map.entrySet()); list.addAll(map.entrySet());
list.sort((o1, o2) -> o1.getKey() - o2.getKey()); list.sort(Comparator.comparingInt(Map.Entry::getKey));
return list; return list;
} }
@@ -394,12 +402,12 @@ public class QuestItemFetcher {
List<Integer> il = new ArrayList<>(2); List<Integer> il = new ArrayList<>(2);
il.addAll(e.getValue()); il.addAll(e.getValue());
il.sort((o1, o2) -> o1 - o2); il.sort(Comparator.comparingInt(o -> o));
list.add(new Pair<>(e.getKey(), il)); list.add(new Pair<>(e.getKey(), il));
} }
list.sort((o1, o2) -> o1.getLeft() - o2.getLeft()); list.sort(Comparator.comparingInt(Pair::getLeft));
return list; return list;
} }
@@ -446,7 +454,7 @@ public class QuestItemFetcher {
System.out.println("Filtering drops on project files..."); System.out.println("Filtering drops on project files...");
// finally, filter whether this item is mentioned on the source code or not. // finally, filter whether this item is mentioned on the source code or not.
filterDirectorySearchMatchingData("scripts", itemsWithQuest); filterDirectorySearchMatchingData("scripts", itemsWithQuest);
filterDirectorySearchMatchingData("sql", itemsWithQuest); filterDirectorySearchMatchingData("database/sql", itemsWithQuest);
filterDirectorySearchMatchingData("src", itemsWithQuest); filterDirectorySearchMatchingData("src", itemsWithQuest);
System.out.println("Reporting results..."); System.out.println("Reporting results...");