remove runtime guava dependency (#35)

Author: Daniel Norberg

pom.xml

@@ -87,11 +87,6 @@
       <artifactId>logback-core</artifactId>
       <version>1.2.3</version>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-    </dependency>
     <dependency>
       <groupId>net.logstash.logback</groupId>
       <artifactId>logstash-logback-encoder</artifactId>
@@ -142,6 +137,12 @@
       <version>2.11.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>17.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

src/main/java/com/spotify/logging/LoggingConfigurator.java

@@ -37,8 +37,6 @@
 package com.spotify.logging;
 
 import static ch.qos.logback.classic.Level.OFF;
-import static com.google.common.base.Strings.emptyToNull;
-import static com.google.common.base.Strings.isNullOrEmpty;
 import static java.lang.System.getenv;
 
 import ch.qos.logback.classic.Logger;
@@ -53,11 +51,11 @@
 import ch.qos.logback.core.joran.spi.JoranException;
 import ch.qos.logback.core.util.StatusPrinter;
 import com.getsentry.raven.logback.SentryAppender;
-import com.google.common.base.Charsets;
 import com.spotify.logging.logback.CustomLogstashEncoder;
 import com.spotify.logging.logback.MillisecondPrecisionSyslogAppender;
 import java.io.File;
 import java.lang.management.ManagementFactory;
+import java.nio.charset.StandardCharsets;
 import net.logstash.logback.composite.loggingevent.ArgumentsJsonProvider;
 import org.slf4j.LoggerFactory;
 
@@ -372,7 +370,7 @@ private static Appender<ILoggingEvent> getStdErrAppender(
         "%date{HH:mm:ss.SSS} %property{ident}[%property{pid}]: %-5level [%thread] %logger{0}: "
             + ReplaceNewLines.getMsgPattern(replaceNewLines)
             + "%n");
-    encoder.setCharset(Charsets.UTF_8);
+    encoder.setCharset(StandardCharsets.UTF_8);
     encoder.start();
 
     // Setup stderr appender
@@ -400,7 +398,7 @@ static Appender<ILoggingEvent> getSyslogAppender(
       final String host,
       final int port,
       final ReplaceNewLines replaceNewLines) {
-    final String h = isNullOrEmpty(host) ? "localhost" : host;
+    final String h = (host == null || host.isEmpty()) ? "localhost" : host;
     final int p = port < 0 ? 514 : port;
 
     final MillisecondPrecisionSyslogAppender appender = new MillisecondPrecisionSyslogAppender();
@@ -409,7 +407,7 @@ static Appender<ILoggingEvent> getSyslogAppender(
     appender.setSyslogHost(h);
     appender.setPort(p);
     appender.setName("syslog");
-    appender.setCharset(Charsets.UTF_8);
+    appender.setCharset(StandardCharsets.UTF_8);
     appender.setContext(context);
     appender.setSuffixPattern(
         "%property{ident}[%property{pid}]: " + ReplaceNewLines.getMsgPattern(replaceNewLines));
@@ -450,7 +448,7 @@ static void configure(final JewelCliLoggingOptions opts) {
     // See if syslog host was specified via command line or environment variable.
     // The command line value takes precedence, which defaults to an empty string.
     String syslogHost = opts.syslogHost();
-    if (isNullOrEmpty(syslogHost)) {
+    if (syslogHost == null || syslogHost.isEmpty()) {
       syslogHost = getSyslogHost();
     }
 
@@ -564,15 +562,17 @@ private static String getMyPid() {
   }
 
   private static String getSyslogHost() {
-    return emptyToNull(getenv(SPOTIFY_SYSLOG_HOST));
+    final String host = System.getenv().getOrDefault(SPOTIFY_SYSLOG_HOST, "");
+    return host.isEmpty() ? null : host;
   }
 
   private static int getSyslogPort() {
-    final String port = getenv(SPOTIFY_SYSLOG_PORT);
-    return isNullOrEmpty(port) ? -1 : Integer.valueOf(port);
+    final String port = System.getenv().getOrDefault(SPOTIFY_SYSLOG_PORT, "");
+    return port.isEmpty() ? -1 : Integer.parseInt(port);
   }
 
   private static String getSpotifyHostname() {
-    return emptyToNull(getenv(SPOTIFY_HOSTNAME));
+    final String hostname = System.getenv().getOrDefault(SPOTIFY_HOSTNAME, "");
+    return hostname.isEmpty() ? null : hostname;
   }
 }

src/main/java/com/spotify/logging/logback/MillisecondPrecisionSyslogAppender.java

@@ -44,16 +44,15 @@
 import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.Layout;
 import ch.qos.logback.core.net.SyslogAppenderBase;
-import com.google.common.base.Charsets;
-import com.google.common.base.Throwables;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 /** A {@link SyslogAppender} with millisecond timestamp precision. */
 public class MillisecondPrecisionSyslogAppender extends SyslogAppender {
-  private Charset charset = Charsets.UTF_8;
+  private Charset charset = StandardCharsets.UTF_8;
   PatternLayout stackTraceLayout = new PatternLayout();
   private OutputStream sos;
 
@@ -199,7 +198,7 @@ private OutputStream getSyslogOutputStream() {
       f.setAccessible(true);
       return (OutputStream) f.get(this);
     } catch (ReflectiveOperationException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 

src/main/java/com/spotify/logging/logback/MillisecondPrecisionSyslogStartConverter.java

@@ -40,11 +40,11 @@
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.classic.util.LevelToSyslogSeverity;
 import ch.qos.logback.core.net.SyslogAppenderBase;
-import com.google.common.base.Optional;
 import java.text.DateFormatSymbols;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
+import java.util.Optional;
 
 /** A {@link SyslogStartConverter} with millisecond timestamp precision. */
 public class MillisecondPrecisionSyslogStartConverter extends SyslogStartConverter {
@@ -69,7 +69,7 @@ public void start() {
     facility = SyslogAppenderBase.facilityStringToint(facilityStr);
 
     localHostName =
-        Optional.fromNullable(getContext().getProperty("hostname")).or(getLocalHostname());
+        Optional.ofNullable(getContext().getProperty("hostname")).orElse(getLocalHostname());
 
     try {
       // ASL doesn't handle milliseconds.

src/main/java/com/spotify/logging/logback/SpotifyInternalAppender.java

@@ -23,8 +23,6 @@
 import ch.qos.logback.classic.net.SyslogAppender;
 import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.net.SyslogAppenderBase;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
 import com.spotify.logging.LoggingConfigurator;
 import java.lang.management.ManagementFactory;
 
@@ -50,7 +48,9 @@ public class SpotifyInternalAppender extends MillisecondPrecisionSyslogAppender
 
   @Override
   public void start() {
-    Preconditions.checkState(serviceName != null, "serviceName must be configured");
+    if (serviceName == null) {
+      throw new IllegalStateException(String.valueOf("serviceName must be configured"));
+    }
 
     // set up some defaults
     setFacility("LOCAL0");
@@ -113,7 +113,6 @@ public void setReplaceNewLines(LoggingConfigurator.ReplaceNewLines replaceNewLin
   // copied from LoggingConfigurator to avoid making public and exposing externally.
   // TODO (bjorn): We probably want to move this to the utilities project.
   // Also, the portability of this function is not guaranteed.
-  @VisibleForTesting
   static String getMyPid() {
     String pid = "0";
     try {

src/test/java/com/spotify/logging/logback/MillisecondPrecisionSyslogStartConverterTest.java

@@ -36,12 +36,12 @@
 
 package com.spotify.logging.logback;
 
+import static java.util.Arrays.asList;
 import static org.junit.Assert.assertTrue;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.spi.LoggingEvent;
-import com.google.common.collect.ImmutableList;
 import org.junit.Test;
 
 public class MillisecondPrecisionSyslogStartConverterTest {
@@ -56,7 +56,7 @@ public void shouldLogContextPropertyHostname() {
     MillisecondPrecisionSyslogStartConverter millisecondPrecisionSyslogStartConverter =
         new MillisecondPrecisionSyslogStartConverter();
     millisecondPrecisionSyslogStartConverter.setContext(context);
-    millisecondPrecisionSyslogStartConverter.setOptionList(ImmutableList.of("LOCAL0"));
+    millisecondPrecisionSyslogStartConverter.setOptionList(asList("LOCAL0"));
     millisecondPrecisionSyslogStartConverter.start();
 
     LoggingEvent event = new LoggingEvent();