From cb6e18520beef1da6be9c0d0c898aa97e3439782 Mon Sep 17 00:00:00 2001
From: Alejandro Matos <amatos@gmail.com>
Date: Sat, 5 Feb 2022 13:00:12 -0500
Subject: [PATCH] Upgrade from 14 to 17

---
 Dockerfile                                                  | 2 +-
 pom.xml                                                     | 2 +-
 .../restcountries/controller/CountryControllerV31.java      | 3 +--
 .../java/dev/amatos/restcountries/domain/v2/Country.java    | 3 +--
 .../restcountries/service/v2/CountryServiceBaseV2.java      | 2 +-
 .../amatos/restcountries/service/v2/CountryServiceV2.java   | 6 +++---
 .../restcountries/service/v3/CountryServiceBaseV3.java      | 2 --
 .../amatos/restcountries/service/v3/CountryServiceV3.java   | 1 +
 .../restcountries/service/v3/v31/CountryServiceV31.java     | 1 +
 9 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8500fd3..f51698f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ WORKDIR /
 COPY . .
 RUN mvn --batch-mode package
 
-FROM openjdk:14-alpine
+FROM openjdk:17-alpine
 COPY --from=build target/dev.amatos.restcountries-*.jar dev.amatos.restcountries.jar
 EXPOSE 8080
 CMD ["java", "-Dcom.sun.management.jmxremote", "-Xmx128m", "-jar", "dev.amatos.restcountries.jar"]
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ea28779..d3c2f75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   </parent>
 
   <properties>
-    <jdk.version>14</jdk.version>
+    <jdk.version>17</jdk.version>
     <!-- If you are building with JDK 9 or higher, you can uncomment the lines below to set the release version -->
     <release.version>14</release.version>
     <micronaut.version>2.0.1</micronaut.version>
