fix: send 2-letter country abbreviation, not display name (#30)

Signed-off-by: Andre Dietisheim <[email protected]>

Author: adietish

src/main/java/com/redhat/devtools/intellij/telemetry/core/service/Country.java

@@ -31,7 +31,6 @@ public class Country {
     private static final Logger LOGGER = Logger.getInstance(Country.class);
 
     private static final String TIMEZONES = "/timezones.json";
-    private static final String COUNTRIES = "/countries.json";
     private static final String KEY_COUNTRY = "c";
     private static final String KEY_ALTERNATIVE = "a";
 
@@ -41,8 +40,7 @@ public static Country getInstance() {
         return INSTANCE;
     }
 
-    private Lazy<Map<String, Map<String, String>>> timezones = new Lazy<>(() -> deserialize(TIMEZONES));
-    private Lazy<Map<String, String>> countries = new Lazy<>(() -> deserialize(COUNTRIES));
+    private final Lazy<Map<String, Map<String, String>>> timezones = new Lazy<>(() -> deserialize(TIMEZONES));
 
     protected Country() {
         // for testing purposes
@@ -55,24 +53,20 @@ public String get(TimeZone timeZone) {
         return get(timeZone.getID());
     }
 
-    private String get(String timezoneId) {
+    public String get(String timezoneId) {
         Map<String, String> timezone = timezones.get().get(timezoneId);
         if (timezone == null) {
-            return timezoneId;
+            return null;
         }
         String abbreviation = timezone.get(KEY_COUNTRY);
-        if (abbreviation == null) {
-            String alternative = timezone.get(KEY_ALTERNATIVE);
-            if (alternative == null) {
-                return timezoneId;
-            }
-            return get(alternative);
+        if (abbreviation != null) {
+            return abbreviation;
         }
-        return getDisplayName(abbreviation);
-    }
-
-    private String getDisplayName(String abbreviation) {
-        return countries.get().get(abbreviation);
+        String alternative = timezone.get(KEY_ALTERNATIVE);
+        if (alternative == null) {
+            return null;
+        }
+        return get(alternative);
     }
 
     private <V> Map<String, V> deserialize(String file) {

src/main/java/com/redhat/devtools/intellij/telemetry/core/service/Environment.java

@@ -20,6 +20,9 @@
 import java.util.TimeZone;
 
 public class Environment {
+
+    public static final String UNKNOWN_COUNTRY = "ZZ";
+
     private final Application plugin;
     private final Application application;
     private final Platform platform;
@@ -118,7 +121,7 @@ public Builder timezone(String timezone) {
 
         private void ensureTimezone() {
             if (timezone == null) {
-                timezone(System.getProperty("user.timezone", ""));
+                timezone(TimeZone.getDefault().getID());
             }
         }
 
@@ -145,7 +148,12 @@ private void ensureCountry() {
                  * Segment won't report countries for incoming requests.
                  * We thus currently dont have any better solution than use the country in the Locale.
                  */
-                country(Country.getInstance().get(TimeZone.getDefault()));
+                ensureTimezone();
+                String country = Country.getInstance().get(timezone);
+                if (country == null) {
+                    country = UNKNOWN_COUNTRY;
+                }
+                country(country);
             }
         }
 
@@ -179,7 +187,6 @@ public Environment build() {
                 ensurePlatform();
                 ensureCountry();
                 ensureLocale();
-                ensurePlatform();
                 ensureTimezone();
                 return new Environment(plugin, application, platform, timezone, locale, country);
             }

src/main/resources/countries.json

@@ -24,14 +24,14 @@ void get_should_return_country_for_timezoneId() {
         // when
         String country = Country.getInstance().get(TimeZone.getTimeZone("Europe/Zurich"));
         // then
-        assertThat(country).isEqualTo("Switzerland");
+        assertThat(country).isEqualTo("CH");
     }
 
     @Test
     void get_should_return_null_for_null_timezoneId() {
         // given
         // when
-        String country = Country.getInstance().get(null);
+        String country = Country.getInstance().get((String) null);
         // then
         assertThat(country).isEqualTo(null);
     }
@@ -44,7 +44,7 @@ void get_should_return_timezoneId_for_unknown_timezoneId() {
         timeZone.setID("Aldreean/Organa Major");
         String country = Country.getInstance().get(timeZone);
         // then
-        assertThat(country).isEqualTo("Aldreean/Organa Major");
+        assertThat(country).isNull();
     }
 
     @Test
@@ -53,16 +53,16 @@ void get_should_return_country_for_timezoneId_with_alternative() {
         // when "America/Argentina/ComodRivadavia" -> "a: America/Argentina/Catamarca" -> "c: AR" -> "Argentina"
         String country = Country.getInstance().get(TimeZone.getTimeZone("America/Argentina/ComodRivadavia"));
         // then
-        assertThat(country).isEqualTo("Argentina");
+        assertThat(country).isEqualTo("AR");
     }
 
     @Test
-    void get_should_return_timezoneId_for_timezoneId_without_country_nor_alternative() {
+    void get_should_return_null_for_timezoneId_without_country_nor_alternative() {
         // given
         // when
         String country = Country.getInstance().get(TimeZone.getTimeZone("CET"));
         // then
-        assertThat(country).isEqualTo("CET");
+        assertThat(country).isNull();
     }
 
 }