Merge pull request #19 from auth0/chore-improve-telemetry

Update telemetry classes

Author: hzalaz

auth0/build.gradle

@@ -1,5 +1,9 @@
 apply plugin: 'java'
 
+compileJava {
+    sourceCompatibility "1.7"
+}
+
 dependencies {
     compile 'com.squareup.okhttp:okhttp:2.5.0'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.4.1'

auth0/src/main/java/com/auth0/Auth0.java

@@ -25,7 +25,6 @@
 package com.auth0;
 
 import com.auth0.authentication.AuthenticationAPIClient;
-import com.auth0.util.BaseTelemetry;
 import com.auth0.util.Telemetry;
 import com.squareup.okhttp.HttpUrl;
 
@@ -79,8 +78,7 @@ public Auth0(String clientId, String clientSecret, String domain, String configu
         this.clientSecret = clientSecret;
         this.domainUrl = ensureUrlString(domain);
         this.configurationUrl = resolveConfiguration(configurationDomain, this.domainUrl);
-        this.telemetry = new BaseTelemetry();
-        this.telemetry.usingLibrary(BuildConfig.NAME, BuildConfig.VERSION);
+        this.telemetry = new Telemetry(BuildConfig.NAME, BuildConfig.VERSION);
     }
 
     /**

auth0/src/main/java/com/auth0/util/BaseTelemetry.java

@@ -1,10 +1,51 @@
 package com.auth0.util;
 
-public interface Telemetry {
-    String NAME_KEY = "name";
-    String VERSION_KEY = "version";
-    String HEADER_NAME = "Auth0-Client";
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
-    void usingLibrary(String name, String version);
-    String getValue();
+import java.util.HashMap;
+import java.util.Map;
+
+public class Telemetry {
+    public static final String HEADER_NAME = "Auth0-Client";
+
+    private static final String NAME_KEY = "name";
+    private static final String VERSION_KEY = "version";
+    private static final String LIB_VERSION_KEY = "lib_version";
+
+    private final String name;
+    private final String version;
+    private final String libraryVersion;
+
+    public Telemetry(String name, String version) {
+        this(name, version, null);
+    }
+
+    public Telemetry(String name, String version, String libraryVersion) {
+        this.name = name;
+        this.version = version;
+        this.libraryVersion = libraryVersion;
+    }
+
+    public String getValue() {
+        Map<String, String> values = new HashMap<>();
+        if (name != null) {
+            values.put(NAME_KEY, name);
+        }
+        if (version != null) {
+            values.put(VERSION_KEY, version);
+        }
+        if (libraryVersion != null) {
+            values.put(LIB_VERSION_KEY, libraryVersion);
+        }
+        if (values.isEmpty()) {
+            return null;
+        }
+        try {
+            String json = new ObjectMapper().writeValueAsString(values);
+            return Base64.encodeUrlSafe(json);
+        } catch (JsonProcessingException e) {
+            return null;
+        }
+    }
 }

auth0/src/main/java/com/auth0/util/Telemetry.java

@@ -8,23 +8,23 @@
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
-public class BaseTelemetryTest {
+public class TelemetryTest {
 
-    private BaseTelemetry telemetry;
+    private Telemetry telemetry;
 
     @Before
     public void setUp() throws Exception {
-        telemetry = new BaseTelemetry();
+        telemetry = new Telemetry("auth0-java", "1.0.0");
     }
 
     @Test
     public void shouldReturnBase64() throws Exception {
-        telemetry.usingLibrary("auth0-java", "1.0.0");
         assertThat(telemetry.getValue(), is(notNullValue()));
     }
 
     @Test
     public void shouldReturnNullWhenNoInfoIsProvided() throws Exception {
+        telemetry = new Telemetry(null, null);
         assertThat(telemetry.getValue(), is(nullValue()));
     }
 }