diff --git a/src/main/java/org/translation/JSONDemo.java b/src/main/java/org/translation/JSONDemo.java index 9614e867..44098fda 100644 --- a/src/main/java/org/translation/JSONDemo.java +++ b/src/main/java/org/translation/JSONDemo.java @@ -34,7 +34,8 @@ public static void main(String[] args) { */ public static String getKeyOneOfSecond(JSONArray jsonArray) { // TODO: Complete this method. - return ""; + JSONObject second = jsonArray.getJSONObject(1); + return second.getString("key1"); } } diff --git a/src/main/java/org/translation/JSONTranslationExample.java b/src/main/java/org/translation/JSONTranslationExample.java index 1483638c..f6afa9e0 100644 --- a/src/main/java/org/translation/JSONTranslationExample.java +++ b/src/main/java/org/translation/JSONTranslationExample.java @@ -38,7 +38,7 @@ public JSONTranslationExample() { public String getCanadaCountryNameSpanishTranslation() { // TODO Checkstyle: '30' is a magic number. - JSONObject canada = jsonArray.getJSONObject(30); + JSONObject canada = jsonArray.getJSONObject(CANADA_INDEX); return canada.getString("es"); } @@ -52,7 +52,18 @@ public String getCanadaCountryNameSpanishTranslation() { * @return the translation of country to the given language or "Country not found" if there is no translation. */ public String getCountryNameTranslation(String countryCode, String languageCode) { - return "Country not found"; + int id = 0; + for (int i = 0; i < jsonArray.length(); i++) { + JSONObject jsonObject = jsonArray.getJSONObject(i); + + if (countryCode.equals(jsonObject.getString("alpha3"))) { + id = i; + break; + } + } + JSONObject country = jsonArray.getJSONObject(id); + return country.getString(languageCode); + // return "Country not found"; } /**