Merge remote-tracking branch 'origin/feature/slf4j-logging'

config/checkstyle/import-control.xml

@@ -15,6 +15,7 @@
   <allow pkg="com.google.gson"/>
   <allow pkg="net.royawesome.jlibnoise"/>
   <allow pkg="org.json.simple" />
+  <allow pkg="org.slf4j"/>
 
   <subpackage name="util.yaml">
     <allow pkg="org.yaml.snakeyaml"/>

worldedit-bukkit/build.gradle

@@ -14,6 +14,7 @@ dependencies {
     compile 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT' // zzz
     compile 'org.bstats:bstats-bukkit:1.4'
     compile "io.papermc:paperlib:1.0.1"
+    compile 'org.slf4j:slf4j-jdk14:1.7.26'
     testCompile 'org.mockito:mockito-core:1.9.0-rc1'
 }
 
@@ -37,7 +38,10 @@ jar {
 
 shadowJar {
     dependencies {
+        relocate "org.slf4j", "com.sk89q.worldedit.slf4j"
         include(dependency(':worldedit-core'))
+        include(dependency('org.slf4j:slf4j-api'))
+        include(dependency("org.slf4j:slf4j-jdk14"))
         relocate ("org.bstats", "com.sk89q.worldedit.bukkit.bstats") {
             include(dependency("org.bstats:bstats-bukkit:1.4"))
         }

worldedit-bukkit/src/main/java/com/sk89q/wepif/FlatFilePermissionsResolver.java

@@ -22,6 +22,8 @@
 import com.sk89q.util.yaml.YAMLProcessor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -32,12 +34,10 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class FlatFilePermissionsResolver implements PermissionsResolver {
 
-    private static final Logger log = Logger.getLogger(FlatFilePermissionsResolver.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(FlatFilePermissionsResolver.class);
 
     private Map<String, Set<String>> userPermissionsCache;
     private Set<String> defaultPermissionsCache;
@@ -98,7 +98,7 @@ public Map<String, Set<String>> loadGroupPermissions() {
                 }
             }
         } catch (IOException e) {
-            log.log(Level.WARNING, "Failed to load permissions", e);
+            log.warn("Failed to load permissions", e);
         } finally {
             try {
                 if (buff != null) {
@@ -164,7 +164,7 @@ public void load() {
                 }
             }
         } catch (IOException e) {
-            log.log(Level.WARNING, "Failed to load permissions", e);
+            log.warn("Failed to load permissions", e);
         } finally {
             try {
                 if (buff != null) {

worldedit-bukkit/src/main/java/com/sk89q/wepif/NijiPermissionsResolver.java

@@ -28,13 +28,12 @@
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class NijiPermissionsResolver implements PermissionsResolver {
 
-    private static final Logger log = Logger.getLogger(NijiPermissionsResolver.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(NijiPermissionsResolver.class);
 
     private Server server;
     private Permissions api;
@@ -84,7 +83,7 @@ public boolean hasPermission(String name, String permission) {
                 return api.Security.permission(player, permission);
             }
         } catch (Throwable t) {
-            log.log(Level.WARNING, "Failed to check permissions", t);
+            log.warn("Failed to check permissions", t);
             return false;
         }
     }
@@ -98,7 +97,7 @@ public boolean hasPermission(String worldName, String name, String permission) {
                 return api.getHandler().has(server.getPlayerExact(name), permission);
             }
         } catch (Throwable t) {
-            log.log(Level.WARNING, "Failed to check permissions", t);
+            log.warn("Failed to check permissions", t);
             return false;
         }
     }
@@ -115,7 +114,7 @@ public boolean inGroup(String name, String group) {
                 return api.Security.inGroup(name, group);
             }
         } catch (Throwable t) {
-            log.log(Level.WARNING, "Failed to check groups", t);
+            log.warn("Failed to check groups", t);
             return false;
         }
     }
@@ -139,7 +138,7 @@ public String[] getGroups(String name) {
                 return groups;
             }
         } catch (Throwable t) {
-            log.log(Level.WARNING, "Failed to get groups", t);
+            log.warn("Failed to get groups", t);
             return new String[0];
         }
     }

worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java

@@ -27,6 +27,8 @@
 import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;
 import org.bukkit.plugin.Plugin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -35,8 +37,6 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class PermissionsResolverManager implements PermissionsResolver {
 
@@ -85,7 +85,7 @@ public static PermissionsResolverManager getInstance() {
     private Server server;
     private PermissionsResolver permissionResolver;
     private YAMLProcessor config;
-    private Logger logger = Logger.getLogger(getClass().getCanonicalName());
+    private Logger logger = LoggerFactory.getLogger(getClass());
     private List<Class<? extends PermissionsResolver>> enabledResolvers = new ArrayList<>();
 
     @SuppressWarnings("unchecked")
@@ -119,7 +119,7 @@ public void findResolver() {
                     break;
                 }
             } catch (Throwable e) {
-                logger.log(Level.WARNING, "Error in factory method for " + resolverClass.getSimpleName(), e);
+                logger.warn("Error in factory method for " + resolverClass.getSimpleName(), e);
                 continue;
             }
         }
@@ -195,14 +195,14 @@ private boolean loadConfig(File file) {
             try {
                 file.createNewFile();
             } catch (IOException e) {
-                logger.log(Level.WARNING, "Failed to create new configuration file", e);
+                logger.warn("Failed to create new configuration file", e);
             }
         }
         config = new YAMLProcessor(file, false, YAMLFormat.EXTENDED);
         try {
             config.load();
         } catch (IOException e) {
-            logger.log(Level.WARNING, "Error loading WEPIF configuration", e);
+            logger.warn("Error loading WEPIF configuration", e);
         }
         List<String> keys = config.getKeys(null);
         config.setHeader(CONFIG_HEADER);
@@ -232,7 +232,7 @@ private boolean loadConfig(File file) {
                 } catch (ClassNotFoundException e) {}
 
                 if (next == null || !PermissionsResolver.class.isAssignableFrom(next)) {
-                    logger.warning("WEPIF: Invalid or unknown class found in enabled resolvers: "
+                    logger.warn("WEPIF: Invalid or unknown class found in enabled resolvers: "
                             + nextName + ". Moving to disabled resolvers list.");
                     i.remove();
                     disabledResolvers.add(nextName);

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java

@@ -19,8 +19,6 @@
 
 package com.sk89q.worldedit.bukkit;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.sk89q.bukkit.util.CommandInspector;
 import com.sk89q.minecraft.util.commands.CommandLocals;
 import com.sk89q.worldedit.extension.platform.Actor;
@@ -29,12 +27,14 @@
 import com.sk89q.worldedit.util.command.Dispatcher;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.util.logging.Logger;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 class BukkitCommandInspector implements CommandInspector {
 
-    private static final Logger logger = Logger.getLogger(BukkitCommandInspector.class.getCanonicalName());
+    private static final Logger logger = LoggerFactory.getLogger(BukkitCommandInspector.class);
     private final WorldEditPlugin plugin;
     private final Dispatcher dispatcher;
 
@@ -51,7 +51,7 @@ public String getShortText(Command command) {
         if (mapping != null) {
             return mapping.getDescription().getDescription();
         } else {
-            logger.warning("BukkitCommandInspector doesn't know how about the command '" + command + "'");
+            logger.warn("BukkitCommandInspector doesn't know how about the command '" + command + "'");
             return "Help text not available";
         }
     }
@@ -63,7 +63,7 @@ public String getFullText(Command command) {
             Description description = mapping.getDescription();
             return "Usage: " + description.getUsage() + (description.getHelp() != null ? "\n" + description.getHelp() : "");
         } else {
-            logger.warning("BukkitCommandInspector doesn't know how about the command '" + command + "'");
+            logger.warn("BukkitCommandInspector doesn't know how about the command '" + command + "'");
             return "Help text not available";
         }
     }
@@ -76,7 +76,7 @@ public boolean testPermission(CommandSender sender, Command command) {
             locals.put(Actor.class, plugin.wrapCommandSender(sender));
             return mapping.getCallable().testPermission(locals);
         } else {
-            logger.warning("BukkitCommandInspector doesn't know how about the command '" + command + "'");
+            logger.warn("BukkitCommandInspector doesn't know how about the command '" + command + "'");
             return false;
         }
     }

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitConfiguration.java

@@ -22,6 +22,7 @@
 import com.sk89q.util.yaml.YAMLProcessor;
 import com.sk89q.worldedit.util.YAMLConfiguration;
 import com.sk89q.worldedit.util.report.Unreported;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 
@@ -34,7 +35,7 @@ public class BukkitConfiguration extends YAMLConfiguration {
     @Unreported private final WorldEditPlugin plugin;
 
     public BukkitConfiguration(YAMLProcessor config, WorldEditPlugin plugin) {
-        super(config, plugin.getLogger());
+        super(config, LoggerFactory.getLogger(plugin.getLogger().getName()));
         this.plugin = plugin;
     }
 

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java

@@ -19,8 +19,6 @@
 
 package com.sk89q.worldedit.bukkit;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
@@ -48,17 +46,17 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.inventory.DoubleChestInventory;
 import org.bukkit.inventory.Inventory;
+import org.slf4j.Logger;
 
+import javax.annotation.Nullable;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
-import javax.annotation.Nullable;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public class BukkitWorld extends AbstractWorld {
 
@@ -118,9 +116,9 @@ public com.sk89q.worldedit.entity.Entity createEntity(com.sk89q.worldedit.util.L
                     return null;
                 }
             } catch (Exception e) {
-                logger.warning("Corrupt entity found when creating: " + entity.getType().getId());
+                logger.warn("Corrupt entity found when creating: " + entity.getType().getId());
                 if (entity.getNbtData() != null) {
-                    logger.warning(entity.getNbtData().toString());
+                    logger.warn(entity.getNbtData().toString());
                 }
                 e.printStackTrace();
                 return null;
@@ -183,7 +181,7 @@ public boolean regenerate(Region region, EditSession editSession) {
             try {
                 getWorld().regenerateChunk(chunk.getBlockX(), chunk.getBlockZ());
             } catch (Throwable t) {
-                logger.log(Level.WARNING, "Chunk generation via Bukkit raised an error", t);
+                logger.warn("Chunk generation via Bukkit raised an error", t);
             }
 
             // Then restore
@@ -280,7 +278,7 @@ public boolean clearContainerBlockContents(BlockVector3 pt) {
         treeTypeMapping.put(TreeGenerator.TreeType.RANDOM_MUSHROOM, TreeType.BROWN_MUSHROOM);
         for (TreeGenerator.TreeType type : TreeGenerator.TreeType.values()) {
             if (treeTypeMapping.get(type) == null) {
-                WorldEdit.logger.severe("No TreeType mapping for TreeGenerator.TreeType." + type);
+                WorldEdit.logger.error("No TreeType mapping for TreeGenerator.TreeType." + type);
             }
         }
     }
@@ -426,8 +424,8 @@ public <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 position, B
                 return adapter.setBlock(BukkitAdapter.adapt(getWorld(), position), block, notifyAndLight);
             } catch (Exception e) {
                 if (block instanceof BaseBlock && ((BaseBlock) block).getNbtData() != null) {
-                    logger.warning("Tried to set a corrupt tile entity at " + position.toString());
-                    logger.warning(((BaseBlock) block).getNbtData().toString());
+                    logger.warn("Tried to set a corrupt tile entity at " + position.toString());
+                    logger.warn(((BaseBlock) block).getNbtData().toString());
                 }
                 e.printStackTrace();
                 Block bukkitBlock = getWorld().getBlockAt(position.getBlockX(), position.getBlockY(), position.getBlockZ());

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -19,8 +19,6 @@
 
 package com.sk89q.worldedit.bukkit;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.google.common.base.Joiner;
 import com.sk89q.util.yaml.YAMLProcessor;
 import com.sk89q.wepif.PermissionsResolverManager;
@@ -58,7 +56,10 @@
 import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nullable;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -68,17 +69,16 @@
 import java.util.Map;
 import java.util.jar.JarFile;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.zip.ZipEntry;
 
-import javax.annotation.Nullable;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Plugin for Bukkit.
  */
 public class WorldEditPlugin extends JavaPlugin implements TabCompleter {
 
-    private static final Logger log = Logger.getLogger(WorldEditPlugin.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(WorldEditPlugin.class);
     public static final String CUI_PLUGIN_CHANNEL = "worldedit:cui";
     private static WorldEditPlugin INSTANCE;
 
@@ -202,23 +202,23 @@ private void loadAdapter() {
         try {
             adapterLoader.addFromPath(getClass().getClassLoader());
         } catch (IOException e) {
-            log.log(Level.WARNING, "Failed to search path for Bukkit adapters");
+            log.warn("Failed to search path for Bukkit adapters");
         }
 
         try {
             adapterLoader.addFromJar(getFile());
         } catch (IOException e) {
-            log.log(Level.WARNING, "Failed to search " + getFile() + " for Bukkit adapters", e);
+            log.warn("Failed to search " + getFile() + " for Bukkit adapters", e);
         }
         try {
             bukkitAdapter = adapterLoader.loadAdapter();
-            log.log(Level.INFO, "Using " + bukkitAdapter.getClass().getCanonicalName() + " as the Bukkit adapter");
+            log.info("Using " + bukkitAdapter.getClass().getCanonicalName() + " as the Bukkit adapter");
         } catch (AdapterLoadException e) {
             Platform platform = worldEdit.getPlatformManager().queryCapability(Capability.WORLD_EDITING);
             if (platform instanceof BukkitServerInterface) {
-                log.log(Level.WARNING, e.getMessage());
+                log.warn(e.getMessage());
             } else {
-                log.log(Level.INFO, "WorldEdit could not find a Bukkit adapter for this MC version, " +
+                log.info("WorldEdit could not find a Bukkit adapter for this MC version, " +
                         "but it seems that you have another implementation of WorldEdit installed (" + platform.getPlatformName() + ") " +
                         "that handles the world editing.");
             }