leviathonbeast/restcountries
1
0
Fork 0
mirror of https://gitlab.com/restcountries/restcountries.git synced 2026-03-31 23:17:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updating dependencies

Browse Source
This commit is contained in:
Alejandro Matos
2021-09-29 11:44:17 -05:00
parent 5f74df330c
commit 5a5627ee7b
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+4 -4
View File
@@ -86,9 +86,9 @@
<version>2.8.2</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.14.1</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
@@ -103,7 +103,7 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>3.6.0.Final</version>
<version>4.5.7.Final</version>
</dependency>
</dependencies>
src/main/java/dev/amatos/restcountries/service/v2/CountryServiceBaseV2.java
+5 -4
View File
@@ -7,7 +7,6 @@ import com.google.gson.Gson;
import com.google.gson.stream.JsonReader;
import dev.amatos.restcountries.domain.BaseCountry;
import dev.amatos.restcountries.domain.ICountryRestSymbols;
import org.apache.log4j.Logger;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -15,10 +14,12 @@ import java.nio.charset.StandardCharsets;
import java.text.Normalizer;
import java.util.ArrayList;
import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class CountryServiceBaseV2 {
private static final Logger LOG = Logger.getLogger(CountryServiceBaseV2.class);
private static final Logger logger = LogManager.getLogger(CountryServiceBaseV2.class);
protected <T extends BaseCountry> T getByAlpha(String alpha, List<T> countries) {
int alphaLength = alpha.length();
@@ -140,7 +141,7 @@ public class CountryServiceBaseV2 {
}
protected List<? extends BaseCountry> loadJson(String filename, Class<? extends BaseCountry> clazz) {
LOG.debug("Loading JSON " + filename);
logger.info("Loading JSON {}", filename);
List<BaseCountry> countries = new ArrayList<>();
InputStream is = CountryServiceBaseV2.class.getClassLoader().getResourceAsStream(filename);
var gson = new Gson();
@@ -155,7 +156,7 @@ public class CountryServiceBaseV2 {
}
} catch (Exception e) {
e.printStackTrace();
LOG.error("Could not load JSON " + filename);
logger.error("Could not load JSON " + filename);
}
return countries;
}
src/main/java/dev/amatos/restcountries/service/v2/CountryServiceV2.java
-2
View File
@@ -9,11 +9,9 @@ import dev.amatos.restcountries.domain.v2.Language;
import dev.amatos.restcountries.domain.v2.RegionalBloc;
import java.util.ArrayList;
import java.util.List;
import org.apache.log4j.Logger;
public class CountryServiceV2 extends CountryServiceBaseV2 {
private static final Logger LOG = Logger.getLogger(CountryServiceV2.class);
private static List<Country> countries;