diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java
index b24c3208d..a7957a945 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java
@@ -55,7 +55,7 @@ public static class Deserializer extends JsonDeserializer<Binds> {
         public Binds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
                 throws IOException, JsonProcessingException {
 
-            List<Bind> binds = new ArrayList<Bind>();
+            List<Bind> binds = new ArrayList<>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<JsonNode> it = node.elements(); it.hasNext();) {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
index 7670212e1..c20e84cec 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
@@ -61,7 +61,7 @@ public static class Deserializer extends JsonDeserializer<ExposedPorts> {
         public ExposedPorts deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
                 throws IOException, JsonProcessingException {
 
-            List<ExposedPort> exposedPorts = new ArrayList<ExposedPort>();
+            List<ExposedPort> exposedPorts = new ArrayList<>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java
index 1eb66ae42..1c32984ee 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java
@@ -57,7 +57,7 @@ public static class Deserializer extends JsonDeserializer<Links> {
         @Override
         public Links deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext)
                 throws IOException, JsonProcessingException {
-            final List<Link> binds = new ArrayList<Link>();
+            final List<Link> binds = new ArrayList<>();
             final ObjectCodec oc = jsonParser.getCodec();
             final JsonNode node = oc.readTree(jsonParser);
             for (final Iterator<JsonNode> it = node.elements(); it.hasNext();) {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
index 673852d9e..f4c0b1841 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -39,7 +39,7 @@
 public class Ports implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    private final Map<ExposedPort, Binding[]> ports = new HashMap<ExposedPort, Binding[]>();
+    private final Map<ExposedPort, Binding[]> ports = new HashMap<>();
 
     /**
      * Creates a {@link Ports} object with no {@link PortBinding}s. Use {@link #bind(ExposedPort, Binding)} or {@link #add(PortBinding...)}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
index aeef19e9f..3c1d4ab47 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
@@ -54,7 +54,7 @@ public static final class Deserializer extends JsonDeserializer<VolumeBinds> {
         public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
                 throws IOException, JsonProcessingException {
 
-            List<VolumeBind> binds = new ArrayList<VolumeBind>();
+            List<VolumeBind> binds = new ArrayList<>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
index 3246b0e8e..b6844b987 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
@@ -61,7 +61,7 @@ public static class Deserializer extends JsonDeserializer<Volumes> {
         public Volumes deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
                 throws IOException, JsonProcessingException {
 
-            List<Volume> volumes = new ArrayList<Volume>();
+            List<Volume> volumes = new ArrayList<>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
index 1b12bd13d..8fcaffb8d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
@@ -55,7 +55,7 @@ public static final class Deserializer extends JsonDeserializer<VolumesRW> {
         public VolumesRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
                 throws IOException, JsonProcessingException {
 
-            List<VolumeRW> volumesRW = new ArrayList<VolumeRW>();
+            List<VolumeRW> volumesRW = new ArrayList<>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 3710f0e8c..063fbd3bf 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -54,7 +54,7 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
 
     private static final String DOCKER_JAVA_PROPERTIES = "docker-java.properties";
 
-    private static final Set<String> CONFIG_KEYS = new HashSet<String>();
+    private static final Set<String> CONFIG_KEYS = new HashSet<>();
 
     static {
         CONFIG_KEYS.add(DOCKER_HOST);
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
index ac1e3cf28..e307fc990 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -33,7 +33,7 @@ public class DockerConfigFile {
     private final Map<String, AuthConfig> auths;
 
     public DockerConfigFile() {
-        this(new HashMap<String, AuthConfig>());
+        this(new HashMap<>());
     }
 
     private DockerConfigFile(Map<String, AuthConfig> authConfigMap) {
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/docker-java/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index b26b7db44..445c00120 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -64,7 +64,7 @@ public static boolean match(String pattern, File file) {
      * Returns the matching patterns for the given string
      */
     public static List<String> match(List<String> patterns, String name) {
-        List<String> matches = new ArrayList<String>();
+        List<String> matches = new ArrayList<>();
         for (String pattern : patterns) {
             if (match(pattern, name)) {
                 matches.add(pattern);
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/docker-java/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index 006d89c6c..6e39f4f94 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -82,12 +82,7 @@ public SSLContext getSSLContext() {
     }
 
     private PrivilegedAction<String> getSystemProperty(final String name, final String def) {
-        return new PrivilegedAction<String>() {
-            @Override
-            public String run() {
-                return System.getProperty(name, def);
-            }
-        };
+        return () -> System.getProperty(name, def);
     }
 
     @Override
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 0384ba145..cf24c0014 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -306,7 +306,7 @@ public BuildImageCmd withCpusetcpus(String cpusetcpus) {
     @Override
     public BuildImageCmd withBuildArg(String key, String value) {
         if (this.buildArgs == null) {
-            this.buildArgs = new HashMap<String, String>();
+            this.buildArgs = new HashMap<>();
         }
         this.buildArgs.put(key, value);
         return this;
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 46f6a00c2..752935e19 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -84,7 +84,7 @@ public Iterable<DockerfileStatement> getStatements() throws IOException {
     }
 
     public List<String> getIgnores() throws IOException {
-        List<String> ignores = new ArrayList<String>();
+        List<String> ignores = new ArrayList<>();
         File dockerIgnoreFile = new File(baseDirectory, ".dockerignore");
         if (dockerIgnoreFile.exists()) {
             int lineNumber = 0;
@@ -118,7 +118,7 @@ public class ScannedResult {
 
         final List<String> ignores;
 
-        final List<File> filesToAdd = new ArrayList<File>();
+        final List<File> filesToAdd = new ArrayList<>();
 
         public InputStream buildDockerFolderTar() {
             return buildDockerFolderTar(baseDirectory);
@@ -224,7 +224,7 @@ private boolean isBaseDirectory(File directory) {
          * Returns all matching ignore patterns for the given file name.
          */
         private List<String> matchingIgnorePatterns(String fileName) {
-            List<String> matches = new ArrayList<String>();
+            List<String> matches = new ArrayList<>();
 
             int lineNumber = 0;
             for (String pattern : ignores) {
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
index 3f14db05a..aefff137d 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -11,10 +11,8 @@
 import org.apache.commons.lang.StringUtils;
 
 import com.github.dockerjava.api.exception.DockerClientException;
-import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 
 /**
@@ -92,28 +90,19 @@ private Add(Collection<String> sources, String destination) {
 
         @Override
         public Add transform(final Map<String, String> env) {
-            Collection<String> resources = Collections2.transform(sources, new Function<String, String>() {
-                @Override
-                public String apply(String source) {
-                    return filterForEnvironmentVars(env, source).trim();
-                }
-            });
+            Collection<String> resources = Collections2.transform(sources, source -> filterForEnvironmentVars(env, source).trim());
             return new Add(resources, destination);
         }
 
         public Iterable<String> getFileResources() {
-            return Collections2.filter(sources, new Predicate<String>() {
-
-                @Override
-                public boolean apply(String source) {
-                    URI uri;
-                    try {
-                        uri = new URI(source);
-                    } catch (URISyntaxException e) {
-                        return false;
-                    }
-                    return uri.getScheme() == null || "file".equals(uri.getScheme());
+            return Collections2.filter(sources, source -> {
+                URI uri;
+                try {
+                    uri = new URI(source);
+                } catch (URISyntaxException e) {
+                    return false;
                 }
+                return uri.getScheme() == null || "file".equals(uri.getScheme());
             });
         }
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
index d942e59e0..73b369ca7 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
@@ -27,7 +27,7 @@ public class FiltersBuilder {
     private static final Pattern UNTIL_GO_PATTERN =
             Pattern.compile("^([1-9][0-9]*h)?([1-9][0-9]*m)?([1-9][0-9]*s)?$");
 
-    private Map<String, List<String>> filters = new HashMap<String, List<String>>();
+    private Map<String, List<String>> filters = new HashMap<>();
 
     public FiltersBuilder() {
     }
@@ -95,7 +95,7 @@ public FiltersBuilder withUntil(String until) throws NumberFormatException {
     }
 
     private static List<String> labelsMapToList(Map<String, String> labels) {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         for (Entry<String, String> entry : labels.entrySet()) {
             String rest = (entry.getValue() != null & !entry.getValue().isEmpty()) ? "=" + entry.getValue() : "";
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
index 3473aa828..02a4bc8fc 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
@@ -11,7 +11,7 @@
  */
 public class SwarmNodesFiltersBuilder {
 
-    private Map<String, List<String>> filters = new HashMap<String, List<String>>();
+    private Map<String, List<String>> filters = new HashMap<>();
 
     public SwarmNodesFiltersBuilder() {
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
index a1b860b28..50459de8c 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
@@ -45,7 +45,7 @@ public class ApacheUnixSocket extends Socket {
 
     private final AFUNIXSocket inner;
 
-    private final Queue<SocketOptionSetter> optionsToSet = new ArrayDeque<SocketOptionSetter>();
+    private final Queue<SocketOptionSetter> optionsToSet = new ArrayDeque<>();
 
     public ApacheUnixSocket() throws IOException {
         this.inner = AFUNIXSocket.newInstance();
@@ -132,12 +132,7 @@ private void setAllSocketOptions() throws SocketException {
 
     @Override
     public void setTcpNoDelay(final boolean on) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setTcpNoDelay(on);
-            }
-        });
+        setSocketOption(() -> inner.setTcpNoDelay(on));
     }
 
     @Override
@@ -147,12 +142,7 @@ public boolean getTcpNoDelay() throws SocketException {
 
     @Override
     public void setSoLinger(final boolean on, final int linger) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setSoLinger(on, linger);
-            }
-        });
+        setSocketOption(() -> inner.setSoLinger(on, linger));
     }
 
     @Override
@@ -167,12 +157,7 @@ public void sendUrgentData(final int data) throws IOException {
 
     @Override
     public void setOOBInline(final boolean on) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setOOBInline(on);
-            }
-        });
+        setSocketOption(() -> inner.setOOBInline(on));
     }
 
     @Override
@@ -182,12 +167,7 @@ public boolean getOOBInline() throws SocketException {
 
     @Override
     public synchronized void setSoTimeout(final int timeout) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setSoTimeout(timeout);
-            }
-        });
+        setSocketOption(() -> inner.setSoTimeout(timeout));
     }
 
     @Override
@@ -197,12 +177,7 @@ public synchronized int getSoTimeout() throws SocketException {
 
     @Override
     public synchronized void setSendBufferSize(final int size) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setSendBufferSize(size);
-            }
-        });
+        setSocketOption(() -> inner.setSendBufferSize(size));
     }
 
     @Override
@@ -212,12 +187,7 @@ public synchronized int getSendBufferSize() throws SocketException {
 
     @Override
     public synchronized void setReceiveBufferSize(final int size) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setReceiveBufferSize(size);
-            }
-        });
+        setSocketOption(() -> inner.setReceiveBufferSize(size));
     }
 
     @Override
@@ -227,12 +197,7 @@ public synchronized int getReceiveBufferSize() throws SocketException {
 
     @Override
     public void setKeepAlive(final boolean on) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setKeepAlive(on);
-            }
-        });
+        setSocketOption(() -> inner.setKeepAlive(on));
     }
 
     @Override
@@ -242,12 +207,7 @@ public boolean getKeepAlive() throws SocketException {
 
     @Override
     public void setTrafficClass(final int tc) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setTrafficClass(tc);
-            }
-        });
+        setSocketOption(() -> inner.setTrafficClass(tc));
     }
 
     @Override
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index c21c305df..6131d48a1 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -41,6 +41,6 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd co
 
         LOGGER.trace("POST: {}", webTarget);
 
