docker-java
diff --git a/‎src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java‎
Lines changed: 3 additions & 4 deletions b/‎src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java‎
Lines changed: 3 additions & 4 deletions
diff --git a/‎src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java‎
Lines changed: 2 additions & 36 deletions b/‎src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java‎
Lines changed: 2 additions & 36 deletions
diff --git a/‎src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java‎
Lines changed: 2 additions & 4 deletions b/‎src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎src/main/java/com/github/dockerjava/core/util/guava/Guava.java‎
Lines changed: 0 additions & 45 deletions b/‎src/main/java/com/github/dockerjava/core/util/guava/Guava.java‎
Lines changed: 0 additions & 45 deletions
diff --git a/‎src/main/java/com/github/dockerjava/core/util/guava/PercentEscaper.java‎
Lines changed: 0 additions & 245 deletions b/‎src/main/java/com/github/dockerjava/core/util/guava/PercentEscaper.java‎
Lines changed: 0 additions & 245 deletions
@@ -1,9 +1,8 @@
 package com.github.dockerjava.api.command;
 
-import static com.github.dockerjava.core.util.guava.Guava.join;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Joiner;
 
 /**
  *
@@ -32,12 +31,12 @@ public String toString() {
 		StringBuffer buffer = new StringBuffer();
 		buffer.append("[");
 		for(String[] fields: processes) {
-			buffer.append("[" + join(fields, "; ", true) + "]");
+			buffer.append("[" + Joiner.on("; ").skipNulls().join(fields) + "]");
 		}
 		buffer.append("]");
 
         return "TopContainerResponse{" +
-                "titles=" + join(titles, "; ", true) +
+                "titles=" + Joiner.on("; ").skipNulls().join(titles) +
                 ", processes=" + buffer.toString() +
                 '}';
     }
 
@@ -66,31 +66,7 @@ public Optional<? extends DockerfileStatement> apply(String input) {
     }
   }
 
-  /**
-   * Not needed in modern guava
-   */
-  private static class MissingOptionalFilter
-      implements Predicate<Optional<? extends DockerfileStatement>> {
-
-    @Override
-    public boolean apply(Optional<? extends DockerfileStatement> optional) {
-      return (optional.orNull() != null);
-    }
-  }
-
-  /**
-   * Not needed in modern guava
-   */
-  private static class OptionalItemTransformer
-      implements Function<Optional<? extends DockerfileStatement>, DockerfileStatement> {
-
-    @Override
-    public DockerfileStatement apply(Optional<? extends DockerfileStatement> optional) {
-      return optional.orNull();
-    }
-  }
-
-  public Collection<DockerfileStatement> getStatements() throws IOException {
+  public Iterable<DockerfileStatement> getStatements() throws IOException {
     Collection<String> dockerFileContent = FileUtils.readLines(dockerFile);
 
     if (dockerFileContent.size() <= 0) {
@@ -101,17 +77,7 @@ public Collection<DockerfileStatement> getStatements() throws IOException {
     Collection<Optional<? extends DockerfileStatement>> optionals = Collections2
         .transform(dockerFileContent, new LineTransformer());
 
-    // Modern guava would be done here,
-    // With simply return Optional.presentInstances( optionals );
-    //
-    // So this entire function could simply be
-    // return Optional.presentInstances( Collections2.transform( FileUtils.readLines(dockerFile), new LineTransformer() ) );
-    //
-    // Until the dawn of that day, do it manually
-
-    return Collections2.transform(Collections2.filter(optionals, new MissingOptionalFilter()),
-                                  new OptionalItemTransformer());
-
+    return Optional.presentInstances(optionals);
   }
 
   public List<String> getIgnores() throws IOException {
 
@@ -188,15 +188,13 @@ public static Optional<? extends DockerfileStatement> createFromLine(String cmd)
 
     line = Add.create(cmd);
 
-    // if (line.isPresent()) { : Newer guava
-    if (line.orNull() != null) {
+    if (line.isPresent()) {
       return line;
     }
 
     line = Env.create(cmd);
 
-    // if (line.isPresent()) { : Newer guava
-    if (line.orNull() != null) {
+    if (line.isPresent()) {
       return line;
     }
Original file line number	Diff line number	Diff line change
`@@ -188,15 +188,13 @@ public static Optional<? extends DockerfileStatement> createFromLine(String cmd)`
`188`	`188`
`189`	`189`	`line = Add.create(cmd);`
`190`	`190`
`191`		`- // if (line.isPresent()) { : Newer guava`
`192`		`- if (line.orNull() != null) {`
	`191`	`+ if (line.isPresent()) {`
`193`	`192`	`return line;`
`194`	`193`	`}`
`195`	`194`
`196`	`195`	`line = Env.create(cmd);`
`197`	`196`
`198`		`- // if (line.isPresent()) { : Newer guava`
`199`		`- if (line.orNull() != null) {`
	`197`	`+ if (line.isPresent()) {`
`200`	`198`	`return line;`
`201`	`199`	`}`
`202`	`200`