zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Update dependencies

Browse source 
- Updated checkstyle
- Fixed new checkstyle issues
- Added staged feature: reloading server.properties partially
This commit is contained in:
Frank van der Heijden 2020-12-19 15:19:23 +01:00
parent d52e834f11
commit 466e2659e8
No known key found for this signature in database
GPG key ID: 26DA56488D314D11
51 changed files with 228 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Common/build.gradle
View file

@ -8,7 +8,7 @@ repositories {
dependencies {
compileOnly 'com.github.FrankHeijden:ServerUtilsUpdater:v1.0.0'
compileOnly 'com.google.code.gson:gson:2.8.0'
compileOnly 'com.google.code.gson:gson:2.8.6'
}
shadowJar {

1
Common/src/main/java/net/frankheijden/serverutils/common/commands/Plugins.java
View file

@ -1,7 +1,6 @@
package net.frankheijden.serverutils.common.commands;
import java.util.List;
import net.frankheijden.serverutils.common.config.Messenger;
import net.frankheijden.serverutils.common.entities.ServerCommandSender;
import net.frankheijden.serverutils.common.utils.ListBuilder;

1
Common/src/main/java/net/frankheijden/serverutils/common/config/YamlResource.java
View file

@ -2,7 +2,6 @@ package net.frankheijden.serverutils.common.config;
import java.io.File;
import java.io.InputStream;
import net.frankheijden.serverutils.common.ServerUtilsApp;
import net.frankheijden.serverutils.common.entities.ServerUtilsPlugin;
import net.frankheijden.serverutils.common.providers.ResourceProvider;

1
Common/src/main/java/net/frankheijden/serverutils/common/entities/ServerUtilsPlugin.java
View file

@ -3,7 +3,6 @@ package net.frankheijden.serverutils.common.entities;
import java.io.File;
import java.io.IOException;
import java.util.logging.Logger;
import net.frankheijden.serverutils.common.managers.AbstractPluginManager;
import net.frankheijden.serverutils.common.managers.AbstractTaskManager;
import net.frankheijden.serverutils.common.managers.AbstractVersionManager;

1
Common/src/main/java/net/frankheijden/serverutils/common/managers/AbstractPluginManager.java
View file

@ -1,7 +1,6 @@
package net.frankheijden.serverutils.common.managers;
import java.io.File;
import net.frankheijden.serverutils.common.ServerUtilsApp;
import net.frankheijden.serverutils.common.entities.AbstractResult;
import net.frankheijden.serverutils.common.entities.CloseableResult;

1
Common/src/main/java/net/frankheijden/serverutils/common/managers/AbstractTaskManager.java
View file

@ -5,7 +5,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import net.frankheijden.serverutils.common.entities.AbstractTask;
public abstract class AbstractTaskManager<T> {

1
Common/src/main/java/net/frankheijden/serverutils/common/providers/ResourceProvider.java
View file

@ -2,7 +2,6 @@ package net.frankheijden.serverutils.common.providers;
import java.io.File;
import java.io.InputStream;
import net.frankheijden.serverutils.common.config.YamlConfig;
public interface ResourceProvider {

2
Common/src/main/java/net/frankheijden/serverutils/common/tasks/PluginWatcherTask.java
View file

@ -1,7 +1,6 @@
package net.frankheijden.serverutils.common.tasks;
import com.sun.nio.file.SensitivityWatchEventModifier;
import java.io.File;
import java.io.IOException;
import java.nio.file.ClosedWatchServiceException;
@ -11,7 +10,6 @@ import java.nio.file.WatchEvent;
import java.nio.file.WatchKey;
import java.nio.file.WatchService;
import java.util.concurrent.atomic.AtomicBoolean;
import net.frankheijden.serverutils.common.ServerUtilsApp;
import net.frankheijden.serverutils.common.entities.AbstractTask;
import net.frankheijden.serverutils.common.entities.ServerCommandSender;

6
Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java
View file

@ -3,7 +3,6 @@ package net.frankheijden.serverutils.common.tasks;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@ -11,7 +10,6 @@ import java.net.ConnectException;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import java.util.logging.Level;
import net.frankheijden.serverutils.common.ServerUtilsApp;
import net.frankheijden.serverutils.common.config.Config;
import net.frankheijden.serverutils.common.config.Messenger;
@ -205,7 +203,7 @@ public class UpdateCheckerTask implements Runnable {
plugin.getPluginManager().enablePlugin(updater);
plugin.getPluginManager().disablePlugin(ServerUtilsApp.getPlatformPlugin());
plugin.getPluginManager().unloadPlugin((Object)ServerUtilsApp.getPlatformPlugin()).tryClose();
plugin.getPluginManager().unloadPlugin((Object) ServerUtilsApp.getPlatformPlugin()).tryClose();
updater.update(pluginFile);
updaterFile.delete();
} else {
@ -216,7 +214,7 @@ public class UpdateCheckerTask implements Runnable {
private void broadcastDownloadStatus(String githubVersion, boolean isError) {
final String path = "serverutils.update." + (isError ? "failed" : "success");
String message = Messenger.getMessage(path,"%new%", githubVersion);
String message = Messenger.getMessage(path, "%new%", githubVersion);
plugin.getChatProvider().broadcast("serverutils.notification.update", message);
}

1
Common/src/main/java/net/frankheijden/serverutils/common/utils/FileUtils.java
View file

@ -2,7 +2,6 @@ package net.frankheijden.serverutils.common.utils;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;

2
Common/src/main/java/net/frankheijden/serverutils/common/utils/FormatBuilder.java
View file

@ -1,9 +1,7 @@
package net.frankheijden.serverutils.common.utils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import net.frankheijden.serverutils.common.config.Messenger;
import net.frankheijden.serverutils.common.entities.ServerCommandSender;

1
Common/src/main/java/net/frankheijden/serverutils/common/utils/ForwardFilter.java
View file

@ -2,7 +2,6 @@ package net.frankheijden.serverutils.common.utils;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import net.frankheijden.serverutils.common.entities.ServerCommandSender;
public class ForwardFilter extends PredicateFilter {

1
Common/src/test/java/net/frankheijden/serverutils/common/utils/HexUtilsTest.java
View file

@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.params.provider.Arguments.of;
import java.util.stream.Stream;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.CsvSource;

1
Common/src/test/java/net/frankheijden/serverutils/common/utils/VersionUtilsTest.java
View file

@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.params.provider.Arguments.of;
import java.util.stream.Stream;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;