Refine version and error handling in metrics classes

Author: NonSwag

bukkit/src/main/java/dev/faststats/bukkit/BukkitMetricsImpl.java

@@ -52,53 +52,20 @@ private boolean isProxyOnlineMode() {
     }
 
     @Override
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings({"deprecation", "Convert2MethodRef"})
     protected void appendDefaultData(JsonObject charts) {
-        System.out.println("#appendDefaultData pluginVersion:");
-        printInfo("#appendDefaultData pluginVersion:");
-
         var pluginVersion = tryOrEmpty(() -> plugin.getPluginMeta().getVersion())
                 .orElseGet(() -> plugin.getDescription().getVersion());
 
-        System.out.println(pluginVersion);
-        printInfo(pluginVersion);
-
-        System.out.println("#appendDefaultData minecraftVersion:");
-        printInfo("#appendDefaultData minecraftVersion:");
-
-
-        System.out.println(server.getBukkitVersion());
-        System.out.println(server.getVersion());
-        printInfo(server.getBukkitVersion());
-        printInfo(server.getVersion());
-
-        var minecraftVersion = tryOrEmpty(server::getMinecraftVersion)
-                .orElseGet(() -> {
-                    try {
-                        System.out.println(server.getBukkitVersion());
-                        printInfo(server.getBukkitVersion());
-                        return server.getBukkitVersion().split("-", 2)[0];
-                    } catch (Exception e) {
-                        System.err.println("Failed to get Minecraft version");
-                        e.printStackTrace(System.err);
-                        printError("Failed to get Minecraft version", e);
-                        return server.getVersion();
-                    }
-                });
-        //.or(() -> tryOrEmpty(() -> server.getBukkitVersion().split("-", 2)[0]))
-        //.orElseGet(() -> server.getVersion());
-
-        System.out.println(minecraftVersion);
-        printInfo(minecraftVersion);
+        var minecraftVersion = tryOrEmpty(() -> server.getMinecraftVersion())
+                .or(() -> tryOrEmpty(() -> server.getBukkitVersion().split("-", 2)[0]))
+                .orElseGet(() -> server.getVersion().split("\\(MC: |\\)", 3)[1]);
 
         charts.addProperty("minecraft_version", minecraftVersion);
         charts.addProperty("online_mode", checkOnlineMode());
         charts.addProperty("player_count", server.getOnlinePlayers().size());
         charts.addProperty("plugin_version", pluginVersion);
         charts.addProperty("server_type", server.getName());
-
-        System.out.println("#appendDefaultData done");
-        printInfo("#appendDefaultData done");
     }
 
     @Override
@@ -119,10 +86,7 @@ protected void printWarning(String message) {
     private <T> Optional<T> tryOrEmpty(Supplier<T> supplier) {
         try {
             return Optional.of(supplier.get());
-        } catch (Throwable e) {
-            printError("Failed to get value", e);
-            System.err.println("Failed to get value");
-            e.printStackTrace(System.err);
+        } catch (NoSuchMethodError | Exception e) {
             return Optional.empty();
         }
     }

core/src/main/java/dev/faststats/core/SimpleMetrics.java

@@ -133,9 +133,6 @@ private void startSubmitting(long initialDelay, long period, TimeUnit unit) {
             try {
                 submitAsync();
             } catch (Throwable t) {
-                System.err.println("Failed to submit metrics");
-                t.printStackTrace(System.err);
-                printError("Failed to submit metrics", t);
                 error("Failed to submit metrics", t);
             }
         }, initialDelay, period, unit);
@@ -203,8 +200,6 @@ protected CompletableFuture<Boolean> submitAsync() throws IOException {
     }
 
     protected JsonObject createData() {
-        System.out.println("#createData");
-        printInfo("#createData");
         var data = new JsonObject();
         var charts = new JsonObject();
 
@@ -214,27 +209,18 @@ protected JsonObject createData() {
         charts.addProperty("os_version", System.getProperty("os.version"));
         charts.addProperty("core_count", Runtime.getRuntime().availableProcessors());
 
-        System.out.println(charts);
-        printInfo(charts.toString());
-
         this.charts.forEach(chart -> {
             try {
                 chart.getData().ifPresent(chartData -> charts.add(chart.getId(), chartData));
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 error("Failed to build chart data: " + chart.getId(), e);
             }
         });
 
         appendDefaultData(charts);
-        System.out.println(charts);
-        printInfo(charts.toString());
 
         data.addProperty("server_id", config.serverId().toString());
         data.add("data", charts);
-
-        System.out.println(data);
-        printInfo(data.toString());
-
         return data;
     }
 

gradle.properties

@@ -1 +1 @@
-version=0.7.5-pre7
+version=0.7.5-pre8