Skip to content
This repository has been archived by the owner on Feb 3, 2024. It is now read-only.

Commit

Permalink
Update to java 8-aware configurate
Browse files Browse the repository at this point in the history 
This allows using Paths rather than Files in most places, so we get to
clear up just a little bit of legacy mess.
  • Loading branch information
@zml2008
zml2008 committed Nov 2, 2015
1 parent 77f5ec4 commit ce7aca6
Show file tree
Hide file tree
Showing 17 changed files with 130 additions and 130 deletions.
7 changes: 5 additions & 2 deletions ...ssionsex-bukkit/src/main/java/ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java
View file
Expand Up @@ -47,6 +47,7 @@
import java.io.File;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.nio.file.Path;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
Expand Down Expand Up @@ -76,6 +77,7 @@ public class PermissionsExPlugin extends JavaPlugin implements Listener {
// Permissions subscriptions handling
private PEXPermissionSubscriptionMap subscriptionHandler;
private volatile boolean enabled;
private Path dataPath;

/**
* Because of Bukkit's special logging fun, we have to get an slf4j wrapper using specifically the logger that Bukkit provides us...
Expand All @@ -94,6 +96,7 @@ private TranslatableLogger createLogger() {

@Override
public void onEnable() {
this.dataPath = getDataFolder().toPath();
logger = createLogger();
ConfigurationLoader<ConfigurationNode> configLoader = YAMLConfigurationLoader.builder()
.setFile(new File(getDataFolder(), "config.yml"))
Expand Down Expand Up @@ -285,8 +288,8 @@ private class BukkitImplementationInterface implements ImplementationInterface {
};

@Override
public File getBaseDirectory() {
return getDataFolder();
public Path getBaseDirectory() {
return dataPath;
}

@Override
Expand Down
20 changes: 10 additions & 10 deletions permissionsex-bukkit/src/main/po/keys.pot
View file
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-10-04 19:17-0700\n"
"POT-Creation-Date: 2015-11-01 17:14-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -25,41 +25,41 @@ msgstr ""
msgid "Click to view more info"
msgstr ""

#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:111
#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:114
msgid "Error occurred while enabling %s"
msgstr ""

#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:167
#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:170
msgid "Error while loading data for user %s/%s during prelogin: %s"
msgstr ""

#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:141
#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:144
msgid "Hooked into Vault for Permission and Chat interfaces"
msgstr ""

#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:264
#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:267
msgid ""
"No Permissible injector found for your server implementation (while "
"uninjecting for %s)!"
msgstr ""

#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:226
#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:229
msgid "No Permissible injector found for your server implementation!"
msgstr ""

#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:234
#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:237
msgid "Permissions handler for %s successfully injected"
msgstr ""

#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:266
#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:269
msgid "Permissions handler for %s successfully uninjected"
msgstr ""

#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:228
#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:231
msgid "Unable to inject PEX's permissible for %s"
msgstr ""

#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:237
#: ninja/leaping/permissionsex/bukkit/PermissionsExPlugin.java:240
msgid "Unable to inject permissible for %s"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion permissionsex-core/pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
</parent>
<artifactId>permissionsex-core</artifactId>
<properties>
<version.configurate>2.0</version.configurate>
<version.configurate>3.0</version.configurate>
</properties>
<build>
<resources>
Expand Down
6 changes: 2 additions & 4 deletions permissionsex-core/src/main/java/ninja/leaping/permissionsex/ImplementationInterface.java
View file
Expand Up @@ -16,15 +16,13 @@
*/
package ninja.leaping.permissionsex;

import com.google.common.base.Functions;
import ninja.leaping.permissionsex.util.command.CommandSpec;
import org.slf4j.Logger;

import javax.sql.DataSource;
import java.io.File;
import java.nio.file.Path;
import java.util.Set;
import java.util.concurrent.Executor;
import java.util.function.Function;

/**
* Methods that are specific to a certain implementation of PermissionsEx (Sponge, Forge, etc)
Expand All @@ -35,7 +33,7 @@ public interface ImplementationInterface {
*
* @return The base directory
*/
File getBaseDirectory();
Path getBaseDirectory();
/**
* Gets the appropriate logger
* @return
Expand Down
3 changes: 2 additions & 1 deletion permissionsex-core/src/main/java/ninja/leaping/permissionsex/PermissionsEx.java
View file
Expand Up @@ -48,6 +48,7 @@
import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.file.Path;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -326,7 +327,7 @@ public void close() {
}

@Override
public File getBaseDirectory() {
public Path getBaseDirectory() {
return impl.getBaseDirectory();
}

Expand Down
21 changes: 11 additions & 10 deletions permissionsex-core/src/main/java/ninja/leaping/permissionsex/backend/file/FileDataStore.java
View file
Expand Up @@ -42,8 +42,9 @@
import ninja.leaping.permissionsex.rank.RankLadder;
import ninja.leaping.permissionsex.util.Util;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
Expand Down Expand Up @@ -73,9 +74,9 @@ public FileDataStore() {
}


private ConfigurationLoader<? extends ConfigurationNode> createLoader(File file) {
private ConfigurationLoader<? extends ConfigurationNode> createLoader(Path file) {
return GsonConfigurationLoader.builder()
.setFile(file)
.setPath(file)
.setIndent(4)
.setLenient(true)
.build();
Expand All @@ -86,15 +87,15 @@ private ConfigurationLoader<? extends ConfigurationNode> createLoader(File file)
}*/
}

