diff --git a/src/main/java/com/the5gi/DeepJ/Translator.java b/src/main/java/com/the5gi/DeepJ/Translator.java index ff150d9..df25f4a 100644 --- a/src/main/java/com/the5gi/DeepJ/Translator.java +++ b/src/main/java/com/the5gi/DeepJ/Translator.java @@ -1,5 +1,4 @@ package com.the5gi.DeepJ; - import org.json.JSONArray; import org.json.JSONObject; import java.io.IOException; @@ -11,83 +10,33 @@ import java.net.http.HttpResponse; import java.nio.charset.StandardCharsets; import java.util.Objects; public class Translator { - - //REQUEST INSIDE OF TRANSLATOR protected Request request; - - //GLOBAL AUTH KEY (GAK) public static String globalAPIKey = "null"; - - //CONSTRUCTORS - - public Translator() { - //GAK - if (globalAPIKey == null) { - System.out.println("\n[DeepJ] You are currently using the Global API Key Translator Constructor." +"\n[DeepJ] If you are trying to use global API keys, Call the method \"Translator.setGlobalAuthKey(String key)\" and then re-use this contructor." + "\n[DeepJ] If you want to define an different authkey every time do: \"new Translator(String authKey)\"\n"); - } else { - request = new Request(globalAPIKey); - } - } public Translator(boolean silent) { - //GAK (SILENCABLE) if (globalAPIKey == null && !silent) { System.out.println("\n[DeepJ] You are currently using the Global API Key Translator Constructor." +"\n[DeepJ] If you are trying to use global API keys, Call the method \"Translator.setGlobalAuthKey(String key)\" and then re-use this contructor." + "\n[DeepJ] If you want to define an different authkey every time do: \"new Translator(String authKey)\"\n"); } else { request = new Request(globalAPIKey); } } - public Translator(String authKey) { - //NORMAL REQUEST (GAK Notice) (NO SILENCE) - if (!Objects.equals(globalAPIKey, "null")) { - System.out.println("[DeepJ] Looks like you have defined a global API key already! You can use if by just typing \"new Traslator()\"" + "\n instead of \"new Translator(String authKey)\". NOTE: This will work but just some advice :)"); - } - request = new Request(authKey); - } public Translator(String apiKey, boolean silence) { - //NORMAL REQUEST (GAK SILENCEABLE) if (!Objects.equals(globalAPIKey, "null") && !silence) { System.out.println("[DeepJ] Looks like you have defined a global API key already! You can use if by just typing \"new Traslator()\"" + "\n instead of \"new Translator(String authKey)\". NOTE: This will work but this is just some advice :)"); } request = new Request(apiKey); } public static void setGlobalAPIKey(String key) { - //SET GLOBAL API KEY (STATIC) globalAPIKey = key; } - public static Translator newTranslator(String apiKey) { - //NORMAL REQUEST (NO GAK) (STATIC) - return new Translator(apiKey); - } public static TranslatorBuilder newBuilder() { return new TranslatorBuilder(); } - public static Translator newTranslator() { - //GAK (STATIC) - if (globalAPIKey == null) { - System.out.println("\n[DeepJ] You are currently using the Global API Key \".of()\" Translator." + - "\n[DeepJ] If you are trying to use global API keys, Call the method \"Translator.setGlobalAPIKey(String key)\" and then re-use this method." + - "\n[DeepJ] If you want to define an different authkey every time do: \"Translator.of(String apiKey)\"\n"); - return new Translator("null"); - } else { - return new Translator(); - } - } - //END CONSTRUCTORS - - //API KEYS public void setAPIKey(String key) { request.setAuthKey(key); } public String getAPIKey() { return request.authKey; } - public void close() { - request = new Request("null"); - } - //END API KEYS - - - //TRANSLATE public String translate(Language langToTranslateTo, String sourceMessage) { if (request.authKey == "null") { System.out.println("[DeepJ] This translator is closed! Please re-create!"); @@ -109,8 +58,6 @@ public class Translator { } return message; } - - //API REQUEST CLASS protected static class Request { public String authKey; public Request(String authKey) { @@ -134,12 +81,10 @@ public class Translator { return response.body(); } } - public static class TranslatorBuilder { private boolean silent = false; private String authKey = null; private boolean GAK = false; - public Translator build() { if (GAK) { return new Translator(silent); @@ -147,24 +92,19 @@ public class Translator { return new Translator(authKey, silent); } } - public TranslatorBuilder useGAK(boolean bool) { this.GAK = bool; return this; } - public TranslatorBuilder setAuthKey(String authKey) { this.authKey = authKey; return this; } - public TranslatorBuilder setSilent(boolean silent) { this.silent = silent; return this; } } - - //DEEPL LANGUAGES public enum Language { Bulgarian("BG"), Czech("CS"), @@ -192,16 +132,12 @@ public class Translator { Slovenian("SL"), Swedish("SV"), Chinese("ZH"); - - //API STRING IDENTIFIER private final String apiString; Language(String apiString) { this.apiString = apiString; } - - //API STRING IDENTIFIER RETURN public String getApiString() { return this.apiString; } } -} +} \ No newline at end of file