rename package, few fixes, change maven repo

Author: dynomake

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Valeriy Shushpanov (suuft)
+Copyright (c) 2022 - 2024 Valeriy Shushpanov (dynomake)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -9,14 +9,14 @@ At some point we had to translate text in Java but we couldn't find any understa
 repositories {
     // other repositories
     maven {
-        name = "clojars.org"
-        url = uri("https://repo.clojars.org")
+        name = "dynomakeRepository"
+        url = uri("https://maven.dynomake.space/releases")
     }
 }
 
 dependencies {
     // other depends
-    implementation 'net.clojars.suuft:libretranslate-java:1.0.7'
+    implementation "space.dynomake:libretranslate-java:1.0.8"
 }
 ```
 
@@ -26,19 +26,18 @@ Repository:
 
 ```xml
 <repository>
-    <id>clojars.org</id>
-    <url>https://repo.clojars.org</url>
+    <id>dynomakeRepository</id>
+    <url>https://maven.dynomake.space/releases</url>
 </repository>
 ```
 
 Depend:
 
 ```xml
-
 <dependency>
-    <groupId>net.clojars.suuft</groupId>
+    <groupId>space.dynomake</groupId>
     <artifactId>libretranslate-java</artifactId>
-    <version>1.0.7</version>
+    <version>1.0.8</version>
 </dependency>
 ```
 ### `Usage:`
@@ -48,5 +47,5 @@ System.out.println(Translator.translate(Language.RUSSIAN, Language.ENGLISH, "Д
 ```
 If you have LibreTranslate installed on your server, you can change the URL for requests. Example:
 ```java
-Translator.setUrlApi("https://libretranslate.de/translate");
+Translator.setUrlApi("https://your_domain_with_libretranslate.com/translate");
 ```

README.md

@@ -3,8 +3,8 @@ plugins {
     id 'maven-publish'
 }
 
-group 'net.clojars.suuft'
-version '1.0.7'
+group 'space.dynomake'
+version '1.0.8'
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
@@ -22,11 +22,11 @@ dependencies {
 publishing {
     repositories {
         maven {
-            name = "clojars"
-            url = uri("https://clojars.org/repo")
+            name = "dynomakeRepository"
+            url = uri("https://maven.dynomake.space/releases")
             credentials {
-                username = clojarsUserName
-                password = clojarsDeployToken
+                username = dyno_artefactory_user
+                password = dyno_artefactory_token
             }
         }
 

build.gradle

@@ -1,10 +1,12 @@
-package net.suuft.libretranslate;
+package space.dynomake.libretranslate;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.experimental.FieldDefaults;
 
+import java.util.Arrays;
+
 @Getter
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
@@ -44,4 +46,11 @@ public enum Language {
     ;
 
     String code;
+
+    public static Language fromCode(String code) {
+        return Arrays.stream(Language.values())
+                .filter(lang -> lang.code.equalsIgnoreCase(code))
+                .findFirst()
+                .orElse(NONE);
+    }
 }

…a/net/suuft/libretranslate/Language.java …ce/dynomake/libretranslate/Language.javasrc/main/java/net/suuft/libretranslate/Language.java renamed to src/main/java/space/dynomake/libretranslate/Language.java src/main/java/net/suuft/libretranslate/Language.java renamed to src/main/java/space/dynomake/libretranslate/Language.java

@@ -1,11 +1,11 @@
-package net.suuft.libretranslate;
+package space.dynomake.libretranslate;
 
 import lombok.NonNull;
 import lombok.Setter;
 import lombok.experimental.UtilityClass;
-import net.suuft.libretranslate.exception.BadTranslatorResponseException;
-import net.suuft.libretranslate.type.TranslateResponse;
-import net.suuft.libretranslate.util.JsonUtil;
+import space.dynomake.libretranslate.exception.BadTranslatorResponseException;
+import space.dynomake.libretranslate.type.TranslateResponse;
+import space.dynomake.libretranslate.util.JsonUtil;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.net.*;
@@ -40,14 +40,18 @@ public TranslateResponse translateDetect(@NonNull String from, @NonNull String t
             writer.close();
             httpConn.getOutputStream().close();
 
-            if (!(httpConn.getResponseCode() / 100 == 2)) throw new BadTranslatorResponseException(httpConn.getResponseCode(), urlApi);
+            if (!(httpConn.getResponseCode() / 100 == 2))
+                throw new BadTranslatorResponseException(httpConn.getResponseCode(), urlApi);
 
             InputStream responseStream = httpConn.getInputStream();
             Scanner s = new Scanner(responseStream).useDelimiter("\\A");
             String response = s.hasNext() ? s.next() : "";
 
             return JsonUtil.from(response, TranslateResponse.class);
         } catch (Exception e) {
+            if (e instanceof RuntimeException)
+                throw (RuntimeException) e;
+
             e.printStackTrace();
             throw new RuntimeException(e);
         }

…net/suuft/libretranslate/Translator.java …/dynomake/libretranslate/Translator.javasrc/main/java/net/suuft/libretranslate/Translator.java renamed to src/main/java/space/dynomake/libretranslate/Translator.java src/main/java/net/suuft/libretranslate/Translator.java renamed to src/main/java/space/dynomake/libretranslate/Translator.java

@@ -1,4 +1,4 @@
-package net.suuft.libretranslate.exception;
+package space.dynomake.libretranslate.exception;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -8,9 +8,7 @@
 @Getter
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class BadTranslatorResponseException extends Exception {
-
+public class BadTranslatorResponseException extends RuntimeException {
     int code;
     String host;
-
 }

…tion/BadTranslatorResponseException.java …tion/BadTranslatorResponseException.javasrc/main/java/net/suuft/libretranslate/exception/BadTranslatorResponseException.java renamed to src/main/java/space/dynomake/libretranslate/exception/BadTranslatorResponseException.java src/main/java/net/suuft/libretranslate/exception/BadTranslatorResponseException.java renamed to src/main/java/space/dynomake/libretranslate/exception/BadTranslatorResponseException.java

@@ -1,4 +1,4 @@
-package net.suuft.libretranslate.type;
+package space.dynomake.libretranslate.type;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

…bretranslate/type/TranslateResponse.java …bretranslate/type/TranslateResponse.javasrc/main/java/net/suuft/libretranslate/type/TranslateResponse.java renamed to src/main/java/space/dynomake/libretranslate/type/TranslateResponse.java src/main/java/net/suuft/libretranslate/type/TranslateResponse.java renamed to src/main/java/space/dynomake/libretranslate/type/TranslateResponse.java

@@ -1,4 +1,4 @@
-package net.suuft.libretranslate.util;
+package space.dynomake.libretranslate.util;
 
 import com.google.gson.Gson;
 import lombok.NonNull;

…/suuft/libretranslate/util/JsonUtil.java …nomake/libretranslate/util/JsonUtil.javasrc/main/java/net/suuft/libretranslate/util/JsonUtil.java renamed to src/main/java/space/dynomake/libretranslate/util/JsonUtil.java src/main/java/net/suuft/libretranslate/util/JsonUtil.java renamed to src/main/java/space/dynomake/libretranslate/util/JsonUtil.java

@@ -1,8 +1,9 @@
-package net.suuft.libretranslate;
+package space.dynomake.libretranslate;
+
 
 public class Test {
     public static void main(String[] args) {
-        Translator.setUrlApi("https://libretranslate.de/translate");
         System.out.println(Translator.translate(Language.ENGLISH, "Для примера, переведем текст с русского на английский и выведем в консоль:"));
+
     }
 }