-        return new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request(), null);
+        return new POSTCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request(), null);
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 3d4c8dc17..090fca8ac 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -36,7 +36,7 @@ protected AbstractCallbackNotifier<Event> callbackNotifier(EventsCmd command, Re
 
         LOGGER.trace("GET: {}", webTarget);
 
-        return new GETCallbackNotifier<Event>(new JsonStreamProcessor<Event>(Event.class), resultCallback,
+        return new GETCallbackNotifier<>(new JsonStreamProcessor<>(Event.class), resultCallback,
                 webTarget.request());
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
index dc7cf6598..291cc2212 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
@@ -30,7 +30,7 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(ExecStartCmd command,
 
         LOGGER.trace("POST: {}", webTarget);
 
-        return new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request().accept(
+        return new POSTCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request().accept(
                 MediaType.APPLICATION_JSON), entity(command, MediaType.APPLICATION_JSON));
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
index 87bc83b98..19c2b24b0 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -44,6 +44,6 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(LogContainerCmd comma
 
         LOGGER.trace("GET: {}", webTarget);
 
-        return new GETCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request());
+        return new GETCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request());
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
index 4f59893b2..2fb731005 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
@@ -45,6 +45,6 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(LogSwarmObjectCmd com
         webTarget = booleanQueryParam(webTarget, "details", command.getDetails());
         LOGGER.trace("GET: {}", webTarget);
 
-        return new GETCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request());
+        return new GETCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request());
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
index 70e1d0aac..70cde2ee3 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
@@ -40,7 +40,7 @@ protected AbstractCallbackNotifier<PullResponseItem> callbackNotifier(PullImageC
         Builder builder = resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept(
                 MediaType.APPLICATION_OCTET_STREAM_TYPE);
 
-        return new POSTCallbackNotifier<PullResponseItem>(new JsonStreamProcessor<PullResponseItem>(
+        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(
                 PullResponseItem.class), resultCallback, builder, entity(null, MediaType.APPLICATION_JSON));
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
index 906487c6c..d5da2915b 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
@@ -44,7 +44,7 @@ protected AbstractCallbackNotifier<PushResponseItem> callbackNotifier(PushImageC
         Builder builder = resourceWithAuthConfig(command.getAuthConfig(), webResource.request())
                 .accept(MediaType.APPLICATION_JSON);
 
-        return new POSTCallbackNotifier<PushResponseItem>(new JsonStreamProcessor<PushResponseItem>(
+        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(
                 PushResponseItem.class), resultCallback, builder, entity(null, MediaType.APPLICATION_JSON));
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
index 8a604603a..4358e00fe 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
@@ -29,7 +29,7 @@ protected AbstractCallbackNotifier<Statistics> callbackNotifier(StatsCmd command
 
         LOGGER.trace("GET: {}", webTarget);
 
-        return new GETCallbackNotifier<Statistics>(new JsonStreamProcessor<Statistics>(Statistics.class),
+        return new GETCallbackNotifier<>(new JsonStreamProcessor<>(Statistics.class),
                 resultCallback, webTarget.request());
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
index 06bd40edc..2d5b64917 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
@@ -34,9 +34,9 @@ protected AbstractCallbackNotifier<WaitResponse> callbackNotifier(WaitContainerC
 
         LOGGER.trace("POST: {}", webResource);
 
-        return new POSTCallbackNotifier<WaitResponse>(new JsonStreamProcessor<WaitResponse>(WaitResponse.class),
+        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(WaitResponse.class),
                 resultCallback, webResource.request().accept(MediaType.APPLICATION_JSON), entity(null,
-                        MediaType.APPLICATION_JSON));
+                MediaType.APPLICATION_JSON));
     }
 
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
index 8c9848318..9a0297fdb 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
@@ -95,13 +95,7 @@ public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilte
 
     private static final String ENTITY_LOGGER_PROPERTY = LoggingFilter.class.getName() + ".entityLogger";
 
-    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR = new Comparator<Map.Entry<String, List<String>>>() {
-
-        @Override
-        public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<String, List<String>> o2) {
-            return o1.getKey().compareToIgnoreCase(o2.getKey());
-        }
-    };
+    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR = (o1, o2) -> o1.getKey().compareToIgnoreCase(o2.getKey());
 
     private static final int DEFAULT_MAX_ENTITY_SIZE = 8 * 1024;
 
@@ -202,7 +196,7 @@ private void printPrefixedHeaders(final StringBuilder b, final long id, final St
     }
 
     private Set<Map.Entry<String, List<String>>> getSortedHeaders(final Set<Map.Entry<String, List<String>>> headers) {
-        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<Map.Entry<String, List<String>>>(
+        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<>(
                 COMPARATOR);
         sortedHeaders.addAll(headers);
         return sortedHeaders;
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
index 36256fca0..9612011fa 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
@@ -21,7 +21,7 @@ public class SelectiveLoggingFilter extends LoggingFilter {
     // Immutable'ish
     private static final Set<String> SKIPPED_CONTENT;
     static {
-        Set<String> s = new HashSet<String>();
+        Set<String> s = new HashSet<>();
         s.add(MediaType.APPLICATION_OCTET_STREAM);
         s.add("application/tar");
         s.add("application/x-tar");
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index ecb40fa95..ae575380e 100644
--- a/docker-java/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/docker-java/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -15,8 +15,6 @@
 
 import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
 import com.github.dockerjava.core.WebTarget;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
 import org.apache.commons.lang.SystemUtils;
 
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
@@ -151,12 +149,7 @@ public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientC
         public EventLoopGroup epollGroup() {
             EventLoopGroup epollEventLoopGroup = new EpollEventLoopGroup(0, new DefaultThreadFactory(threadPrefix));
 
-            ChannelFactory<EpollDomainSocketChannel> factory = new ChannelFactory<EpollDomainSocketChannel>() {
-                @Override
-                public EpollDomainSocketChannel newChannel() {
-                    return configure(new EpollDomainSocketChannel());
-                }
-            };
+            ChannelFactory<EpollDomainSocketChannel> factory = () -> configure(new EpollDomainSocketChannel());
 
             bootstrap.group(epollEventLoopGroup).channelFactory(factory).handler(new ChannelInitializer<UnixChannel>() {
                 @Override
@@ -204,12 +197,7 @@ public EventLoopGroup init(Bootstrap bootstrap, final DockerClientConfig dockerC
 
             Security.addProvider(new BouncyCastleProvider());
 
-            ChannelFactory<NioSocketChannel> factory = new ChannelFactory<NioSocketChannel>() {
-                @Override
-                public NioSocketChannel newChannel() {
-                    return configure(new NioSocketChannel());
-                }
-            };
+            ChannelFactory<NioSocketChannel> factory = () -> configure(new NioSocketChannel());
 
             bootstrap.group(nioEventLoopGroup).channelFactory(factory)
                     .handler(new ChannelInitializer<SocketChannel>() {
@@ -252,17 +240,7 @@ public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
                 // in sun.security.ssl.SSLEngineImpl and unfortunately it does not send this
                 // message. On the other hand RFC does not enforce the opposite side to wait for
                 // such message.
-                ssl.sslCloseFuture().addListener(new GenericFutureListener<Future<? super Channel>>() {
-                    @Override
-                    public void operationComplete(Future<? super Channel> future) {
-                        channel.eventLoop().execute(new Runnable() {
-                            @Override
-                            public void run() {
-                                channel.close();
-                            }
-                        });
-                    }
-                });
+                ssl.sslCloseFuture().addListener(future -> channel.eventLoop().execute(channel::close));
             }
 
             return channel;
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/docker-java/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
index c57f885be..902dc24cf 100644
--- a/docker-java/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
+++ b/docker-java/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
@@ -34,8 +34,6 @@
 import io.netty.handler.codec.json.JsonObjectDecoder;
 import io.netty.handler.stream.ChunkedStream;
 import io.netty.handler.stream.ChunkedWriteHandler;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -80,7 +78,7 @@ public void onNext(Void object) {
 
     private String resource;
 
-    private Map<String, String> headers = new HashMap<String, String>();
+    private Map<String, String> headers = new HashMap<>();
 
     public NettyInvocationBuilder(ChannelProvider channelProvider, String resource) {
         this.channelProvider = channelProvider;
@@ -101,7 +99,7 @@ public void delete() {
 
         HttpRequestProvider requestProvider = httpDeleteRequestProvider();
 
-        ResponseCallback<Void> callback = new ResponseCallback<Void>();
+        ResponseCallback<Void> callback = new ResponseCallback<>();
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, callback);
 
@@ -132,7 +130,7 @@ public void get(ResultCallback<Frame> resultCallback) {
 
     public <T> T get(TypeReference<T> typeReference) {
 
-        ResponseCallback<T> callback = new ResponseCallback<T>();
+        ResponseCallback<T> callback = new ResponseCallback<>();
 
         get(typeReference, callback);
 
@@ -145,7 +143,7 @@ public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCall
 
         Channel channel = getChannel();
 
-        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
+        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<>(typeReference,
                 resultCallback);
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
@@ -164,39 +162,19 @@ private DuplexChannel getChannel() {
     }
 
     private HttpRequestProvider httpDeleteRequestProvider() {
-        return new HttpRequestProvider() {
-            @Override
-            public HttpRequest getHttpRequest(String uri) {
-                return prepareDeleteRequest(uri);
-            }
-        };
+        return this::prepareDeleteRequest;
     }
 
     private HttpRequestProvider httpGetRequestProvider() {
-        return new HttpRequestProvider() {
-            @Override
-            public HttpRequest getHttpRequest(String uri) {
-                return prepareGetRequest(uri);
-            }
-        };
+        return this::prepareGetRequest;
     }
 
     private HttpRequestProvider httpPostRequestProvider(final Object entity) {
-        return new HttpRequestProvider() {
-            @Override
-            public HttpRequest getHttpRequest(String uri) {
-                return preparePostRequest(uri, entity);
-            }
-        };
+        return uri -> preparePostRequest(uri, entity);
     }
 
     private HttpRequestProvider httpPutRequestProvider(final Object entity) {
-        return new HttpRequestProvider() {
-            @Override
-            public HttpRequest getHttpRequest(String uri) {
-                return preparePutRequest(uri, entity);
-            }
-        };
+        return uri -> preparePutRequest(uri, entity);
     }
 
     public InputStream post(final Object entity) {
@@ -227,12 +205,7 @@ public void post(final Object entity, final InputStream stdin, final ResultCallb
         final DuplexChannel channel = getChannel();
 
         // result callback's close() method must be called when the servers closes the connection
-        channel.closeFuture().addListener(new GenericFutureListener<Future<? super Void>>() {
-            @Override
-            public void operationComplete(Future<? super Void> future) throws Exception {
-                resultCallback.onComplete();
-            }
-        });
+        channel.closeFuture().addListener(future -> resultCallback.onComplete());
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
 
@@ -281,7 +254,7 @@ public void run() {
 
     public <T> T post(final Object entity, TypeReference<T> typeReference) {
 
-        ResponseCallback<T> callback = new ResponseCallback<T>();
+        ResponseCallback<T> callback = new ResponseCallback<>();
 
         post(entity, typeReference, callback);
 
@@ -294,7 +267,7 @@ public <T> void post(final Object entity, TypeReference<T> typeReference, final
 
         Channel channel = getChannel();
 
-        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
+        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<>(typeReference,
                 resultCallback);
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
@@ -370,10 +343,7 @@ private void sendRequest(HttpRequestProvider requestProvider, Channel channel) {
 
         ChannelFuture channelFuture = channel.writeAndFlush(requestProvider.getHttpRequest(resource));
 
-        channelFuture.addListener(new ChannelFutureListener() {
-            @Override
-            public void operationComplete(ChannelFuture future) throws Exception {
-            }
+        channelFuture.addListener((ChannelFutureListener) future -> {
         });
     }
 
@@ -389,7 +359,7 @@ private void setDefaultHeaders(HttpRequest request) {
 
     public <T> T post(TypeReference<T> typeReference, InputStream body) {
 
-        ResponseCallback<T> callback = new ResponseCallback<T>();
+        ResponseCallback<T> callback = new ResponseCallback<>();
 
         post(typeReference, callback, body);
 
@@ -401,7 +371,7 @@ public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCal
 
         Channel channel = getChannel();
 
-        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
+        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<>(typeReference,
                 resultCallback);
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
@@ -478,7 +448,7 @@ public void put(InputStream body, com.github.dockerjava.core.MediaType mediaType
 
         Channel channel = getChannel();
 
-        ResponseCallback<Void> resultCallback = new ResponseCallback<Void>();
+        ResponseCallback<Void> resultCallback = new ResponseCallback<>();
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/docker-java/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
index 51f50f371..7d713849f 100644
--- a/docker-java/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
+++ b/docker-java/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
@@ -9,6 +9,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -158,16 +159,16 @@ public boolean equals(Object o) {
 
         NettyWebTarget webTarget = (NettyWebTarget) o;
 
-        if (channelProvider != null ? !channelProvider.equals(webTarget.channelProvider) : webTarget.channelProvider != null) {
+        if (!Objects.equals(channelProvider, webTarget.channelProvider)) {
             return false;
         }
-        if (path != null ? !path.equals(webTarget.path) : webTarget.path != null) {
+        if (!Objects.equals(path, webTarget.path)) {
             return false;
         }
-        if (queryParams != null ? !queryParams.equals(webTarget.queryParams) : webTarget.queryParams != null) {
+        if (!Objects.equals(queryParams, webTarget.queryParams)) {
             return false;
         }
-        if (queryParamsSet != null ? !queryParamsSet.equals(webTarget.queryParamsSet) : webTarget.queryParamsSet != null) {
+        if (!Objects.equals(queryParamsSet, webTarget.queryParamsSet)) {
             return false;
         }
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java b/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
index 9986e10e9..548742875 100644
--- a/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
+++ b/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
@@ -11,7 +11,6 @@
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.LastHttpContent;
 
-import java.io.Closeable;
 import java.nio.charset.Charset;
 
 import com.github.dockerjava.api.async.ResultCallback;
@@ -52,12 +51,7 @@ protected void channelRead0(final ChannelHandlerContext ctx, HttpObject msg) thr
 
             response = (HttpResponse) msg;
 
-            resultCallback.onStart(new Closeable() {
-                @Override
-                public void close() {
-                    ctx.channel().close();
-                }
-            });
+            resultCallback.onStart(() -> ctx.channel().close());
 
         } else if (msg instanceof HttpContent) {
 
diff --git a/docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java b/docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
index 17c339e3e..e42465418 100644
--- a/docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
+++ b/docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
@@ -317,9 +317,7 @@ public void close() throws IOException {
                         while (read(buff) >= 0) {
                            continue;
                         }
-                    } catch (ConnectionClosedException e) {
-                        // just ignore
-                    } catch (TruncatedChunkException e) {
+                    } catch (ConnectionClosedException | TruncatedChunkException e) {
                         // just ignore
                     }
                 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index d197da5a8..d0e9c914b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -831,7 +831,7 @@ public void createContainerWithULimits() throws DockerException {
     @Test
     public void createContainerWithLabels() throws DockerException {
 
-        Map<String, String> labels = new HashMap<String, String>();
+        Map<String, String> labels = new HashMap<>();
         labels.put("com.github.dockerjava.null", null);
         labels.put("com.github.dockerjava.Boolean", "true");
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
index c40fa6d31..89a186c54 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
@@ -140,7 +140,7 @@ private class EventsTestCallback extends EventsResultCallback {
 
         private final CountDownLatch countDownLatch;
 
-        private final List<Event> events = new ArrayList<Event>();
+        private final List<Event> events = new ArrayList<>();
 
         public EventsTestCallback(int expextedEvents) {
             this.countDownLatch = new CountDownLatch(expextedEvents);
@@ -159,7 +159,7 @@ public List<Event> awaitExpectedEvents(long timeout, TimeUnit unit) {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-            return new ArrayList<Event>(events);
+            return new ArrayList<>(events);
         }
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
index 9e937db52..66fbdfd95 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
@@ -6,7 +6,6 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.UpdateContainerResponse;
 import com.github.dockerjava.core.command.UpdateContainerCmdImpl;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
index 429ec3c06..7fdfeb96e 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
@@ -2,24 +2,9 @@
 
 import com.github.dockerjava.api.command.CreateSecretResponse;
 import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.ContainerSpec;
-import com.github.dockerjava.api.model.EndpointResolutionMode;
-import com.github.dockerjava.api.model.EndpointSpec;
-import com.github.dockerjava.api.model.Mount;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.api.model.NetworkAttachmentConfig;
-import com.github.dockerjava.api.model.PortConfig;
-import com.github.dockerjava.api.model.PortConfigProtocol;
 import com.github.dockerjava.api.model.Secret;
 import com.github.dockerjava.api.model.SecretSpec;
-import com.github.dockerjava.api.model.Service;
-import com.github.dockerjava.api.model.ServiceModeConfig;
-import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
-import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.api.model.SwarmSpec;
-import com.github.dockerjava.api.model.TaskSpec;
-import com.github.dockerjava.api.model.TmpfsOptions;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.RandomStringUtils;
 import org.hamcrest.collection.IsCollectionWithSize;
@@ -27,15 +12,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.nio.charset.Charset;
-import java.util.Collections;
 import java.util.List;
-import java.util.Random;
 
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 
 public class CreateSecretCmdExecIT extends SwarmCmdIT {
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
index 14686f29a..bb779e7f3 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
@@ -11,9 +11,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.nio.charset.Charset;
 import java.util.List;
-import java.util.Random;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index 037a82690..a8fdb89c6 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -52,7 +52,7 @@ public void equals() throws Exception {
     public void environmentDockerHost() throws Exception {
 
         // given docker host in env
-        Map<String, String> env = new HashMap<String, String>();
+        Map<String, String> env = new HashMap<>();
         env.put(DefaultDockerClientConfig.DOCKER_HOST, "tcp://baz:8768");
         // and it looks to be SSL disabled
         env.remove("DOCKER_CERT_PATH");
@@ -72,7 +72,7 @@ public void environmentDockerHost() throws Exception {
     public void environment() throws Exception {
 
         // given a default config in env properties
-        Map<String, String> env = new HashMap<String, String>();
+        Map<String, String> env = new HashMap<>();
         env.put(DefaultDockerClientConfig.DOCKER_HOST, "tcp://foo");
         env.put(DefaultDockerClientConfig.API_VERSION, "apiVersion");
         env.put(DefaultDockerClientConfig.REGISTRY_USERNAME, "registryUsername");
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
index 54a5287cf..be0bfda8a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
@@ -21,18 +21,15 @@ public class DockerClientBuilderTest {
     @Test
     public void testConcurrentClientBuilding() throws Exception {
         // we use it to check instance uniqueness
-        final Set<DockerCmdExecFactory> instances = Collections.synchronizedSet(new HashSet<DockerCmdExecFactory>());
+        final Set<DockerCmdExecFactory> instances = Collections.synchronizedSet(new HashSet<>());
 
-        Runnable runnable = new Runnable() {
-            @Override
-            public void run() {
-                DockerCmdExecFactory factory = DockerClientBuilder.getDefaultDockerCmdExecFactory();
-                // factory created
-                assertNotNull(factory);
-                // and is unique
-                assertFalse(instances.contains(factory));
-                instances.add(factory);
-            }
+        Runnable runnable = () -> {
+            DockerCmdExecFactory factory = DockerClientBuilder.getDefaultDockerCmdExecFactory();
+            // factory created
+            assertNotNull(factory);
+            // and is unique
+            assertFalse(instances.contains(factory));
+            instances.add(factory);
         };
 
         parallel(AMOUNT, runnable);
@@ -42,14 +39,11 @@ public void run() {
 
     public static void parallel(int threads, final Runnable task) throws Exception {
         final ExceptionListener exceptionListener = new ExceptionListener();
-        Runnable runnable = new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    task.run();
-                } catch (Throwable e) {
-                    exceptionListener.onException(e);
-                }
+        Runnable runnable = () -> {
+            try {
+                task.run();
+            } catch (Throwable e) {
+                exceptionListener.onException(e);
             }
         };
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index eaddb0978..f2c6d7630 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.core;
 
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd.Exec;
 import com.github.dockerjava.api.command.BuildImageCmd;
@@ -77,7 +76,6 @@
 import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.api.model.BuildResponseItem;
 
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -92,11 +90,11 @@
  */
 public class TestDockerCmdExecFactory implements DockerCmdExecFactory {
 
-    private List<String> containerNames = new ArrayList<String>();
+    private List<String> containerNames = new ArrayList<>();
 
-    private List<String> imageNames = new ArrayList<String>();
+    private List<String> imageNames = new ArrayList<>();
 
-    private List<String> volumeNames = new ArrayList<String>();
+    private List<String> volumeNames = new ArrayList<>();
 
     private List<String> networkIds = new ArrayList<>();
 
@@ -118,78 +116,60 @@ public void close() throws IOException {
 
     @Override
     public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-        return new CreateContainerCmd.Exec() {
-            @Override
-            public CreateContainerResponse exec(CreateContainerCmd command) {
-                CreateContainerResponse createContainerResponse = delegate.createCreateContainerCmdExec().exec(command);
-                containerNames.add(createContainerResponse.getId());
-                return createContainerResponse;
-            }
+        return command -> {
+            CreateContainerResponse createContainerResponse = delegate.createCreateContainerCmdExec().exec(command);
+            containerNames.add(createContainerResponse.getId());
+            return createContainerResponse;
         };
     }
 
     @Override
     public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-        return new RemoveContainerCmd.Exec() {
-            @Override
-            public Void exec(RemoveContainerCmd command) {
-                delegate.createRemoveContainerCmdExec().exec(command);
-                containerNames.remove(command.getContainerId());
-                return null;
-            }
+        return command -> {
+            delegate.createRemoveContainerCmdExec().exec(command);
+            containerNames.remove(command.getContainerId());
+            return null;
         };
     }
 
     @Override
     public CreateImageCmd.Exec createCreateImageCmdExec() {
-        return new CreateImageCmd.Exec() {
-            @Override
-            public CreateImageResponse exec(CreateImageCmd command) {
-                CreateImageResponse createImageResponse = delegate.createCreateImageCmdExec().exec(command);
-                imageNames.add(createImageResponse.getId());
-                return createImageResponse;
-            }
+        return command -> {
+            CreateImageResponse createImageResponse = delegate.createCreateImageCmdExec().exec(command);
+            imageNames.add(createImageResponse.getId());
+            return createImageResponse;
         };
     }
 
     @Override
     public LoadImageCmd.Exec createLoadImageCmdExec() {
-        return new LoadImageCmd.Exec() {
-            @Override
-            public Void exec(LoadImageCmd command) {
-                delegate.createLoadImageCmdExec().exec(command);
-                return null;
-            }
+        return command -> {
+            delegate.createLoadImageCmdExec().exec(command);
+            return null;
         };
     }
 
     @Override
     public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-        return new RemoveImageCmd.Exec() {
-            @Override
-            public Void exec(RemoveImageCmd command) {
-                delegate.createRemoveImageCmdExec().exec(command);
-                imageNames.remove(command.getImageId());
-                return null;
-            }
+        return command -> {
+            delegate.createRemoveImageCmdExec().exec(command);
+            imageNames.remove(command.getImageId());
+            return null;
         };
     }
 
     @Override
     public BuildImageCmd.Exec createBuildImageCmdExec() {
-        return new BuildImageCmd.Exec() {
-            @Override
-            public Void exec(BuildImageCmd command, ResultCallback<BuildResponseItem> resultCallback) {
-                // can't detect image id here so tagging it
-                String tag = command.getTag();
-                if (tag == null || "".equals(tag.trim())) {
-                    tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE);
-                    command.withTag(tag);
-                }
-                delegate.createBuildImageCmdExec().exec(command, resultCallback);
-                imageNames.add(tag);
-                return null;
+        return (command, resultCallback) -> {
+            // can't detect image id here so tagging it
+            String tag = command.getTag();
+            if (tag == null || "".equals(tag.trim())) {
+                tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE);
+                command.withTag(tag);
             }
+            delegate.createBuildImageCmdExec().exec(command, resultCallback);
+            imageNames.add(tag);
+            return null;
         };
     }
 
@@ -370,13 +350,10 @@ public StatsCmd.Exec createStatsCmdExec() {
 
     @Override
     public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
-        return new CreateVolumeCmd.Exec() {
-            @Override
-            public CreateVolumeResponse exec(CreateVolumeCmd command) {
-                CreateVolumeResponse result = delegate.createCreateVolumeCmdExec().exec(command);
-                volumeNames.add(command.getName());
-                return result;
-            }
+        return command -> {
+            CreateVolumeResponse result = delegate.createCreateVolumeCmdExec().exec(command);
+            volumeNames.add(command.getName());
+            return result;
         };
     }
 
@@ -387,13 +364,10 @@ public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
 
     @Override
     public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
-        return new RemoveVolumeCmd.Exec() {
-            @Override
-            public Void exec(RemoveVolumeCmd command) {
-                delegate.createRemoveVolumeCmdExec().exec(command);
-                volumeNames.remove(command.getName());
-                return null;
-            }
+        return command -> {
+            delegate.createRemoveVolumeCmdExec().exec(command);
+            volumeNames.remove(command.getName());
+            return null;
         };
     }
 
@@ -415,25 +389,19 @@ public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
     @Override
     public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
 
-        return new CreateNetworkCmd.Exec() {
-            @Override
-            public CreateNetworkResponse exec(CreateNetworkCmd command) {
-                CreateNetworkResponse result = delegate.createCreateNetworkCmdExec().exec(command);
-                networkIds.add(result.getId());
-                return result;
-            }
+        return command -> {
+            CreateNetworkResponse result = delegate.createCreateNetworkCmdExec().exec(command);
+            networkIds.add(result.getId());
+            return result;
         };
     }
 
     @Override
     public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
-        return new RemoveNetworkCmd.Exec() {
-            @Override
-            public Void exec(RemoveNetworkCmd command) {
-                delegate.createRemoveNetworkCmdExec().exec(command);
-                networkIds.remove(command.getNetworkId());
-                return null;
-            }
+        return command -> {
+            delegate.createRemoveNetworkCmdExec().exec(command);
+            networkIds.remove(command.getNetworkId());
+            return null;
         };
     }
 
@@ -551,15 +519,15 @@ public RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
     }
 
     public List<String> getContainerNames() {
-        return new ArrayList<String>(containerNames);
+        return new ArrayList<>(containerNames);
     }
 
     public List<String> getImageNames() {
-        return new ArrayList<String>(imageNames);
+        return new ArrayList<>(imageNames);
     }
 
     public List<String> getVolumeNames() {
-        return new ArrayList<String>(volumeNames);
+        return new ArrayList<>(volumeNames);
     }
 
     public List<String> getNetworkIds() {
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
index b436b14ea..72fdb7867 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
@@ -29,9 +29,9 @@ public void processEmptyJson() throws Exception {
 
         InputStream response = new ByteArrayInputStream("{}".getBytes());
 
-        JsonStreamProcessor<PullResponseItem> jsonStreamProcessor = new JsonStreamProcessor<PullResponseItem>(PullResponseItem.class);
+        JsonStreamProcessor<PullResponseItem> jsonStreamProcessor = new JsonStreamProcessor<>(PullResponseItem.class);
 
-        final List<Boolean> completed = new ArrayList<Boolean>();
+        final List<Boolean> completed = new ArrayList<>();
 
         jsonStreamProcessor.processResponseStream(response, new ResultCallback<PullResponseItem>() {
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 011e37f43..096d616ca 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -73,19 +73,16 @@ private List<Frame> getLoggingFrames() throws Exception {
     @Test
     public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception {
 
-        Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Iterator<Frame> frames = getLoggingFrames().iterator();
-
-                    while (frames.hasNext()) {
-                        frames.next();
-                    }
-
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
+        Thread thread = new Thread(() -> {
+            try {
+                Iterator<Frame> frames = getLoggingFrames().iterator();
+
+                while (frames.hasNext()) {
+                    frames.next();
                 }
+
+            } catch (Exception e) {
+                throw new RuntimeException(e);
             }
         });
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java b/docker-java/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
index 1e8810b56..6406647cf 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
@@ -13,12 +13,7 @@
 
 public class DockerfileAddMultipleFilesTest {
 
-    private static final Function<File, String> TO_FILE_NAMES = new Function<File, String>() {
-        @Override
-        public String apply(File file) {
-            return file.getName();
-        }
-    };
+    private static final Function<File, String> TO_FILE_NAMES = File::getName;
 
     @Test
     public void ignoreAllBut() throws Exception {
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java b/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
index e8d88d246..720441e20 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
@@ -269,7 +269,7 @@ private static void assertTarArchiveEntryIsSymlink(File archive, String fileName
      * @throws IOException if an error occurs while creating the folders/files.
      */
     private static List<File> createFoldersAndSubFolderWithFiles(Path destinationFolder) throws IOException {
-        List<File> createdFiles = new ArrayList<File>();
+        List<File> createdFiles = new ArrayList<>();
         Path folderA = destinationFolder.resolve("folderA");
         createdFiles.add(Files.createDirectories(folderA).toFile());
         createdFiles.add(createFileWithContent(folderA.resolve("fileA")));
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java
index 4d4fe2105..bc71b7dfd 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java
@@ -31,7 +31,7 @@ public MountedVolumes(Matcher<? super List<Volume>> subMatcher, String featureDe
 
         @Override
         public List<Volume> featureValueOf(InspectContainerResponse item) {
-            List<Volume> volumes = new ArrayList<Volume>();
+            List<Volume> volumes = new ArrayList<>();
             for (InspectContainerResponse.Mount mount : item.getMounts()) {
                 volumes.add(mount.getDestination());
             }
diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
index 7724b666a..98161b072 100644
--- a/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
@@ -18,8 +18,8 @@ public class FramedResponseStreamHandlerTest {
 
   public class MockedResponseHandler implements ResultCallback<Frame> {
 
-    public List<Frame> frames = new ArrayList<Frame>();
-    public List<Throwable> exceptions = new ArrayList<Throwable>();
+    public List<Frame> frames = new ArrayList<>();
+    public List<Throwable> exceptions = new ArrayList<>();
 
     @Override
     public void close() {
diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
index b80579b39..57913313f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
@@ -82,16 +82,13 @@ public void testCloseResponseStreamOnWrite() throws Exception {
         final CountDownLatch firstWrite = new CountDownLatch(1);
 
         ExecutorService executor = Executors.newSingleThreadExecutor();
-        Future<?> submit = executor.submit(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    inputStream.write(buffer);
-                    firstWrite.countDown();
-                    inputStream.write(buffer);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
+        Future<?> submit = executor.submit(() -> {
+            try {
+                inputStream.write(buffer);
+                firstWrite.countDown();
+                inputStream.write(buffer);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
             }
         });
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java b/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
index a2c9fd36c..cbb5a2f17 100644
--- a/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
+++ b/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
@@ -12,7 +12,7 @@
 public class LogContainerTestCallback extends LogContainerResultCallback {
     protected final StringBuffer log = new StringBuffer();
 
-    List<Frame> collectedFrames = new ArrayList<Frame>();
+    List<Frame> collectedFrames = new ArrayList<>();
 
     boolean collectFrames = false;