Merge pull request #69 from bugsnag/remove-guava-dep

Remove dependency on Guava

Author: fractalwrench

build.gradle

@@ -26,7 +26,6 @@ repositories {
 
 dependencies {
     compile 'com.fasterxml.jackson.core:jackson-databind:2.9.1'
-    compile 'com.google.guava:guava:23.1-android'
     compile 'org.slf4j:slf4j-api:1.7.25'
     compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Fri Sep 30 22:16:53 BST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,11 +1,11 @@
 package com.bugsnag;
 
 import com.bugsnag.serialization.Expose;
-import com.bugsnag.util.FilterTransformer;
 
-import com.google.common.collect.Maps;
+import com.bugsnag.util.FilteredMap;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -110,8 +110,7 @@ public Map getUser() {
 
     @Expose
     public Map getMetaData() {
-        Map<String, Object> metaDataMap = diagnostics.metaData;
-        return Maps.transformEntries(metaDataMap, new FilterTransformer(config.filters));
+        return new FilteredMap(diagnostics.metaData, Arrays.asList(config.filters));
     }
 
     /**

gradlew

@@ -2,47 +2,60 @@
 
 import com.bugsnag.Report;
 
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Locale;
 
 public class DeviceCallback implements Callback {
-    private static final Supplier<String> hostnameCache =
-        Suppliers.memoize(new Supplier<String>() {
 
-            public String get() {
-                // Windows always sets COMPUTERNAME
-                if (System.getProperty("os.name").startsWith("Windows")) {
-                    return System.getenv("COMPUTERNAME");
-                }
+    private static volatile String hostname;
+    private static transient volatile boolean hostnameInitialised;
+    private static final Object lock = new Object();
 
-                // Try the HOSTNAME env variable (most unix systems)
-                String hostname = System.getenv("HOSTNAME");
-                if (hostname != null) {
-                    return hostname;
+    /**
+     * Memoises the hostname, as lookup can be expensive
+     */
+    private static String getHostnameValue() {
+        if (!hostnameInitialised) {
+            synchronized (lock) {
+                if (!hostnameInitialised) {
+                    hostname = lookupHostname();
+                    hostnameInitialised = true;
                 }
-
-                // Resort to dns hostname lookup
-                try {
-                    return InetAddress.getLocalHost().getHostName();
-                } catch (UnknownHostException ex) {
-                    // Give up
-                }
-                return null;
             }
-        });
+        }
+        return hostname;
+    }
+
+    private static String lookupHostname() {
+        // Windows always sets COMPUTERNAME
+        if (System.getProperty("os.name").startsWith("Windows")) {
+            return System.getenv("COMPUTERNAME");
+        }
+
+        // Try the HOSTNAME env variable (most unix systems)
+        String hostname = System.getenv("HOSTNAME");
+        if (hostname != null) {
+            return hostname;
+        }
+
+        // Resort to dns hostname lookup
+        try {
+            return InetAddress.getLocalHost().getHostName();
+        } catch (UnknownHostException ex) {
+            // Give up
+        }
+        return null;
+    }
 
     public static void initializeCache() {
-        hostnameCache.get();
+        getHostnameValue();
     }
 
     @Override
     public void beforeNotify(Report report) {
         report
-                .setDeviceInfo("hostname", hostnameCache.get())
+                .setDeviceInfo("hostname", getHostnameValue())
                 .setDeviceInfo("osName", System.getProperty("os.name"))
                 .setDeviceInfo("osVersion", System.getProperty("os.version"))
                 .setDeviceInfo("osArch", System.getProperty("os.arch"))

gradlew.bat

@@ -0,0 +1,106 @@
+package com.bugsnag.util;
+
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Decorates a map, and alters the return value of {@link #get(Object)} if the key matches a filter.
+ */
+public class FilteredMap implements Map<String, Object> {
+
+    private static final String FILTERED_PLACEHOLDER = "[FILTERED]";
+
+    private final Map<String, Object> map;
+    private final Collection<String> keyFilters = new ArrayList<String>();
+
+    public FilteredMap(Map<String, Object> map, Collection<String> keyFilters) {
+        this.map = map;
+        this.keyFilters.addAll(keyFilters);
+    }
+
+    @Override
+    public int size() {
+        return map.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return map.isEmpty();
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        return map.containsKey(key);
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        return values().contains(value);
+    }
+
+    @Override
+    public Object get(Object key) {
+        Object obj = map.get(key);
+        return obj != null ? transformEntry(key, obj) : null;
+    }
+
+    @Override
+    public Object put(String key, Object value) {
+        return map.put(key, value);
+    }
+
+    @Override
+    public Object remove(Object key) {
+        return map.remove(key);
+    }
+
+    @Override
+    public void putAll(Map<? extends String, ?> mapValues) {
+        map.putAll(mapValues);
+    }
+
+    @Override
+    public void clear() {
+        map.clear();
+    }
+
+    @Override
+    public Set<String> keySet() {
+        return map.keySet();
+    }
+
+    @Override
+    public Collection<Object> values() {
+        return map.values();
+    }
+
+    @Override
+    public Set<Entry<String, Object>> entrySet() {
+        return map.entrySet();
+    }
+
+    private Object transformEntry(Object key, Object value) {
+        if (value instanceof Map) {
+            //noinspection unchecked
+            return new FilteredMap((Map<String, Object>) value, keyFilters);
+        }
+        return shouldFilterKey((String) key) ? FILTERED_PLACEHOLDER : value;
+    }
+
+    private boolean shouldFilterKey(String key) {
+        if (keyFilters == null || key == null) {
+            return false;
+        }
+
+        for (String filter : keyFilters) {
+            if (key.contains(filter)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}