diff --git a/pom.xml b/pom.xml index 12532db..ae95a77 100644 --- a/pom.xml +++ b/pom.xml @@ -76,15 +76,5 @@ 3.8.1 test - - javax.json - javax.json-api - 1.0 - - - org.glassfish - javax.json - 1.0.4 - diff --git a/src/main/java/buttondevteam/presents/StaticMain.java b/src/main/java/buttondevteam/presents/StaticMain.java index 83d6336..2209c18 100644 --- a/src/main/java/buttondevteam/presents/StaticMain.java +++ b/src/main/java/buttondevteam/presents/StaticMain.java @@ -1,19 +1,24 @@ package buttondevteam.presents; -import javax.json.Json; -import javax.json.JsonBuilderFactory; -import javax.json.JsonObject; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; public class StaticMain { public static void main(String[] args){ - JsonBuilderFactory factory = Json.createBuilderFactory(null); - JsonObject value = factory.createObjectBuilder() - .add("Ali", "pls") - .add("iie", "whaddap") - .add("norbi", "nice") - .build(); + + + + @SuppressWarnings("unused") + class output{ + String ali = "pls"; + String iie = "whaddap"; + String norbipeti = "¯\\_(ツ)_/¯"; + } - System.out.println(value.toString()); + GsonBuilder builder = new GsonBuilder(); + Gson gson = builder.create(); + + System.out.println(gson.toJson(new output())); } } diff --git a/src/main/java/buttondevteam/presents/hello/commands/HelloJSON.java b/src/main/java/buttondevteam/presents/hello/commands/HelloJSON.java index 6f5c6b4..e4cc8f1 100644 --- a/src/main/java/buttondevteam/presents/hello/commands/HelloJSON.java +++ b/src/main/java/buttondevteam/presents/hello/commands/HelloJSON.java @@ -1,11 +1,11 @@ package buttondevteam.presents.hello.commands; -import javax.json.Json; -import javax.json.JsonBuilderFactory; -import javax.json.JsonObject; import org.bukkit.entity.Player; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + import buttondevteam.lib.chat.CommandClass; import buttondevteam.presents.architecture.commands.ModCommand; @@ -15,14 +15,17 @@ public class HelloJSON extends ModCommand{ @Override public boolean OnCommand(Player player, String alias, String[] args) { - JsonBuilderFactory factory = Json.createBuilderFactory(null); - JsonObject value = factory.createObjectBuilder() - .add("Ali", "pls") - .add("iie", "whaddap") - .add("norbi", "nice") - .build(); - - player.sendMessage(value.toString()); + @SuppressWarnings("unused") + class output{ + String ali = "pls"; + String iie = "whaddap"; + String norbipeti = "¯\\_(ツ)_/¯"; + } + + GsonBuilder builder = new GsonBuilder(); + Gson gson = builder.create(); + + player.sendMessage(gson.toJson(new output())); return true; } diff --git a/src/main/java/buttondevteam/presents/hello/pages/HelloJSONPage.java b/src/main/java/buttondevteam/presents/hello/pages/HelloJSONPage.java index 27dc094..9f7532c 100644 --- a/src/main/java/buttondevteam/presents/hello/pages/HelloJSONPage.java +++ b/src/main/java/buttondevteam/presents/hello/pages/HelloJSONPage.java @@ -1,9 +1,7 @@ package buttondevteam.presents.hello.pages; -import javax.json.Json; -import javax.json.JsonBuilderFactory; -import javax.json.JsonObject; - +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.sun.net.httpserver.HttpExchange; import buttondevteam.website.io.Response; @@ -22,14 +20,18 @@ public class HelloJSONPage extends Page { } private String getResponseString() { - JsonBuilderFactory factory = Json.createBuilderFactory(null); - JsonObject value = factory.createObjectBuilder() - .add("Ali", "pls") - .add("iie", "whaddap") - .add("norbi", "nice") - .build(); - - return value.toString(); + + @SuppressWarnings("unused") + class output{ + String ali = "pls"; + String iie = "whaddap"; + String norbipeti = "¯\\_(ツ)_/¯"; + } + + GsonBuilder builder = new GsonBuilder(); + Gson gson = builder.create(); + + return gson.toJson(new output()); } } diff --git a/src/main/java/buttondevteam/presents/metrics/MetricsComponent.java b/src/main/java/buttondevteam/presents/metrics/MetricsComponent.java index 0687604..68dffbe 100644 --- a/src/main/java/buttondevteam/presents/metrics/MetricsComponent.java +++ b/src/main/java/buttondevteam/presents/metrics/MetricsComponent.java @@ -9,7 +9,7 @@ public class MetricsComponent extends Component{ @Override public void register(JavaPlugin plugin) { registerListener(plugin, new PlayerLogins(plugin)); - addPage(plugin, new PlayerLoginsPage(plugin)); + addPage(plugin, new PlayerLoginsPage()); } } diff --git a/src/main/java/buttondevteam/presents/metrics/PlayerLoginsPage.java b/src/main/java/buttondevteam/presents/metrics/PlayerLoginsPage.java index 50bcb6a..3d6e5ac 100644 --- a/src/main/java/buttondevteam/presents/metrics/PlayerLoginsPage.java +++ b/src/main/java/buttondevteam/presents/metrics/PlayerLoginsPage.java @@ -1,7 +1,5 @@ package buttondevteam.presents.metrics; -import org.bukkit.plugin.java.JavaPlugin; - import com.sun.net.httpserver.HttpExchange; import buttondevteam.website.io.Response; @@ -9,11 +7,7 @@ import buttondevteam.website.page.Page; public class PlayerLoginsPage extends Page { - private JavaPlugin plugin; - public PlayerLoginsPage(JavaPlugin plugin) { - this.plugin = plugin; - } @Override public String GetName() {