Update 'README.md'

closes Translator and Request

.idea/jarRepositories.xml

@@ -16,5 +16,10 @@
       <option name="name" value="MavenRepo" />
       <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://git.nevets.tech/api/packages/5gi/maven" />
+    </remote-repository>
   </component>
 </project>

README.md

@@ -1,24 +1,58 @@
 # DeepJ
-█▀█ █▀█ █ █▀▀ █ █▄ █ ▄▀█ █  
+[![Build Number](https://api.5servers.us/get/badges?uniqueid=deepj&get-type=version.badge)](https://ci.nevets.tech/view/Alec/job/DeepJ%20Improved/)                    
-█▄█ █▀▄ █ █▄█ █ █ ▀█ █▀█ █▄▄
+[![Build Status](https://ci.nevets.tech/view/Alec/job/DeepJ%20Improved/badge/icon)](https://ci.nevets.tech/view/Alec/job/DeepJ%20Improved/)
+> Quick Setup
+<details><summary>Gradle</summary>
+	<p>
 
-█▄▄ █▄█                                     
+Go to your build.gradle file and type:
-█▄█‎ ‎ ‎ ‎█
 
-█▀‎  ▀█▀‎ █▀▀‎ █‎ ‎ ‎ █‎ █▀▀‎ █▄‎ █                               
+```
-▄█ ‎ ‎ ‎ █ ‎ ‎ ‎ ██▄ ▀▄▀ ██▄ █ ▀█
+repositories {
+    maven {
+        url "https://git.nevets.tech/api/packages/5gi/maven"
+    }
+}
+```
+and
 
-________________________________________
+```
+dependencies {
+    implementation group: 'com.the5gi.deepj', name: 'DeepJ', version: 'VERSION'
+}
+```
+</p>
+</details>
 
-█‎ ‎ ‎ ‎█ █▀█ █▀█ ▄▀█ ▀█▀ █▀▀ █▀█                               
+<details><summary>Maven</summary>
-█▄█ █▀▀‎ █▄█ █▀█‎ ‎ ‎ ‎ █‎ ‎ ‎ ‎ ‎██▄ █▄█        
+	<p>
 
-█▄▄ █▄█                       
+Go to your pom.xml file and type:
-█▄█ ‎ ‎ ‎ █
 
-█▀ █▀▀ ▀█▀                      
+```
-▄█ █▄█ ▄█▄
+<repositories>
+	<repository>
+		<id>gitea</id>
+		<url>https://git.nevets.tech/api/packages/5gi/maven</url>
+	</repository>
+</repositories>
+```
+and
+```
+<dependencies>
+	<dependency>
+		<groupId>com.the5gi.deepj</groupId>
+		<artifactId>DeepJ</artifactId>
+		<version>1.2.5</version>
+	</dependency>
+</dependencies>
+```
+</p>
+</details>
 
+> Info
+
+[To see more details, see the wiki](https://git.nevets.tech/5gi/DeepJ/wiki/Home#user-content-usage-setup).
 ________________________________________
 
 DeepJ is a Java Wrapper for the DeepL Free Public API. This was originally made by Steven (Forked From) and Updated by 5gi

build.gradle

@@ -5,12 +5,15 @@ plugins {
 }
 apply plugin: 'maven-publish'
 group 'com.the5gi.deepj'
-version '1.2.1'
+version '1.3.7'
 
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
 
 repositories {
     mavenCentral()
+    maven {
+        url "https://git.nevets.tech/api/packages/5gi/maven"
+    }
 }
 
 dependencies {
@@ -20,19 +23,20 @@ dependencies {
 publishing {
     publications{
         publish(MavenPublication) {
-            artifact("target/DeepJ-$version" + "-all.jar") {
+            artifact("nexus/DeepJ-$version" + ".jar") {
                 extension 'jar'
             }
         }
     }
     repositories {
         maven {
-            name 'nexus'
+            name 'gitea'
-            url "https://repo.nevets.tech/repository/maven-releases/"
+            url "https://git.nevets.tech/api/packages/5gi/maven/"
-            credentials {
+            credentials.username System.getenv('fivegiUserGit')
-                username System.getenv('nexusUser')
+            credentials.password System.getenv('fivegiPassGit')
-                password System.getenv('nexusPass')
-            }
         }
     }
+}
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
 }

src/main/java/com/the5gi/DeepJ/Translator.java

@@ -10,39 +10,61 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
-
 public class Translator {
     public static String globalAuthKey = "null";
-
+    protected Request request;
-    public static void setGlobalAuthKey(String key) {
-        globalAuthKey = key;
-    }
-    private Request request;
     public Translator() {
         if (globalAuthKey == null) {
-            System.out.println("\n[DeepJ] You are currently using the Global Auth Key Translator Constructor." +
+            System.out.println("\n[DeepJ] You are currently using the Global Auth Key Translator Constructor." +"\n[DeepJ] If you are trying to use global auth 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");
-            "\n[DeepJ] If you are trying to use global auth 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(globalAuthKey);
         }
     }
     public Translator(String authKey) {
         if (!Objects.equals(globalAuthKey, "null")) {
-            System.out.println("[DeepJ] Looks like you have defined a global auth key already! You can use if by just typing \"new Traslator()\"" +
+            System.out.println("[DeepJ] Looks like you have defined a global auth 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 :)");
-            "\n instead of \"new Translator(String authKey)\". NOTE: This will work but just some advice :)");
         }
         request = new Request(authKey);
     }
     public Translator(String authKey, boolean silence) {
         if (!Objects.equals(globalAuthKey, "null") && !silence) {
-            System.out.println("[DeepJ] Looks like you have defined a global auth key already! You can use if by just typing \"new Traslator()\"" +
+            System.out.println("[DeepJ] Looks like you have defined a global auth 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 :)");
-            "\n instead of \"new Translator(String authKey)\". NOTE: This will work but this is just some advice :)");
         }
         request = new Request(authKey);
     }
-
+    public static void setGlobalAuthKey(String key) {
+        globalAuthKey = key;
+    }
+    public static Translator newTranslator(String authKey) {
+        return new Translator(authKey);
+    }
+    public static Translator newTranslator() {
+        if (globalAuthKey == null) {
+            System.out.println("\n[DeepJ] You are currently using the Global Auth Key \".of()\" Translator." +
+            "\n[DeepJ] If you are trying to use global auth keys, Call the method \"Translator.setGlobalAuthKey(String key)\" and then re-use this method." + 
+             "\n[DeepJ] If you want to define an different authkey every time do: \"Translator.of(String authKey)\"\n");
+            return new Translator("null");
+        } else {
+            return new Translator();
+        }
+    }
+    public void setAuthKey(String key) {
+        request.setAuthKey(key);
+    }
+    public void setAPIKey(String authKey) {
+        request = new Request(authKey);
+    }
+    public String getAPIKey() {
+        return request.authKey;
+    }
+    public void close() {
+        request = new Request("null");
+    }
     public String translate(Language langToTranslateTo, String sourceMessage) {
+        if (request.authKey == "null") {
+            System.out.println("[DeepJ] This translator is closed! Please re-create!");
+            return "null";
+        }
         String response = "Error processing request";
         try {
             response = request.queryAPI(langToTranslateTo, sourceMessage);
@@ -60,23 +82,22 @@ public class Translator {
         return message;
     }
     protected static class Request {
-        private final String authKey;
+        public String authKey;
         public Request(String authKey) {
             this.authKey = authKey;
         }
+        public void setAuthKey(String key) {
+            authKey = key;
+        }
         public String queryAPI(Language langEnum, String message) throws IOException, InterruptedException {
             String encodedAuthKey = URLEncoder.encode(authKey, StandardCharsets.UTF_8);
             String encodedMessage = URLEncoder.encode(message, StandardCharsets.UTF_8);
             HttpClient client = HttpClient.newHttpClient();
-            HttpRequest request = HttpRequest.newBuilder().GET()
+            HttpRequest request = HttpRequest.newBuilder().GET().header("Accept","*/*").header("Content-Type", "application/x-www-form-urlencoded").uri(URI.create("https://api-free.deepl.com/v2/translate?auth_key="+encodedAuthKey+"&target_lang="+langEnum.getApiString()+"&text="+encodedMessage)).build();
-                    .header("Accept","*/*")
+            HttpResponse<String> response = client.send(request,HttpResponse.BodyHandlers.ofString());
-                    .header("Content-Type", "application/x-www-form-urlencoded")
-                    .uri(URI.create("https://api-free.deepl.com/v2/translate?auth_key=" + encodedAuthKey + "&target_lang=" + langEnum.getApiString() + "&text=" + encodedMessage)).build();
-            HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
             return response.body();
         }
     }
-
     public enum Language {
         Bulgarian("BG"),
         Czech("CS"),
@@ -112,4 +133,4 @@ public class Translator {
             return this.apiString;
         }
     }
-}
+}