From f0e35cd96ef94109ab0a25c65981b3f54e9e883d Mon Sep 17 00:00:00 2001
From: Steven Tracey <steven@nevets.tech>
Date: Fri, 4 Feb 2022 19:46:38 -0500
Subject: [PATCH] Reformatted code and made interfacing with api easier

---
 build.gradle                                  |  2 +-
 .../nevets/deepj/{DeepJ.java => Request.java} |  8 ++--
 .../java/tech/nevets/deepj/Translator.java    | 36 ++++++++++++++++++
 .../tech/nevets/deepj/json/JsonExtractor.java | 37 -------------------
 4 files changed, 40 insertions(+), 43 deletions(-)
 rename src/main/java/tech/nevets/deepj/{DeepJ.java => Request.java} (89%)
 create mode 100644 src/main/java/tech/nevets/deepj/Translator.java
 delete mode 100644 src/main/java/tech/nevets/deepj/json/JsonExtractor.java

diff --git a/build.gradle b/build.gradle
index 902c586..b3aec2c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'tech.nevets.deepj'
-version '1.0'
+version '1.1.0'
 
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
 
diff --git a/src/main/java/tech/nevets/deepj/DeepJ.java b/src/main/java/tech/nevets/deepj/Request.java
similarity index 89%
rename from src/main/java/tech/nevets/deepj/DeepJ.java
rename to src/main/java/tech/nevets/deepj/Request.java
index cf0107a..2fd8cc1 100644
--- a/src/main/java/tech/nevets/deepj/DeepJ.java
+++ b/src/main/java/tech/nevets/deepj/Request.java
@@ -8,11 +8,11 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 
-public class DeepJ {
-    public DeepJ() {
+public class Request {
+    public Request() {
     }
 
-    public String translate(String authKey, Enum<Languages> langEnum, String message) throws IOException, InterruptedException {
+    public String get(String authKey, Enum<Languages> langEnum, String message) throws IOException, InterruptedException {
         String encodedAuthKey = URLEncoder.encode(authKey, StandardCharsets.UTF_8);
 
         String lang;
@@ -43,6 +43,4 @@ public class DeepJ {
 
         return data;
     }
-
-
 }
diff --git a/src/main/java/tech/nevets/deepj/Translator.java b/src/main/java/tech/nevets/deepj/Translator.java
new file mode 100644
index 0000000..ed8aee9
--- /dev/null
+++ b/src/main/java/tech/nevets/deepj/Translator.java
@@ -0,0 +1,36 @@
+package tech.nevets.deepj;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class Translator {
+    private final String authKey;
+    Request r = new Request();
+
+    public Translator(String authKey) {
+        this.authKey = authKey;
+    }
+    public String translate(Enum<Languages> lang, String sourceMessage) {
+        String response = "Error processing request";
+        try {
+            response = r.get(authKey, lang, sourceMessage);
+        } catch (IOException | InterruptedException e) {
+            System.out.println("Error processing request");
+            e.printStackTrace();
+        }
+
+        String message = "Error Processing Request";
+
+        JSONObject jo = new JSONObject(response);
+        JSONArray ja = jo.getJSONArray("translations");
+
+        for (int i = 0; i < ja.length(); i++) {
+            JSONObject joo = ja.getJSONObject(i);
+            message = joo.getString("text");
+        }
+
+        return message;
+    }
+}
diff --git a/src/main/java/tech/nevets/deepj/json/JsonExtractor.java b/src/main/java/tech/nevets/deepj/json/JsonExtractor.java
deleted file mode 100644
index a05e67b..0000000
--- a/src/main/java/tech/nevets/deepj/json/JsonExtractor.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package tech.nevets.deepj.json;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-public class JsonExtractor {
-    public JsonExtractor() {
-    }
-
-    public String extractMessage(String jsonResponse) {
-        String message = "Error Processing Request";
-
-        JSONObject jo = new JSONObject(jsonResponse);
-        JSONArray ja = jo.getJSONArray("translations");
-
-        for (int i = 0; i < ja.length(); i++) {
-            JSONObject joo = ja.getJSONObject(i);
-            message = joo.getString("text");
-        }
-
-        return message;
-    }
-
-    public String extractDetectedLang(String jsonResponse) {
-        String lang = "Error Processing Request";
-
-        JSONObject jo = new JSONObject(jsonResponse);
-        JSONArray ja = jo.getJSONArray("translations");
-
-        for (int i = 0; i < ja.length(); i++) {
-            JSONObject joo = ja.getJSONObject(i);
-            lang = joo.getString("detected_source_language");
-        }
-
-        return lang;
-    }
-}