private File migrateLegacy(File permissionsFile, String extension, ConfigurationLoader<?> loader, String formatName) throws PermissionsLoadingException {
File legacyPermissionsFile = permissionsFile;
private Path migrateLegacy(Path permissionsFile, String extension, ConfigurationLoader<?> loader, String formatName) throws PermissionsLoadingException {
Path legacyPermissionsFile = permissionsFile;
file = file.replace(extension, ".json");
permissionsFile = new File(getManager().getBaseDirectory(), file);
permissionsFile = getManager().getBaseDirectory().resolve(file);
permissionsFileLoader = createLoader(permissionsFile);
try {
permissionsConfig = loader.load();
permissionsFileLoader.save(permissionsConfig);
legacyPermissionsFile.renameTo(new File(legacyPermissionsFile.getCanonicalPath() + ".legacy-backup"));
Files.move(legacyPermissionsFile, legacyPermissionsFile.resolveSibling(legacyPermissionsFile.getFileName().toString() + ".legacy-backup"));
} catch (IOException e) {
throw new PermissionsLoadingException(t("While loading legacy %s permissions from %s", formatName, permissionsFile), e);
}
Expand All @@ -103,11 +104,11 @@ private File migrateLegacy(File permissionsFile, String extension, Configuration

@Override
protected void initializeInternal() throws PermissionsLoadingException {
File permissionsFile = new File(getManager().getBaseDirectory(), file);
Path permissionsFile = getManager().getBaseDirectory().resolve(file);
if (file.endsWith(".yml")) {
permissionsFile = migrateLegacy(permissionsFile, ".yml", YAMLConfigurationLoader.builder().setFile(permissionsFile).build(), "YML");
permissionsFile = migrateLegacy(permissionsFile, ".yml", YAMLConfigurationLoader.builder().setPath(permissionsFile).build(), "YML");
} else if (file.endsWith(".conf")) {
permissionsFile = migrateLegacy(permissionsFile, ".conf", HoconConfigurationLoader.builder().setFile(permissionsFile).build(), "HOCON");
permissionsFile = migrateLegacy(permissionsFile, ".conf", HoconConfigurationLoader.builder().setPath(permissionsFile).build(), "HOCON");
} else {
permissionsFileLoader = createLoader(permissionsFile);
}
Expand Down
1 change: 0 additions & 1 deletion permissionsex-core/src/main/java/ninja/leaping/permissionsex/data/SubjectDataReference.java
View file
Expand Up @@ -22,7 +22,6 @@
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
Expand Down
32 changes: 16 additions & 16 deletions permissionsex-core/src/main/po/de.po
View file
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-03 17:09-0700\n"
"POT-Creation-Date: 2015-11-01 17:13-0800\n"
"PO-Revision-Date: 2015-04-02 17:09-0700\n"
"Last-Translator: <zml@aoeu.xyz>\n"
"Language-Team: German\n"
Expand All @@ -18,15 +18,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: ninja/leaping/permissionsex/backend/file/FileDataStore.java:139
#: ninja/leaping/permissionsex/backend/file/FileDataStore.java:140
msgid "%s schema version updated from %s to %s"
msgstr ""

#: ninja/leaping/permissionsex/command/PermissionsExCommands.java:90
msgid "%s subjects"
msgstr ""

#: ninja/leaping/permissionsex/PermissionsEx.java:179
#: ninja/leaping/permissionsex/PermissionsEx.java:180
msgid "%s user successfully converted from name to UUID"
msgid_plural "%s users successfully converted from name to UUID!"
msgstr[0] ""
Expand Down Expand Up @@ -143,7 +143,7 @@ msgstr ""
msgid "Destination subject already existed or target subject did not!"
msgstr ""

#: ninja/leaping/permissionsex/PermissionsEx.java:149
#: ninja/leaping/permissionsex/PermissionsEx.java:150
msgid "Duplicate entry for %s found while converting to UUID"
msgstr ""

Expand All @@ -164,11 +164,11 @@ msgid ""
"details: %s"
msgstr "Fehler während das Laufen des Befehles: %s"

#: ninja/leaping/permissionsex/PermissionsEx.java:184
#: ninja/leaping/permissionsex/PermissionsEx.java:185
msgid "Error converting users to UUID"
msgstr ""

#: ninja/leaping/permissionsex/backend/file/FileDataStore.java:131
#: ninja/leaping/permissionsex/backend/file/FileDataStore.java:132
msgid "Error creating initial data for file backend"
msgstr ""

Expand All @@ -191,11 +191,11 @@ msgstr "Fehler während das Laufen des Befehles: %s"
msgid "Error while deserializing backend %s"
msgstr "Fehler während das Laufen des Befehles: %s"

#: ninja/leaping/permissionsex/PermissionsEx.java:174
#: ninja/leaping/permissionsex/PermissionsEx.java:175
msgid "Error while fetching UUIDs for users"
msgstr ""

#: ninja/leaping/permissionsex/PermissionsEx.java:288
#: ninja/leaping/permissionsex/PermissionsEx.java:289
#, fuzzy
msgid "Error while loading configuration: %s"
msgstr "Fehler während das Laufen des Befehles: %s"
Expand Down Expand Up @@ -350,7 +350,7 @@ msgstr ""
msgid "Successfully imported data from backend %s into current backend"
msgstr ""

#: ninja/leaping/permissionsex/PermissionsEx.java:312
#: ninja/leaping/permissionsex/PermissionsEx.java:313
msgid "Successfully migrated old-style default data to new location"
msgstr ""

Expand Down Expand Up @@ -387,15 +387,15 @@ msgstr ""
msgid "Transient permissions:"
msgstr "Hat Berechtigung: %s"

#: ninja/leaping/permissionsex/PermissionsEx.java:138
#: ninja/leaping/permissionsex/PermissionsEx.java:139
msgid "Trying to convert users stored by name to UUID"
msgstr ""

#: ninja/leaping/permissionsex/command/PermissionsExExecutor.java:47
msgid "Unable to get data for subject %s"
msgstr ""

#: ninja/leaping/permissionsex/PermissionsEx.java:188
#: ninja/leaping/permissionsex/PermissionsEx.java:189
msgid ""
"Unable to resolve Mojang API for UUID conversion. Do you have an internet "
"connection? UUID conversion will not proceed (but may not be necessary)."
Expand Down Expand Up @@ -423,23 +423,23 @@ msgstr "Unbefertigtes quoted Satz befunden"
msgid "Usage: %s"
msgstr "Nutzung: %s"

#: ninja/leaping/permissionsex/PermissionsEx.java:402
#: ninja/leaping/permissionsex/PermissionsEx.java:403
msgid "While calculating subject data for %s:%s"
msgstr ""

#: ninja/leaping/permissionsex/backend/file/FileDataStore.java:182
#: ninja/leaping/permissionsex/backend/file/FileDataStore.java:183
msgid "While deserializing subject data for %s:"
msgstr ""

#: ninja/leaping/permissionsex/backend/file/FileDataStore.java:99
#: ninja/leaping/permissionsex/backend/file/FileDataStore.java:100
msgid "While loading legacy %s permissions from %s"
msgstr ""

#: ninja/leaping/permissionsex/backend/file/FileDataStore.java:118
#: ninja/leaping/permissionsex/backend/file/FileDataStore.java:119
msgid "While loading permissions file from %s"
msgstr ""

#: ninja/leaping/permissionsex/backend/file/FileDataStore.java:143
#: ninja/leaping/permissionsex/backend/file/FileDataStore.java:144
msgid "While performing version upgrade"
msgstr ""

Expand Down

0 comments on commit ce7aca6

Please sign in to comment.