diff --git a/src/main/java/dev/amatos/restcountries/controller/CountryControllerV31.java b/src/main/java/dev/amatos/restcountries/controller/CountryControllerV31.java
index 751247f..02295ea 100644
--- a/src/main/java/dev/amatos/restcountries/controller/CountryControllerV31.java
+++ b/src/main/java/dev/amatos/restcountries/controller/CountryControllerV31.java
@@ -104,8 +104,7 @@ public class CountryControllerV31 extends ControllerHelper {
       @QueryParam("fullText") Optional<Boolean> fullText,
       @QueryParam("fields") Optional<String> fields) {
     try {
-      var countries = CountryServiceV31.getInstance()
-          .getByName(name, fullText.orElse(false));
+      var countries = CountryServiceV31.getInstance().getByName(name, fullText.orElse(false));
       if (!countries.isEmpty()) {
         return checkFieldsAndParseCountries(fields, countries);
       }
diff --git a/src/main/java/dev/amatos/restcountries/domain/v2/Country.java b/src/main/java/dev/amatos/restcountries/domain/v2/Country.java
index 6e5705b..abb4f39 100644
--- a/src/main/java/dev/amatos/restcountries/domain/v2/Country.java
+++ b/src/main/java/dev/amatos/restcountries/domain/v2/Country.java
@@ -4,9 +4,8 @@
 package dev.amatos.restcountries.domain.v2;
 
 import dev.amatos.restcountries.domain.BaseCountry;
-import java.util.ArrayList;
+
 import java.util.List;
-import java.util.Map;
 
 public class Country extends BaseCountry {
 
diff --git a/src/main/java/dev/amatos/restcountries/service/v2/CountryServiceBaseV2.java b/src/main/java/dev/amatos/restcountries/service/v2/CountryServiceBaseV2.java
index 9bf8ef0..9b01f85 100644
--- a/src/main/java/dev/amatos/restcountries/service/v2/CountryServiceBaseV2.java
+++ b/src/main/java/dev/amatos/restcountries/service/v2/CountryServiceBaseV2.java
@@ -156,7 +156,7 @@ public class CountryServiceBaseV2 {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            logger.error("Could not load JSON " + filename);
+            logger.error("Could not load JSON {}", filename);
         }
         return countries;
     }
diff --git a/src/main/java/dev/amatos/restcountries/service/v2/CountryServiceV2.java b/src/main/java/dev/amatos/restcountries/service/v2/CountryServiceV2.java
index 2e48d36..dd121e6 100644
--- a/src/main/java/dev/amatos/restcountries/service/v2/CountryServiceV2.java
+++ b/src/main/java/dev/amatos/restcountries/service/v2/CountryServiceV2.java
@@ -5,8 +5,8 @@ package dev.amatos.restcountries.service.v2;
 
 import dev.amatos.restcountries.domain.v2.Country;
 import dev.amatos.restcountries.domain.v2.Currency;
-import dev.amatos.restcountries.domain.v2.Language;
 import dev.amatos.restcountries.domain.v2.RegionalBloc;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -130,8 +130,8 @@ public class CountryServiceV2 extends CountryServiceBaseV2 {
 
   private boolean getRegionalBlockMatch(String acronym, List<String> otherAcronym,
       String regionalBlock) {
-    return acronym != null && otherAcronym != null && ((acronym.equalsIgnoreCase(regionalBlock)
-        || otherAcronym.contains(regionalBlock)));
+    return acronym != null && otherAcronym != null && (acronym.equalsIgnoreCase(regionalBlock)
+        || otherAcronym.contains(regionalBlock));
   }
 
   @SuppressWarnings("unchecked")
diff --git a/src/main/java/dev/amatos/restcountries/service/v3/CountryServiceBaseV3.java b/src/main/java/dev/amatos/restcountries/service/v3/CountryServiceBaseV3.java
index 1b09f34..a68928f 100644
--- a/src/main/java/dev/amatos/restcountries/service/v3/CountryServiceBaseV3.java
+++ b/src/main/java/dev/amatos/restcountries/service/v3/CountryServiceBaseV3.java
@@ -72,8 +72,6 @@ public class CountryServiceBaseV3 {
           name.toLowerCase().contains(country.getName().getOfficial().toLowerCase())) {
         result.add(country);
       }
-    }
-    for (var country : countries) {
       for (String alternative : country.getAltSpellings()) {
         if (alternative.toLowerCase().contains(name.toLowerCase())) {
           result.add(country);
diff --git a/src/main/java/dev/amatos/restcountries/service/v3/CountryServiceV3.java b/src/main/java/dev/amatos/restcountries/service/v3/CountryServiceV3.java
index f532b02..f9d1e12 100644
--- a/src/main/java/dev/amatos/restcountries/service/v3/CountryServiceV3.java
+++ b/src/main/java/dev/amatos/restcountries/service/v3/CountryServiceV3.java
@@ -77,6 +77,7 @@ public class CountryServiceV3 extends CountryServiceBaseV3 {
     return result;
   }
 
+  @Override
   protected String normalize(String string) {
     return Normalizer.normalize(string, Normalizer.Form.NFD)
         .replaceAll("\\p{InCombiningDiacriticalMarks}+", "");
diff --git a/src/main/java/dev/amatos/restcountries/service/v3/v31/CountryServiceV31.java b/src/main/java/dev/amatos/restcountries/service/v3/v31/CountryServiceV31.java
index 0bcb021..1f1eb4d 100644
--- a/src/main/java/dev/amatos/restcountries/service/v3/v31/CountryServiceV31.java
+++ b/src/main/java/dev/amatos/restcountries/service/v3/v31/CountryServiceV31.java
@@ -78,6 +78,7 @@ public class CountryServiceV31 extends CountryServiceBaseV3 {
     return result;
   }
 
+  @Override
   protected String normalize(String string) {
     return Normalizer.normalize(string, Normalizer.Form.NFD)
         .replaceAll("\\p{InCombiningDiacriticalMarks}+", "");