Add netty dependency in pom.xml and number of retry for converter in …

…backend
kohei-s · Nov 7, 2023 · 7431ec6 · 7431ec6
1 parent 133415f
commit 7431ec6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -88,6 +88,11 @@
             <artifactId>icu4j</artifactId>
             <version>73.2</version>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver-dns</artifactId>
+            <version>4.1.100.Final</version>
+        </dependency>
     </dependencies>
     <build>
         <finalName>kotokoapp</finalName>

diff --git a/backend/src/main/java/de/neuefische/koheis/backend/converter/ConvertService.java b/backend/src/main/java/de/neuefische/koheis/backend/converter/ConvertService.java
@@ -32,6 +32,7 @@ public String convertKanjiToKana(GooRequest gooRequest) {
                 .bodyValue(gooRequest)
                 .retrieve()
                 .toEntity(GooResponse.class)
+                .retry(3)
                 .block();
 
         assert responseEntity != null;
@@ -51,15 +52,19 @@ public String convertKanaToAlphabet(String kana) {
 
     public Conversion convertTranslationToConversion(Translation translation) {
         String translated = translation.getJapanese();
-        if (translated.matches("^[\\u4E00-\\u9FFF]+$")) {
-            String kana = convertKanjiToKana(getGooRequest(translated, "hiragana"));
-            String alphabet = convertKanaToAlphabet(kana);
-            return new Conversion(translated, kana, alphabet);
-        } else if ((translated.matches("^[\\u3040-\\u309F]+$")) || (translation.getJapanese().matches("^[\\u30A0-\\u30FF]+$"))) {
-            String alphabet = convertKanaToAlphabet(translated);
-            return new Conversion("", translated, alphabet);
+        if (translated != null) {
+            if (translated.matches("^[\\u4E00-\\u9FFF]+$")) {
+                String kana = convertKanjiToKana(getGooRequest(translated, "hiragana"));
+                String alphabet = convertKanaToAlphabet(kana);
+                return new Conversion(translated, kana, alphabet);
+            } else if ((translated.matches("^[\\u3040-\\u309F]+$")) || (translation.getJapanese().matches("^[\\u30A0-\\u30FF]+$"))) {
+                String alphabet = convertKanaToAlphabet(translated);
+                return new Conversion("", translated, alphabet);
+            } else {
+                return new Conversion("", "", "");
+            }
         } else {
-            return new Conversion("", "", "");
+            return new Conversion("could not be translated", "", "");
         }
     }