From a7e3b2ea4a3750741f966bf1573bca98d7106c82 Mon Sep 17 00:00:00 2001
From: Greg Gauthier <gmgauthier@protonmail.com>
Date: Wed, 19 Jul 2023 10:17:00 +0100
Subject: [PATCH] Make JsonUtils methods static

---
 src/main/java/com/gmgauthier/JsonUtils.java               | 8 ++++----
 .../cucumber/{MyStepdefs.java => MyStepDefTests.java}     | 4 ++--
 src/test/java/com/gmgauthier/junit/UnitTests.java         | 8 +++-----
 3 files changed, 9 insertions(+), 11 deletions(-)
 rename src/test/java/com/gmgauthier/cucumber/{MyStepdefs.java => MyStepDefTests.java} (78%)

diff --git a/src/main/java/com/gmgauthier/JsonUtils.java b/src/main/java/com/gmgauthier/JsonUtils.java
index e5c341f..612bf77 100644
--- a/src/main/java/com/gmgauthier/JsonUtils.java
+++ b/src/main/java/com/gmgauthier/JsonUtils.java
@@ -14,23 +14,23 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 public class JsonUtils {
-    public JSONObject getJsonFromGson(JsonObject gJsonObject) {
+    public static JSONObject getJsonFromGson(JsonObject gJsonObject) {
         return new JSONObject(gJsonObject.toString());
     }
 
-    public JSONObject getJsonFromDataTable(DataTable dataTable) {
+    public static JSONObject getJsonFromDataTable(DataTable dataTable) {
         List<Map<String, String>> tableDetails =
                 dataTable.transpose().asMaps(String.class, String.class);
         String bodyString = new Gson().toJson(tableDetails.get(0)); //root element
         return new JSONObject(bodyString);
     }
 
-    public JsonObject getFixtureDataFrom(String filename) throws IOException {
+    public static JsonObject getFixtureDataFrom(String filename) throws IOException {
         String json = getJsonAsString(filename);
         return new Gson().fromJson(json, JsonObject.class);
     }
 
-    private String getJsonAsString(String filename) throws IOException {
+    private static String getJsonAsString(String filename) throws IOException {
         InputStream inputStream =
                 JsonUtils.class
                         .getResourceAsStream(
diff --git a/src/test/java/com/gmgauthier/cucumber/MyStepdefs.java b/src/test/java/com/gmgauthier/cucumber/MyStepDefTests.java
similarity index 78%
rename from src/test/java/com/gmgauthier/cucumber/MyStepdefs.java
rename to src/test/java/com/gmgauthier/cucumber/MyStepDefTests.java
index 5cc8a8b..b6f73f9 100644
--- a/src/test/java/com/gmgauthier/cucumber/MyStepdefs.java
+++ b/src/test/java/com/gmgauthier/cucumber/MyStepDefTests.java
@@ -7,10 +7,10 @@ import io.cucumber.junit.platform.engine.Cucumber;
 import kong.unirest.json.JSONObject;
 
 @Cucumber
-public class MyStepdefs {
+public class MyStepDefTests {
     @Given("The following data in a table")
     public void theFollowingDataInATable(DataTable dataTable) {
-        JSONObject dataTableAsJson = new JsonUtils().getJsonFromDataTable(dataTable);
+        JSONObject dataTableAsJson = JsonUtils.getJsonFromDataTable(dataTable);
         System.out.println(dataTableAsJson);
     }
 }
diff --git a/src/test/java/com/gmgauthier/junit/UnitTests.java b/src/test/java/com/gmgauthier/junit/UnitTests.java
index 185dc9d..4fe93b1 100644
--- a/src/test/java/com/gmgauthier/junit/UnitTests.java
+++ b/src/test/java/com/gmgauthier/junit/UnitTests.java
@@ -13,8 +13,6 @@ import java.io.IOException;
 
 public class UnitTests {
 
-    public JsonUtils jsonUtils = new JsonUtils();
-
     @Test
     @DisplayName("Convert A Google JSON to a Kong JSON")
     public void TestGetJsonFromGson() {
@@ -23,7 +21,7 @@ public class UnitTests {
         JsonObject gJsonObject = JsonParser.parseString(jsonString).getAsJsonObject();
 
         //When we convert the object
-        JSONObject jObj = jsonUtils.getJsonFromGson(gJsonObject);
+        JSONObject jObj = JsonUtils.getJsonFromGson(gJsonObject);
 
         //Then the new object should be a Kong JSONObject
         Assertions.assertEquals(JSONObject.class,jObj.getClass());
@@ -32,9 +30,9 @@ public class UnitTests {
     @Test
     @DisplayName("Read JSON From a File")
     public void TestGetDataFromJson() {
-        JsonObject fixtureData = null;
+        JsonObject fixtureData;
         try {
-            fixtureData = jsonUtils.getFixtureDataFrom("flerbus");
+            fixtureData = JsonUtils.getFixtureDataFrom("flerbus");
         } catch (IOException e) {
             throw new RuntimeException(e);
         }