Repository: docker-java/docker-java
Pull request #445 (2016-01-31 13:36:35)

Checkstyle second portion
Syncing the most used configuration from projects that i know.
Checks that raised >30 issues are commented and for discussion with @marcuslinke 

KostyaSha: @marcuslinke ping
marcuslinke: In general it raises one question: If all these rules are enforced before the project can be build successfully is there any IDE support for auto-formatting sources then?
KostyaSha: checkstyle has all rules matched eclipse and idea. But i not sure what rules are default. I.e. i tuned IDEA rules to not do hash imports... This rules should mostly match eclips+idea (note we need define imports and uncomment marked checks in xml). Later i want add sonar-github checks so PR will automatically have commented lines.
KostyaSha: Yes, IDEA has autoformat. Let's describe how i usually do lazy development.
I disable analyses profile, then pushing to pr. PR gets verification and all violated places become commented. Then i remember that i need verify it locally or picking comments from PR :) Doesn't take so much time usually.

Patch:
diff --git a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
index 221d3d16..3218a841 100644
--- a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
@@ -13,6 +13,6 @@ import com.github.dockerjava.api.async.ResultCallback;
  */
 public interface AsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> extends DockerCmd<Void> {
 
-    public <T extends ResultCallback<A_RES_T>> T exec(T resultCallback);
+    <T extends ResultCallback<A_RES_T>> T exec(T resultCallback);
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
index 6326fa13..84f063d7 100644
--- a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -26,46 +26,46 @@ import com.github.dockerjava.api.model.Frame;
 public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, Frame> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
     @CheckForNull
-    public Boolean hasLogsEnabled();
+    Boolean hasLogsEnabled();
 
     @CheckForNull
-    public Boolean hasFollowStreamEnabled();
+    Boolean hasFollowStreamEnabled();
 
     @CheckForNull
-    public Boolean hasTimestampsEnabled();
+    Boolean hasTimestampsEnabled();
 
     @CheckForNull
-    public Boolean hasStdoutEnabled();
+    Boolean hasStdoutEnabled();
 
     @CheckForNull
-    public Boolean hasStderrEnabled();
+    Boolean hasStderrEnabled();
 
     @CheckForNull
-    public InputStream getStdin();
+    InputStream getStdin();
 
-    public AttachContainerCmd withContainerId(@Nonnull String containerId);
+    AttachContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * Following the stream means the resulting {@link InputStream} returned by {@link #exec()} reads infinitely. So a
      * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to
      * {@link DockerClient}!
      */
-    public AttachContainerCmd withFollowStream(Boolean followStream);
+    AttachContainerCmd withFollowStream(Boolean followStream);
 
-    public AttachContainerCmd withTimestamps(Boolean timestamps);
+    AttachContainerCmd withTimestamps(Boolean timestamps);
 
-    public AttachContainerCmd withStdOut(Boolean stdout);
+    AttachContainerCmd withStdOut(Boolean stdout);
 
-    public AttachContainerCmd withStdErr(Boolean stderr);
+    AttachContainerCmd withStdErr(Boolean stderr);
 
-    public AttachContainerCmd withStdIn(InputStream stdin);
+    AttachContainerCmd withStdIn(InputStream stdin);
 
-    public AttachContainerCmd withLogs(Boolean logs);
+    AttachContainerCmd withLogs(Boolean logs);
 
-    public static interface Exec extends DockerCmdAsyncExec<AttachContainerCmd, Frame> {
+    interface Exec extends DockerCmdAsyncExec<AttachContainerCmd, Frame> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
index 8402ee53..75e5801f 100644
--- a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
@@ -21,7 +21,8 @@ public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
 
     /**
      * @return The status. Based on it's value you may mean you need to authorise your account, e.g.:
-     *         "Account created. Please see the documentation of the registry http://localhost:5000/v1/ for instructions how to activate it."
+     *         "Account created. Please see the documentation of the registry http://localhost:5000/v1/
+     *         for instructions how to activate it."
      * @throws UnauthorizedException
      *             If you're not authorised (e.g. bad password).
      */
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
index 08751f3e..9c13912f 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
@@ -15,9 +15,9 @@ public class ExecCreateCmdResponse {
     public String getId() {
         return id;
     }
-    
+
     @Override
     public String toString() {
-    	return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 0e994daf..0bd6cac8 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -79,6 +79,7 @@ public class AuthConfig {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -127,4 +128,5 @@ public class AuthConfig {
             return false;
         return true;
     }
+    //CHECKSTYLE:ON
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Bind.java b/src/main/java/com/github/dockerjava/api/model/Bind.java
index f7f6954f..aa486392 100644
--- a/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -72,8 +72,9 @@ public class Bind {
             Bind other = (Bind) obj;
             return new EqualsBuilder().append(path, other.getPath()).append(volume, other.getVolume())
                     .append(accessMode, other.getAccessMode()).isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/Capability.java b/src/main/java/com/github/dockerjava/api/model/Capability.java
index b1782755..4757937e 100644
--- a/src/main/java/com/github/dockerjava/api/model/Capability.java
+++ b/src/main/java/com/github/dockerjava/api/model/Capability.java
@@ -3,7 +3,7 @@ package com.github.dockerjava.api.model;
 /**
  * The Linux capabilities supported by Docker. The list of capabilities is defined in Docker's types.go, {@link #ALL}
  * was added manually.
- * 
+ *
  * @see <a
  *      href="http://man7.org/linux/man-pages/man7/capabilities.7.html">http://man7.org/linux/man-pages/man7/capabilities.7.html</a>
  */
diff --git a/src/main/java/com/github/dockerjava/api/model/Device.java b/src/main/java/com/github/dockerjava/api/model/Device.java
index 21aef589..9240239b 100644
--- a/src/main/java/com/github/dockerjava/api/model/Device.java
+++ b/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -52,8 +52,9 @@ public class Device {
             return new EqualsBuilder().append(cGroupPermissions, other.getcGroupPermissions())
                     .append(pathInContainer, other.getPathInContainer()).append(pathOnHost, other.getPathOnHost())
                     .isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
index 4dbdbe19..43ee9229 100644
--- a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
+++ b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
@@ -151,8 +151,9 @@ public class ExposedPort {
         if (obj instanceof ExposedPort) {
             ExposedPort other = (ExposedPort) obj;
             return new EqualsBuilder().append(protocol, other.getProtocol()).append(port, other.getPort()).isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/Frame.java b/src/main/java/com/github/dockerjava/api/model/Frame.java
index 1be92f9b..e398ec25 100644
--- a/src/main/java/com/github/dockerjava/api/model/Frame.java
+++ b/src/main/java/com/github/dockerjava/api/model/Frame.java
@@ -28,6 +28,7 @@ public class Frame {
         return String.format("%s: %s", streamType, new String(payload).trim());
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -47,4 +48,5 @@ public class Frame {
         result = 31 * result + Arrays.hashCode(payload);
         return result;
     }
+    //CHECKSTYLE:ON
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Identifier.java b/src/main/java/com/github/dockerjava/api/model/Identifier.java
index 96daab11..ed5100e2 100644
--- a/src/main/java/com/github/dockerjava/api/model/Identifier.java
+++ b/src/main/java/com/github/dockerjava/api/model/Identifier.java
@@ -14,10 +14,11 @@ public class Identifier {
     public Identifier(Repository repository, String tag) {
         this.repository = repository;
 
-        if (tag == null)
+        if (tag == null) {
             this.tag = Optional.absent();
-        else
+        } else {
             this.tag = Optional.of(tag);
+        }
     }
 
     /**
@@ -33,15 +34,17 @@ public class Identifier {
         String[] parts = identifier.split("/");
         if (parts.length != 2) {
             String[] rhs = identifier.split(":");
-            if (rhs.length != 2)
+            if (rhs.length != 2) {
                 return new Identifier(new Repository(identifier), null);
-            else
+            } else {
                 return new Identifier(new Repository(rhs[0]), rhs[1]);
+            }
         }
 
         String[] rhs = parts[1].split(":");
-        if (rhs.length != 2)
+        if (rhs.length != 2) {
             return new Identifier(new Repository(identifier), null);
+        }
 
         return new Identifier(new Repository(parts[0] + "/" + rhs[0]), rhs[1]);
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/Info.java b/src/main/java/com/github/dockerjava/api/model/Info.java
index d038df87..0e4816cc 100644
--- a/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -25,7 +25,7 @@ public class Info {
     private Boolean debug;
 
     @JsonProperty("DockerRootDir")
-    private String DockerRootDir;
+    private String dockerRootDir;
 
     @JsonProperty("Driver")
     private String driver;
@@ -37,16 +37,16 @@ public class Info {
     private String executionDriver;
 
     @JsonProperty("ID")
-    private String ID;
+    private String id;
 
     @JsonProperty("IPv4Forwarding")
-    private Boolean IPv4Forwarding;
+    private Boolean ipv4Forwarding;
 
     @JsonProperty("Images")
     private Integer images;
 
     @JsonProperty("IndexServerAddress")
-    private String IndexServerAddress;
+    private String indexServerAddress;
 
     @JsonProperty("InitPath")
     private String initPath;
@@ -58,7 +58,7 @@ public class Info {
     private String kernelVersion;
 
     @JsonProperty("Labels")
-    private String[] Labels;
+    private String[] labels;
 
     @JsonProperty("MemoryLimit")
     private Boolean memoryLimit;
@@ -70,19 +70,19 @@ public class Info {
     private String name;
 
     @JsonProperty("NCPU")
-    private Integer NCPU;
+    private Integer ncpu;
 
     @JsonProperty("NEventsListener")
     private Long nEventListener;
 
     @JsonProperty("NFd")
-    private Integer NFd;
+    private Integer nfd;
 
     @JsonProperty("NGoroutines")
-    private Integer NGoroutines;
+    private Integer nGoroutines;
 
     @JsonProperty("OperatingSystem")
-    private String OperatingSystem;
+    private String operatingSystem;
 
     @JsonProperty("Sockets")
     private String[] sockets;
@@ -99,7 +99,7 @@ public class Info {
     }
 
     public String getDockerRootDir() {
-        return DockerRootDir;
+        return dockerRootDir;
     }
 
     public String getDriver() {
@@ -115,15 +115,15 @@ public class Info {
     }
 
     public String getID() {
-        return ID;
+        return id;
     }
 
     public Boolean getIPv4Forwarding() {
-        return IPv4Forwarding;
+        return ipv4Forwarding;
     }
 
     public String getIndexServerAddress() {
-        return IndexServerAddress;
+        return indexServerAddress;
     }
 
     public String getInitPath() {
@@ -139,7 +139,7 @@ public class Info {
     }
 
     public String[] getLabels() {
-        return Labels;
+        return labels;
     }
 
     public String[] getSockets() {
@@ -163,19 +163,19 @@ public class Info {
     }
 
     public Integer getNCPU() {
-        return NCPU;
+        return ncpu;
     }
 
     public Integer getNFd() {
-        return NFd;
+        return nfd;
     }
 
     public Integer getNGoroutines() {
-        return NGoroutines;
+        return nGoroutines;
     }
 
     public String getOperatingSystem() {
-        return OperatingSystem;
+        return operatingSystem;
     }
 
     public Boolean getSwapLimit() {
diff --git a/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java b/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
index 65df8cf6..e3ef2b98 100644
--- a/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
+++ b/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
@@ -2,15 +2,19 @@ package com.github.dockerjava.api.model;
 
 /**
  * The IP protocols supported by Docker.
- * 
+ *
  * @see #TCP
  * @see #UDP
  */
 public enum InternetProtocol {
-    /** The <i>Transmission Control Protocol</i> */
+    /**
+     * The <i>Transmission Control Protocol</i>
+     */
     TCP,
 
-    /** The <i>User Datagram Protocol</i> */
+    /**
+     * The <i>User Datagram Protocol</i>
+     */
     UDP;
 
     /**
@@ -21,7 +25,7 @@ public enum InternetProtocol {
     /**
      * Returns a string representation of this {@link InternetProtocol} suitable for inclusion in a JSON message. The
      * output is the lowercased name of the Protocol, e.g. <code>tcp</code>.
-     * 
+     *
      * @return a string representation of this {@link InternetProtocol}
      */
     @Override
@@ -31,7 +35,7 @@ public enum InternetProtocol {
 
     /**
      * Parses a string to an {@link InternetProtocol}.
-     * 
+     *
      * @param serialized
      *            the protocol, e.g. <code>tcp</code> or <code>TCP</code>
      * @return an {@link InternetProtocol} described by the string
diff --git a/src/main/java/com/github/dockerjava/api/model/Link.java b/src/main/java/com/github/dockerjava/api/model/Link.java
index 43f9de65..f647438a 100644
--- a/src/main/java/com/github/dockerjava/api/model/Link.java
+++ b/src/main/java/com/github/dockerjava/api/model/Link.java
@@ -74,8 +74,9 @@ public class Link {
         if (obj instanceof Link) {
             final Link other = (Link) obj;
             return new EqualsBuilder().append(name, other.getName()).append(alias, other.getAlias()).isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index 37bb17a8..669bbc55 100644
--- a/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -98,8 +98,9 @@ public class LogConfig {
                 JsonNode node = oc.readTree(jsonParser);
 
                 for (LoggingType loggingType : values()) {
-                    if (loggingType.getType().equals(node.asText()))
+                    if (loggingType.getType().equals(node.asText())) {
                         return loggingType;
+                    }
                 }
 
                 throw new IllegalArgumentException("No enum constant " + LoggingType.class + "." + node.asText());
diff --git a/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
index 99e04f1b..81f94ca0 100644
--- a/src/main/java/com/github/dockerjava/api/model/PortBinding.java
+++ b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
@@ -64,8 +64,9 @@ public class PortBinding {
             PortBinding other = (PortBinding) obj;
             return new EqualsBuilder().append(binding, other.getBinding()).append(exposedPort, other.getExposedPort())
                     .isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index 0ff5762e..6bbb05fa 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -33,6 +33,7 @@ import com.fasterxml.jackson.databind.node.NullNode;
  * @see HostConfig#getPortBindings()
  * @see NetworkSettings#getPorts()
  */
+@SuppressWarnings(value = "checkstyle:equalshashcode") //FIXME?
 @JsonDeserialize(using = Ports.Deserializer.class)
 @JsonSerialize(using = Ports.Serializer.class)
 public class Ports {
@@ -70,7 +71,7 @@ public class Ports {
             if (binding == null) {
                 ports.put(exposedPort, null);
             } else {
-                ports.put(exposedPort, new Binding[] { binding });
+                ports.put(exposedPort, new Binding[]{binding});
             }
         }
     }
@@ -112,14 +113,14 @@ public class Ports {
     /**
      * Creates a {@link Binding} for the given IP address and port number.
      */
-    public static Binding Binding(String hostIp, Integer hostPort) {
+    public static Binding binding(String hostIp, Integer hostPort) {
         return new Binding(hostIp, hostPort);
     }
 
     /**
      * Creates a {@link Binding} for the given port number, leaving the IP address undefined.
      */
-    public static Binding Binding(Integer hostPort) {
+    public static Binding binding(Integer hostPort) {
         return new Binding(hostPort);
     }
 
@@ -249,8 +250,9 @@ public class Ports {
                 Binding other = (Binding) obj;
                 return new EqualsBuilder().append(hostIp, other.getHostIp()).append(hostPort, other.getHostPort())
                         .isEquals();
-            } else
+            } else {
                 return super.equals(obj);
+            }
         }
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Repository.java b/src/main/java/com/github/dockerjava/api/model/Repository.java
index 1c5b641b..1e814a1b 100644
--- a/src/main/java/com/github/dockerjava/api/model/Repository.java
+++ b/src/main/java/com/github/dockerjava/api/model/Repository.java
@@ -13,7 +13,7 @@ public class Repository {
 
     /**
      * Name may be eg. 'busybox' or '10.0.0.1:5000/fred'
-     * 
+     *
      * @param name
      *            Repository name
      */
@@ -23,7 +23,7 @@ public class Repository {
 
     /**
      * Return the URL portion (repository). Note that this might not actually BE a repository location.
-     * 
+     *
      * @return
      * @throws java.net.MalformedURLException
      */
@@ -37,8 +37,9 @@ public class Repository {
     }
 
     public String getPath() {
-        if (!name.contains("/"))
+        if (!name.contains("/")) {
             return name;
+        }
 
         return name.substring(name.indexOf("/") + 1);
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
index 34f8e7e5..d5c8f6e8 100644
--- a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
+++ b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -89,10 +89,14 @@ public class RestartPolicy {
         try {
             String[] parts = serialized.split(":");
             String name = parts[0];
-            if ("no".equals(name))
+            if ("no".equals(name)) {
                 return noRestart();
-            if ("always".equals(name))
+            }
+
+            if ("always".equals(name)) {
                 return alwaysRestart();
+            }
+
             if ("on-failure".equals(name)) {
                 int count = 0;
                 if (parts.length == 2) {
@@ -124,8 +128,9 @@ public class RestartPolicy {
             RestartPolicy other = (RestartPolicy) obj;
             return new EqualsBuilder().append(maximumRetryCount, other.getMaximumRetryCount())
                     .append(name, other.getName()).isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
index 209eb22f..51602e04 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ulimit.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -45,6 +45,7 @@ public class Ulimit {
         return hard;
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof Ulimit) {
@@ -60,4 +61,5 @@ public class Ulimit {
     public int hashCode() {
         return new HashCodeBuilder().append(name).append(soft).append(hard).toHashCode();
     }
+    //CHECKSTYLE:ON
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Volume.java b/src/main/java/com/github/dockerjava/api/model/Volume.java
index 93f7e4e4..655a8dbf 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volume.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volume.java
@@ -30,8 +30,9 @@ public class Volume {
         if (obj instanceof Volume) {
             Volume other = (Volume) obj;
             return new EqualsBuilder().append(path, other.getPath()).isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
index bdb347be..3709d1b0 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
@@ -69,8 +69,9 @@ public class VolumeRW {
             VolumeRW other = (VolumeRW) obj;
             return new EqualsBuilder().append(getVolume(), other.getVolume()).append(accessMode, other.getAccessMode())
                     .isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
index 01f80aba..78585ef4 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
@@ -77,8 +77,9 @@ public class VolumesFrom {
             VolumesFrom other = (VolumesFrom) obj;
             return new EqualsBuilder().append(container, other.getContainer())
                     .append(accessMode, other.getAccessMode()).isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
index 78fd453a..7315a05a 100644
--- a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
@@ -63,6 +63,7 @@ public class AuthConfigFile {
         return authConfigurations;
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -87,6 +88,7 @@ public class AuthConfigFile {
             return false;
         return true;
     }
+    //CHECKSTYLE:ON
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index fa5c77e6..35f54c73 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -178,7 +178,7 @@ public class DockerClientConfig implements Serializable {
         Properties overriddenProperties = new Properties();
         overriddenProperties.putAll(p);
 
-        for (String key : new String[] { DOCKER_IO_URL_PROPERTY, DOCKER_IO_VERSION_PROPERTY,
+        for (String key : new String[]{DOCKER_IO_URL_PROPERTY, DOCKER_IO_VERSION_PROPERTY,
                 DOCKER_IO_USERNAME_PROPERTY, DOCKER_IO_PASSWORD_PROPERTY, DOCKER_IO_EMAIL_PROPERTY,
                 DOCKER_IO_SERVER_ADDRESS_PROPERTY, DOCKER_IO_DOCKER_CERT_PATH_PROPERTY,
                 DOCKER_IO_DOCKER_CFG_PATH_PROPERTY, }) {
@@ -270,10 +270,11 @@ public class DockerClientConfig implements Serializable {
             authConfig = authConfigFile.resolveAuthConfig(hostnameReposName.hostname);
         }
 
-        AuthConfig _authConfig = getAuthConfig();
+        AuthConfig otherAuthConfig = getAuthConfig();
 
-        if (_authConfig != null)
-            authConfig = _authConfig;
+        if (otherAuthConfig != null) {
+            authConfig = otherAuthConfig;
+        }
 
         return authConfig;
     }
@@ -294,6 +295,7 @@ public class DockerClientConfig implements Serializable {
         return new AuthConfigurations();
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -335,6 +337,7 @@ public class DockerClientConfig implements Serializable {
         result = 31 * result + (sslConfig != null ? sslConfig.hashCode() : 0);
         return result;
     }
+    //CHECKSTYLE:ON
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index ede13561..ca842b38 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -214,20 +214,23 @@ public class DockerClientImpl implements Closeable, DockerClient {
         PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory().createPushImageCmdExec(), name);
 
         AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(name);
-        if (cfg != null)
+        if (cfg != null) {
             cmd.withAuthConfig(cfg);
+        }
         return cmd;
     }
 
     @Override
     public PushImageCmd pushImageCmd(Identifier identifier) {
         PushImageCmd cmd = pushImageCmd(identifier.repository.name);
-        if (identifier.tag.isPresent())
+        if (identifier.tag.isPresent()) {
             cmd.withTag(identifier.tag.get());
+        }
 
         AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(identifier.repository.name);
-        if (cfg != null)
+        if (cfg != null) {
             cmd.withAuthConfig(cfg);
+        }
 
         return cmd;
     }
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index ef798d68..7bed65c5 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -26,16 +26,16 @@ import com.github.dockerjava.core.exception.GoLangFileMatchException;
  *                  character class (must be non-empty)
  *       c           matches character c (c != '*', '?', '\\', '[')
  *       '\\' c      matches character c
- * 
+ *
  *   character-range:
  *       c           matches character c (c != '\\', '-', ']')
  *       '\\' c      matches character c
  *       lo '-' hi   matches character c for lo <= c <= hi
- * 
+ *
  *  Match requires pattern to match all of name, not just a substring.
  *  The only possible returned error is ErrBadPattern, when pattern
  *  is malformed.
- * 
+ *
  * On Windows, escaping is disabled. Instead, '\\' is treated as
  *  path separator.
  * </pre>
@@ -44,6 +44,8 @@ import com.github.dockerjava.core.exception.GoLangFileMatchException;
  *
  */
 public class GoLangFileMatch {
+    private GoLangFileMatch() {
+    }
 
     public static final boolean IS_WINDOWS = File.separatorChar == '\\';
 
diff --git a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
index dc9defbf..bdc2e6e8 100644
--- a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -65,7 +65,7 @@ public class KeystoreSSLConfig implements SSLConfig, Serializable {
 
     /**
      * Get the SSL Context out of the keystore.
-     * 
+     *
      * @return java SSLContext
      * @throws KeyManagementException
      * @throws UnrecoverableKeyException
@@ -81,13 +81,14 @@ public class KeystoreSSLConfig implements SSLConfig, Serializable {
         String httpProtocols = System.getProperty("https.protocols");
         System.setProperty("https.protocols", "TLSv1");
 
-        if (httpProtocols != null)
+        if (httpProtocols != null) {
             System.setProperty("https.protocols", httpProtocols);
+        }
 
         final KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory
                 .getDefaultAlgorithm());
         keyManagerFactory.init(keystore, keystorePassword.toCharArray());
-        context.init(keyManagerFactory.getKeyManagers(), new TrustManager[] { new X509TrustManager() {
+        context.init(keyManagerFactory.getKeyManagers(), new TrustManager[]{new X509TrustManager() {
             @Override
             public X509Certificate[] getAcceptedIssuers() {
                 return new X509Certificate[] {};
diff --git a/src/main/java/com/github/dockerjava/core/NameParser.java b/src/main/java/com/github/dockerjava/core/NameParser.java
index ba2948fb..5027422f 100644
--- a/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -12,14 +12,19 @@ import org.apache.commons.lang.builder.ToStringStyle;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.core.exception.InvalidRepositoryNameException;
 
+@SuppressWarnings(value = "checkstyle:equalshashcode")
 public class NameParser {
+    private NameParser() {
+    }
 
+    //CHECKSTYLE:OFF
     private static final int RepositoryNameTotalLengthMax = 255;
 
     private static final Pattern RepositoryNameComponentRegexp = Pattern.compile("[a-z0-9]+(?:[._-][a-z0-9]+)*");
 
     private static final Pattern RepositoryNameComponentAnchoredRegexp = Pattern.compile("^"
             + RepositoryNameComponentRegexp.pattern() + "$");
+    //CHECKSTYLE:ON
 
     // private static final Pattern RepositoryNameRegexp = Pattern.compile("(?:" +
     // RepositoryNameComponentRegexp.pattern()
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 63269ce5..80f9406b 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -127,6 +127,7 @@ public class RemoteApiVersion implements Serializable {
         return false;
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public boolean equals(final Object o) {
         if (this == o)
@@ -136,6 +137,7 @@ public class RemoteApiVersion implements Serializable {
         final RemoteApiVersion that = (RemoteApiVersion) o;
         return Objects.equal(major, that.major) && Objects.equal(minor, that.minor);
     }
+    //CHECKSTYLE:ON
 
     @Override
     public int hashCode() {
diff --git a/src/main/java/com/github/dockerjava/core/SSLConfig.java b/src/main/java/com/github/dockerjava/core/SSLConfig.java
index 6c7e5c35..0346aa61 100644
--- a/src/main/java/com/github/dockerjava/core/SSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/SSLConfig.java
@@ -14,7 +14,7 @@ public interface SSLConfig {
 
     /**
      * Get the SSL Context, from wherever it comes (file, keystore).
-     * 
+     *
      * @return an SSL context.
      */
     SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException,
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 5e63f2b5..0e146c1e 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -25,7 +25,7 @@ import com.google.common.base.Throwables;
 public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T>, A_RES_T> implements
         ResultCallback<A_RES_T> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(ResultCallbackTemplate.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ResultCallbackTemplate.class);
 
     private final CountDownLatch started = new CountDownLatch(1);
 
@@ -47,11 +47,11 @@ public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T
     @Override
     public void onError(Throwable throwable) {
 
-        if (closed)
-            return;
+        if (closed) return;
 
-        if (this.firstError == null)
+        if (this.firstError == null) {
             this.firstError = throwable;
+        }
 
         try {
             LOGGER.error("Error during callback", throwable);
@@ -76,8 +76,9 @@ public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T
     @Override
     public void close() throws IOException {
         closed = true;
-        if (stream != null)
+        if (stream != null) {
             stream.close();
+        }
         completed.countDown();
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index 0c787750..9e1e775c 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -19,7 +19,7 @@ import com.github.dockerjava.api.model.AuthConfig;
 
 public abstract class AbstrDockerCmd<CMD_T extends DockerCmd<RES_T>, RES_T> implements SyncDockerCmd<RES_T> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(AbstrDockerCmd.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstrDockerCmd.class);
 
     protected DockerCmdSyncExec<CMD_T, RES_T> execution;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
index f16b2030..bddddfd4 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
@@ -16,7 +16,7 @@ import com.github.dockerjava.core.async.ResultCallbackTemplate;
  */
 public class AttachContainerResultCallback extends ResultCallbackTemplate<AttachContainerResultCallback, Frame> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(AttachContainerResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerResultCallback.class);
 
     @Override
     public void onNext(Frame item) {
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index acf4fa10..ef57e84a 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -248,13 +248,16 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
     @Override
     public BuildImageCmdImpl withDockerfile(File dockerfile) {
         checkNotNull(dockerfile);
-        if (!dockerfile.exists())
+        if (!dockerfile.exists()) {
             throw new IllegalArgumentException("Dockerfile does not exist");
-        if (!dockerfile.isFile())
+        }
+        if (!dockerfile.isFile()) {
             throw new IllegalArgumentException("Not a directory");
+        }
 
-        if (baseDirectory == null)
+        if (baseDirectory == null) {
             withBaseDirectory(dockerfile.getParentFile());
+        }
 
         this.dockerFile = dockerfile;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
index 06c6b1e5..1ca27643 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
@@ -21,7 +21,7 @@ import com.github.dockerjava.core.async.ResultCallbackTemplate;
  */
 public class BuildImageResultCallback extends ResultCallbackTemplate<BuildImageResultCallback, BuildResponseItem> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(BuildImageResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageResultCallback.class);
 
     @CheckForNull
     private BuildResponseItem latestItem = null;
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java b/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
index c731b863..cd6205f6 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
@@ -16,7 +16,7 @@ import com.github.dockerjava.core.async.ResultCallbackTemplate;
  */
 public class EventsResultCallback extends ResultCallbackTemplate<EventsResultCallback, Event> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(EventsResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(EventsResultCallback.class);
 
     @Override
     public void onNext(Event item) {
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
index 5f73b65e..62e492db 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
@@ -16,7 +16,7 @@ import com.github.dockerjava.core.async.ResultCallbackTemplate;
  */
 public class ExecStartResultCallback extends ResultCallbackTemplate<ExecStartResultCallback, Frame> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(ExecStartResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartResultCallback.class);
 
     private OutputStream stdout, stderr;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
index d726ca7c..1033b43e 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
@@ -17,9 +17,9 @@ import com.github.dockerjava.core.util.FiltersBuilder;
  */
 public class ListImagesCmdImpl extends AbstrDockerCmd<ListImagesCmd, List<Image>> implements ListImagesCmd {
 
-	private String imageNameFilter;
+    private String imageNameFilter;
 
-	private Boolean showAll = false;
+    private Boolean showAll = false;
 
     private FiltersBuilder filters = new FiltersBuilder();
 
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
index b7fc81cb..677e5fb6 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
@@ -16,7 +16,7 @@ import com.github.dockerjava.core.async.ResultCallbackTemplate;
  */
 public class LogContainerResultCallback extends ResultCallbackTemplate<LogContainerResultCallback, Frame> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(LogContainerResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerResultCallback.class);
 
     @Override
     public void onNext(Frame item) {
diff --git a/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
index c9118a09..39c9666d 100644
--- a/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
@@ -4,7 +4,6 @@ import com.github.dockerjava.api.command.PingCmd;
 
 /**
  * Ping the Docker server
- * 
  */
 public class PingCmdImpl extends AbstrDockerCmd<PingCmd, Void> implements PingCmd {
 
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
index 27be1221..ce274dbe 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -19,7 +19,7 @@ import com.github.dockerjava.core.async.ResultCallbackTemplate;
  */
 public class PullImageResultCallback extends ResultCallbackTemplate<PullImageResultCallback, PullResponseItem> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class);
 
     @CheckForNull
     private PullResponseItem latestItem = null;
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
index 65ec93c8..55dfb565 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
@@ -19,7 +19,7 @@ import com.github.dockerjava.core.async.ResultCallbackTemplate;
  */
 public class PushImageResultCallback extends ResultCallbackTemplate<PushImageResultCallback, PushResponseItem> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(PushImageResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushImageResultCallback.class);
 
     @CheckForNull
     private PushResponseItem latestItem = null;
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
index 5416d124..feb7916e 100644
--- a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
@@ -21,7 +21,7 @@ import com.github.dockerjava.core.async.ResultCallbackTemplate;
  */
 public class WaitContainerResultCallback extends ResultCallbackTemplate<WaitContainerResultCallback, WaitResponse> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(WaitContainerResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerResultCallback.class);
 
     @CheckForNull
     private WaitResponse waitResponse = null;
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 077aff4b..9a94d6b1 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -147,7 +147,7 @@ public class Dockerfile {
                     }
 
                     @Override
-                    public int read(byte [] buff, int offset, int len) throws IOException {
+                    public int read(byte[] buff, int offset, int len) throws IOException {
                         return tarInputStream.read(buff, offset, len);
                     }
 
@@ -221,21 +221,24 @@ public class Dockerfile {
 
             List<String> matchingPattern = matchingIgnorePatterns(relativeFilename);
 
-            if (matchingPattern.isEmpty())
+            if (matchingPattern.isEmpty()) {
                 return null;
+            }
 
             String lastMatchingPattern = matchingPattern.get(matchingPattern.size() - 1);
 
             int lastMatchingPatternIndex = ignores.lastIndexOf(lastMatchingPattern);
 
-            if (lastMatchingPatternIndex == ignores.size() - 1)
+            if (lastMatchingPatternIndex == ignores.size() - 1) {
                 return lastMatchingPattern;
+            }
 
             List<String> remainingIgnorePattern = ignores.subList(lastMatchingPatternIndex + 1, ignores.size());
 
             for (String ignorePattern : remainingIgnorePattern) {
-                if (ignorePattern.equals("!" + relativeFilename))
+                if (ignorePattern.equals("!" + relativeFilename)) {
                     return null;
+                }
             }
 
             return lastMatchingPattern;
diff --git a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
index 19f14259..65e6544f 100644
--- a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
@@ -31,7 +31,7 @@ public class CertificateUtils {
     }
 
     public static boolean verifyCertificatesExist(String dockerCertPath) {
-        String[] files = { "ca.pem", "cert.pem", "key.pem" };
+        String[] files = {"ca.pem", "cert.pem", "key.pem"};
         for (String file : files) {
             File path = new File(dockerCertPath, file);
             return path.exists();
diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java b/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
index d6cd0d9f..7ad38048 100644
--- a/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
@@ -81,6 +81,7 @@ public class FiltersBuilder {
         return result;
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -93,6 +94,7 @@ public class FiltersBuilder {
         return filters.equals(filters1.filters);
 
     }
+    //CHECKSTYLE:ON
 
     @Override
     public int hashCode() {
diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java b/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
index 75f9d48c..280daad4 100644
--- a/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
+++ b/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
@@ -16,8 +16,10 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
  *
  */
 public class FiltersEncoder {
+    private FiltersEncoder() {
+    }
 
-    private static ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
+    private static final ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
             MediaType.APPLICATION_JSON_TYPE);
 
     public static String jsonEncode(Map<String, List<String>> filters) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index b3670a8b..c21c305d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -26,9 +26,10 @@ public class AttachContainerCmdExec extends AbstrAsyncDockerCmdExec<AttachContai
     protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd command,
             ResultCallback<Frame> resultCallback) {
 
-        if (command.getStdin() != null)
+        if (command.getStdin() != null) {
             throw new UnsupportedOperationException(
                     "Passing stdin to the container is currently not supported. Try experimental netty engine!");
+        }
 
         WebTarget webTarget = getBaseResource().path("/containers/{id}/attach").resolveTemplate("id",
                 command.getContainerId());
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index bbd71ba3..79f60ec3 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -134,15 +134,17 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
         if (clientResponseFilters != null) {
             for (ClientResponseFilter clientResponseFilter : clientResponseFilters) {
-                if (clientResponseFilter != null)
+                if (clientResponseFilter != null) {
                     clientConfig.register(clientResponseFilter);
+                }
             }
         }
 
         if (clientRequestFilters != null) {
             for (ClientRequestFilter clientRequestFilter : clientRequestFilters) {
-                if (clientRequestFilter != null)
+                if (clientRequestFilter != null) {
                     clientConfig.register(clientRequestFilter);
+                }
             }
         }
 
@@ -171,10 +173,12 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
         PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
                 originalUri, sslContext));
 
-        if (maxTotalConnections != null)
+        if (maxTotalConnections != null) {
             connManager.setMaxTotal(maxTotalConnections);
-        if (maxPerRouteConnections != null)
+        }
+        if (maxPerRouteConnections != null) {
             connManager.setDefaultMaxPerRoute(maxPerRouteConnections);
+        }
 
         clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
index 1e7acfc3..3d632015 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
@@ -31,11 +31,11 @@ public class ListImagesCmdExec extends AbstrSyncDockerCmdExec<ListImagesCmd, Lis
         webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled());
 
         if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-        	webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
 
         if (command.getImageNameFilter() != null) {
-        	webTarget = webTarget.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter()));
+            webTarget = webTarget.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter()));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
index dd877a89..4f2165b9 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
@@ -25,8 +25,9 @@ public class ListVolumesCmdExec extends AbstrSyncDockerCmdExec<ListVolumesCmd, L
     protected ListVolumesResponse execute(ListVolumesCmd command) {
         WebTarget webTarget = getBaseResource().path("/volumes");
 
-        if (command.getFilters() != null && !command.getFilters().isEmpty())
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
 
         LOGGER.trace("GET: {}", webTarget);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
index 48b6641a..22841d8b 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
@@ -25,8 +25,9 @@ public class TopContainerCmdExec extends AbstrSyncDockerCmdExec<TopContainerCmd,
         WebTarget webResource = getBaseResource().path("/containers/{id}/top").resolveTemplate("id",
                 command.getContainerId());
 
-        if (!StringUtils.isEmpty(command.getPsArgs()))
+        if (!StringUtils.isEmpty(command.getPsArgs())) {
             webResource = webResource.queryParam("ps_args", command.getPsArgs());
+        }
 
         LOGGER.trace("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(TopContainerResponse.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
index e94ad1f2..aac5a94d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
@@ -58,8 +58,9 @@ public abstract class AbstractCallbackNotifier<T> implements Callable<Void> {
         try {
             InputStream inputStream = new WrappedResponseInputStream(response);
 
-            if (resultCallback != null)
+            if (resultCallback != null) {
                 responseStreamProcessor.processResponseStream(inputStream, resultCallback);
+            }
 
             return null;
         } catch (Exception e) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
index f7c83090..7994f326 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
@@ -182,15 +182,15 @@ import org.glassfish.jersey.message.internal.Statuses;
 @SuppressWarnings("deprecation")
 class ApacheConnector implements Connector {
 
-    private final static Logger LOGGER = Logger.getLogger(ApacheConnector.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(ApacheConnector.class.getName());
 
-    private static final VersionInfo vi;
+    private static final VersionInfo VERSION_INFO;
 
-    private static final String release;
+    private static final String RELEASE;
 
     static {
-        vi = VersionInfo.loadVersionInfo("org.apache.http.client", HttpClientBuilder.class.getClassLoader());
-        release = (vi != null) ? vi.getRelease() : VersionInfo.UNAVAILABLE;
+        VERSION_INFO = VersionInfo.loadVersionInfo("org.apache.http.client", HttpClientBuilder.class.getClassLoader());
+        RELEASE = (VERSION_INFO != null) ? VERSION_INFO.getRelease() : VersionInfo.UNAVAILABLE;
     }
 
     private final CloseableHttpClient client;
@@ -507,7 +507,7 @@ class ApacheConnector implements Connector {
 
     @Override
     public String getName() {
-        return "Apache HttpClient " + release;
+        return "Apache HttpClient " + RELEASE;
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
index d358f574..fead3575 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
@@ -11,9 +11,9 @@ import org.glassfish.jersey.client.ClientResponse;
 
 /**
  * Fix for https://github.com/docker-java/docker-java/issues/196
- * 
+ *
  * https://java.net/jira/browse/JERSEY-2852
- * 
+ *
  * @author Marcus Linke
  *
  */
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
index be079d43..cb5cd068 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
@@ -12,7 +12,7 @@ import javax.ws.rs.core.Response;
  * Default implementation of RedirectStrategy honors the restrictions on automatic redirection of entity enclosing
  * methods such as POST and PUT imposed by the HTTP specification. 302 Moved Temporarily, 301 Moved Permanently and 307
  * Temporary Redirect status codes will result in an automatic redirect of HEAD and GET methods only.
- * 
+ *
  * {@link org.apache.http.impl.client.DefaultRedirectStrategy}
  *
  * This filter allows arbitrary redirection for other methods.
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
index 6dbea004..76666fe4 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
@@ -109,7 +109,7 @@ public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilte
     @SuppressWarnings("NonConstantLogger")
     private final Logger logger;
 
-    private final AtomicLong _id = new AtomicLong(0);
+    private final AtomicLong aid = new AtomicLong(0);
 
     private final Boolean printEntity;
 
@@ -227,7 +227,7 @@ public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilte
 
     @Override
     public void filter(final ClientRequestContext context) throws IOException {
-        final long id = this._id.incrementAndGet();
+        final long id = aid.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
         printRequestLine(b, "Sending client request", id, context.getMethod(), context.getUri());
@@ -246,7 +246,7 @@ public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilte
     @Override
     public void filter(final ClientRequestContext requestContext, final ClientResponseContext responseContext)
             throws IOException {
-        final long id = this._id.incrementAndGet();
+        final long id = aid.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
         printResponseLine(b, "Client response received", id, responseContext.getStatus());
@@ -261,7 +261,7 @@ public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilte
 
     @Override
     public void filter(final ContainerRequestContext context) throws IOException {
-        final long id = this._id.incrementAndGet();
+        final long id = aid.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
         printRequestLine(b, "Server has received a request", id, context.getMethod(), context.getUriInfo()
@@ -278,7 +278,7 @@ public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilte
     @Override
     public void filter(final ContainerRequestContext requestContext, final ContainerResponseContext responseContext)
             throws IOException {
-        final long id = this._id.incrementAndGet();
+        final long id = aid.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
         printResponseLine(b, "Server responded with a response", id, responseContext.getStatus());
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
index 847033fd..2251d8fa 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
@@ -13,9 +13,8 @@ import org.slf4j.Logger;
 
 /**
  * A version of the logging filter that will avoid trying to log entities which can cause issues with the console.
- * 
- * @author sfitts
  *
+ * @author sfitts
  */
 public class SelectiveLoggingFilter extends LoggingFilter {
 
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index ee3b5010..2f7422ac 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -205,15 +205,15 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
     private class UnixDomainSocketInitializer implements NettyInitializer {
         @Override
         public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientConfig) {
-            EventLoopGroup eventLoopGroup = new EpollEventLoopGroup();
-            bootstrap.group(eventLoopGroup).channel(EpollDomainSocketChannel.class)
+            EventLoopGroup epollEventLoopGroup = new EpollEventLoopGroup();
+            bootstrap.group(epollEventLoopGroup).channel(EpollDomainSocketChannel.class)
                     .handler(new ChannelInitializer<UnixChannel>() {
                         @Override
                         protected void initChannel(final UnixChannel channel) throws Exception {
                             channel.pipeline().addLast(new HttpClientCodec());
                         }
                     });
-            return eventLoopGroup;
+            return epollEventLoopGroup;
         }
 
         @Override
@@ -225,7 +225,7 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
     private class InetSocketInitializer implements NettyInitializer {
         @Override
         public EventLoopGroup init(Bootstrap bootstrap, final DockerClientConfig dockerClientConfig) {
-            EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
+            EventLoopGroup nioEventLoopGroup = new NioEventLoopGroup();
 
             InetAddress addr = InetAddress.getLoopbackAddress();
 
@@ -233,7 +233,7 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
             Security.addProvider(new BouncyCastleProvider());
 
-            bootstrap.group(eventLoopGroup).channel(NioSocketChannel.class)
+            bootstrap.group(nioEventLoopGroup).channel(NioSocketChannel.class)
                     .handler(new ChannelInitializer<SocketChannel>() {
                         @Override
                         protected void initChannel(final SocketChannel channel) throws Exception {
@@ -243,7 +243,7 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
                         }
                     });
 
-            return eventLoopGroup;
+            return nioEventLoopGroup;
         }
 
         @Override
diff --git a/src/main/java/com/github/dockerjava/netty/MediaType.java b/src/main/java/com/github/dockerjava/netty/MediaType.java
index a7738604..50732aeb 100644
--- a/src/main/java/com/github/dockerjava/netty/MediaType.java
+++ b/src/main/java/com/github/dockerjava/netty/MediaType.java
@@ -8,17 +8,17 @@ package com.github.dockerjava.netty;
  */
 public enum MediaType {
 
-	APPLICATION_JSON("application/json"),
-	APPLICATION_OCTET_STREAM("application/octet-stream"),
-	APPLICATION_X_TAR("application/x-tar");
+    APPLICATION_JSON("application/json"),
+    APPLICATION_OCTET_STREAM("application/octet-stream"),
+    APPLICATION_X_TAR("application/x-tar");
 
-	private String mediaType;
+    private String mediaType;
 
-	private MediaType(String mediaType) {
-		this.mediaType = mediaType;
-	}
+    private MediaType(String mediaType) {
+        this.mediaType = mediaType;
+    }
 
-	public String getMediaType() {
-		return mediaType;
-	}
+    public String getMediaType() {
+        return mediaType;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/WebTarget.java b/src/main/java/com/github/dockerjava/netty/WebTarget.java
index 7698858a..f8652043 100644
--- a/src/main/java/com/github/dockerjava/netty/WebTarget.java
+++ b/src/main/java/com/github/dockerjava/netty/WebTarget.java
@@ -22,7 +22,7 @@ public class WebTarget {
 
     private Map<String, String> queryParams = new HashMap<String, String>();
 
-    private static String PATH_SEPARATOR = "/";
+    private static final String PATH_SEPARATOR = "/";
 
     public WebTarget(ChannelProvider channelProvider) {
         this.channelProvider = channelProvider;
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
index b42bbdb3..eaba91fd 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
@@ -27,8 +27,8 @@ public class CommitCmdExec extends AbstrSyncDockerCmdExec<CommitCmd, String> imp
         webTarget = booleanQueryParam(webTarget, "pause", command.hasPauseEnabled());
 
         LOGGER.trace("POST: {}", webTarget);
-        ObjectNode objectNode = webTarget.request().accept(MediaType.APPLICATION_JSON).
-                post(command, new TypeReference<ObjectNode>() {});
+        ObjectNode objectNode = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .post(command, new TypeReference<ObjectNode>() { });
 
         return objectNode.get("Id").asText();
     }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
index 3d3ddec2..0e182e8b 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
@@ -26,6 +26,6 @@ public class CreateImageCmdExec extends AbstrSyncDockerCmdExec<CreateImageCmd, C
 
         LOGGER.trace("POST: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM)
-                .post(new TypeReference<CreateImageResponse>() {}, command.getImageStream());
+                .post(new TypeReference<CreateImageResponse>() { }, command.getImageStream());
     }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
index e0c945d6..11e5fe23 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
@@ -28,8 +28,9 @@ public class ListNetworksCmdExec extends AbstrSyncDockerCmdExec<ListNetworksCmd,
     protected List<Network> execute(ListNetworksCmd command) {
         WebTarget webTarget = getBaseResource().path("/networks");
 
-        if (command.getFilters() != null && !command.getFilters().isEmpty())
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
 
         LOGGER.trace("GET: {}", webTarget);
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
index 98d073ff..1db5684c 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
@@ -26,8 +26,9 @@ public class ListVolumesCmdExec extends AbstrSyncDockerCmdExec<ListVolumesCmd, L
     protected ListVolumesResponse execute(ListVolumesCmd command) {
         WebTarget webTarget = getBaseResource().path("/volumes");
 
-        if (command.getFilters() != null && !command.getFilters().isEmpty())
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
 
         LOGGER.trace("GET: {}", webTarget);
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
index 07ec12b0..c4ae9249 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
@@ -25,8 +25,9 @@ public class TopContainerCmdExec extends AbstrSyncDockerCmdExec<TopContainerCmd,
         WebTarget webResource = getBaseResource().path("/containers/{id}/top").resolveTemplate("id",
                 command.getContainerId());
 
-        if (!StringUtils.isEmpty(command.getPsArgs()))
+        if (!StringUtils.isEmpty(command.getPsArgs())) {
             webResource = webResource.queryParam("ps_args", command.getPsArgs());
+        }
 
         LOGGER.trace("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<TopContainerResponse>() {
diff --git a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
index 945833cd..b58292b5 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
@@ -89,8 +89,9 @@ public class FramedResponseStreamHandler extends SimpleChannelInboundHandler<Byt
 
         if (streamType.equals(StreamType.RAW)) {
 
-            if (payloadCnt == 0)
+            if (payloadCnt == 0) {
                 payload = new byte[rawBuffer.readableBytes()];
+            }
 
             int count = read(payload, payloadCnt, rawBuffer.readableBytes());
 
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
index 54ffb2f9..cb6f6067 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
@@ -11,13 +11,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  *
  * @author Marcus Linke
  */
-public class JsonRequestHandler extends MessageToByteEncoder<Object>{
+public class JsonRequestHandler extends MessageToByteEncoder<Object> {
 
-	private ObjectMapper mapper = new ObjectMapper();
+    private ObjectMapper mapper = new ObjectMapper();
 
-	@Override
-	protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception {
-		byte[] serialized = mapper.writeValueAsBytes(msg);
-		out.writeBytes(serialized);
-	}
+    @Override
+    protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception {
+        byte[] serialized = mapper.writeValueAsBytes(msg);
+        out.writeBytes(serialized);
+    }
 }


Test patch:
diff --git a/src/test/java/com/github/dockerjava/api/model/BindingTest.java b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
index 3309a890..23e793cf 100644
--- a/src/test/java/com/github/dockerjava/api/model/BindingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
@@ -10,22 +10,22 @@ public class BindingTest {
 
     @Test
     public void parseIpAndPort() {
-        assertEquals(Binding.parse("127.0.0.1:80"), Ports.Binding("127.0.0.1", 80));
+        assertEquals(Binding.parse("127.0.0.1:80"), Ports.binding("127.0.0.1", 80));
     }
 
     @Test
     public void parsePortOnly() {
-        assertEquals(Binding.parse("80"), Ports.Binding(null, 80));
+        assertEquals(Binding.parse("80"), Ports.binding(null, 80));
     }
 
     @Test
     public void parseIPOnly() {
-        assertEquals(Binding.parse("127.0.0.1"), Ports.Binding("127.0.0.1", null));
+        assertEquals(Binding.parse("127.0.0.1"), Ports.binding("127.0.0.1", null));
     }
 
     @Test
     public void parseEmptyString() {
-        assertEquals(Binding.parse(""), Ports.Binding(null, null));
+        assertEquals(Binding.parse(""), Ports.binding(null, null));
     }
 
     @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Binding 'nonsense'")
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
index da127b12..05a2b3f0 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
@@ -19,9 +19,9 @@ public class Ports_addBindingsTest {
 
     private static final ExposedPort TCP_90 = ExposedPort.tcp(90);
 
-    private static final Binding BINDING_8080 = Ports.Binding(8080);
+    private static final Binding BINDING_8080 = Ports.binding(8080);
 
-    private static final Binding BINDING_9090 = Ports.Binding(9090);
+    private static final Binding BINDING_9090 = Ports.binding(9090);
 
     private Ports ports;
 
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index ce277165..3f989c11 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -363,9 +363,9 @@ public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(11022));
-        portBindings.bind(tcp23, Ports.Binding(11023));
-        portBindings.bind(tcp23, Ports.Binding(11024));
+        portBindings.bind(tcp22, Ports.binding(11022));
+        portBindings.bind(tcp23, Ports.binding(11023));
+        portBindings.bind(tcp23, Ports.binding(11024));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -379,13 +379,13 @@ public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.Binding(11022))));
+                is(equalTo(Ports.binding(11022))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.Binding(11023))));
+                is(equalTo(Ports.binding(11023))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.Binding(11024))));
+                is(equalTo(Ports.binding(11024))));
 
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index b43eb0ff..ce060f4b 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -186,9 +186,9 @@ public class StartContainerCmdImplTest extends AbstractDockerClientTest {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(11022));
-        portBindings.bind(tcp23, Ports.Binding(11023));
-        portBindings.bind(tcp23, Ports.Binding(11024));
+        portBindings.bind(tcp22, Ports.binding(11022));
+        portBindings.bind(tcp23, Ports.binding(11023));
+        portBindings.bind(tcp23, Ports.binding(11024));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -206,13 +206,13 @@ public class StartContainerCmdImplTest extends AbstractDockerClientTest {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.Binding(11022))));
+                is(equalTo(Ports.binding(11022))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.Binding(11023))));
+                is(equalTo(Ports.binding(11023))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.Binding(11024))));
+                is(equalTo(Ports.binding(11024))));
 
     }
 
@@ -223,8 +223,8 @@ public class StartContainerCmdImplTest extends AbstractDockerClientTest {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(null));
-        portBindings.bind(tcp23, Ports.Binding(null));
+        portBindings.bind(tcp22, Ports.binding(null));
+        portBindings.bind(tcp23, Ports.binding(null));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).withPublishAllPorts(true).exec();
@@ -254,8 +254,8 @@ public class StartContainerCmdImplTest extends AbstractDockerClientTest {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(11022));
-        portBindings.bind(tcp23, Ports.Binding(11022));
+        portBindings.bind(tcp22, Ports.binding(11022));
+        portBindings.bind(tcp23, Ports.binding(11022));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index 9a37ef01..a29b26d7 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -32,7 +32,6 @@ import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.AccessMode;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
@@ -42,7 +41,6 @@ import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumeRW;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
@@ -358,9 +356,9 @@ public class CreateContainerCmdExecTest extends AbstractNettyDockerClientTest {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(11022));
-        portBindings.bind(tcp23, Ports.Binding(11023));
-        portBindings.bind(tcp23, Ports.Binding(11024));
+        portBindings.bind(tcp22, Ports.binding(11022));
+        portBindings.bind(tcp23, Ports.binding(11023));
+        portBindings.bind(tcp23, Ports.binding(11024));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -374,13 +372,13 @@ public class CreateContainerCmdExecTest extends AbstractNettyDockerClientTest {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.Binding(11022))));
+                is(equalTo(Ports.binding(11022))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.Binding(11023))));
+                is(equalTo(Ports.binding(11023))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.Binding(11024))));
+                is(equalTo(Ports.binding(11024))));
 
     }
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
index d743935e..8af196a6 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
@@ -31,7 +31,6 @@ import com.github.dockerjava.api.command.StartContainerCmd;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.AccessMode;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
@@ -39,7 +38,6 @@ import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumeRW;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
@@ -189,9 +187,9 @@ public class StartContainerCmdExecTest extends AbstractNettyDockerClientTest {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(11022));
-        portBindings.bind(tcp23, Ports.Binding(11023));
-        portBindings.bind(tcp23, Ports.Binding(11024));
+        portBindings.bind(tcp22, Ports.binding(11022));
+        portBindings.bind(tcp23, Ports.binding(11023));
+        portBindings.bind(tcp23, Ports.binding(11024));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -209,13 +207,13 @@ public class StartContainerCmdExecTest extends AbstractNettyDockerClientTest {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.Binding(11022))));
+                is(equalTo(Ports.binding(11022))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.Binding(11023))));
+                is(equalTo(Ports.binding(11023))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.Binding(11024))));
+                is(equalTo(Ports.binding(11024))));
 
     }
 
@@ -226,8 +224,8 @@ public class StartContainerCmdExecTest extends AbstractNettyDockerClientTest {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(null));
-        portBindings.bind(tcp23, Ports.Binding(null));
+        portBindings.bind(tcp22, Ports.binding(null));
+        portBindings.bind(tcp23, Ports.binding(null));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).withPublishAllPorts(true).exec();
@@ -257,8 +255,8 @@ public class StartContainerCmdExecTest extends AbstractNettyDockerClientTest {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(11022));
-        portBindings.bind(tcp23, Ports.Binding(11022));
+        portBindings.bind(tcp22, Ports.binding(11022));
+        portBindings.bind(tcp23, Ports.binding(11022));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index 9f9f7b02..ea30a270 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -18,10 +18,152 @@
         <property name="lineSeparator" value="lf"/>
     </module>
 
+    <module name="Translation"/>
+
+    <module name="FileLength"/>
+
+    <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
+    </module>
+
+    <module name="RegexpSingleline">
+        <!-- \s matches whitespace character, $ matches end of line. -->
+        <property name="format" value="\s+$"/>
+        <property name="message" value="Line has trailing spaces."/>
+    </module>
+
+    <module name="SuppressionCommentFilter">
+        <property name="offCommentFormat" value="CHECKSTYLE\:OFF"/>
+        <property name="onCommentFormat" value="CHECKSTYLE\:ON"/>
+    </module>
+
+    <module name="SuppressWithNearbyCommentFilter"/>
+
+    <!-- Support @SuppressWarnings (added in Checkstyle 5.7) -->
+    <!-- see http://checkstyle.sourceforge.net/config.html#SuppressWarningsFilter -->
+    <module name="SuppressWarningsFilter"/>
+
     <module name="TreeWalker">
+        <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
+        <!-- required for SuppressWarningsFilter (and other Suppress* rules not used here) -->
+        <!-- see http://checkstyle.sourceforge.net/config_annotation.html#SuppressWarningsHolder -->
+        <module name="SuppressWarningsHolder"/>
+
+        <module name="FileContentsHolder"/>
+
+        <!-- Checks for Naming Conventions.                  -->
+        <!-- See http://checkstyle.sf.net/config_naming.html -->
+        <module name="ConstantName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+
+        <!-- Checks for imports                              -->
+        <!-- See http://checkstyle.sf.net/config_import.html -->
+        <module name="AvoidStarImport"/>
+        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <module name="RedundantImport"/>
         <module name="UnusedImports">
             <property name="processJavadoc" value="true"/>
         </module>
+
+        <!-- IDEA mathcher? uncomment as last commit -->
+        <!--<module name="ImportOrder">-->
+            <!--<property name="groups" value="*,javax,java"/>-->
+            <!--<property name="ordered" value="true"/>-->
+            <!--<property name="separated" value="false"/>-->
+            <!--<property name="option" value="bottom"/>-->
+            <!--<property name="sortStaticImportsAlphabetically" value="true"/>-->
+        <!--</module>-->
+
+        <!--http://checkstyle.sourceforge.net/config_misc.html#Indentation-->
+        <!-- 220 errors -->
+        <!--<module name="Indentation"/>-->
+
+        <!-- Checks for Size Violations.                    -->
+        <!-- See http://checkstyle.sf.net/config_sizes.html -->
+        <module name="LineLength">
+            <property name="max" value="140"/>
+            <property name="ignorePattern" value="^//.*|^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        </module>
+        <module name="MethodLength"/>
+        <!-- upto @marcuslinke -->
+        <!--<module name="ParameterNumber"/>-->
+
+        <!-- Checks for whitespace                               -->
+        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <module name="EmptyForIteratorPad"/>
+        <module name="MethodParamPad"/>
+        <module name="NoWhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <!-- upto @marcuslinke -->
+        <!--<module name="OperatorWrap">-->
+            <!--<property name="option" value="eol"/>-->
+        <!--</module>-->
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="WhitespaceAfter"/>
+        <!-- some weirdness with logger in CommitCmdExec and CreateImageCmdExec -->
+        <module name="WhitespaceAround"/>
+
+        <!-- Modifier Checks                                    -->
+        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <module name="ModifierOrder"/>
+        <!-- Verify with @marcuslinke before. 576 violations -->
+        <!--<module name="RedundantModifier"/>-->
+
+
+        <!-- Checks for blocks. You know, those {}'s         -->
+        <!-- See http://checkstyle.sf.net/config_blocks.html -->
+        <module name="AvoidNestedBlocks">
+            <property name="allowInSwitchCase" value="true"/>
+        </module>
+        <module name="EmptyBlock"/>
+        <module name="LeftCurly"/>
+        <module name="NeedBraces">
+            <property name="allowSingleLineStatement" value="true"/>
+        </module>
+        <module name="RightCurly"/>
+
+        <!-- Checks for common coding problems               -->
+        <!-- See http://checkstyle.sf.net/config_coding.html -->
+        <!--<module name="AvoidInlineConditionals"/>-->
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="HiddenField">
+            <property name="tokens" value="VARIABLE_DEF"/>
+        </module>
+        <module name="IllegalInstantiation"/>
+        <module name="InnerAssignment"/>
+        <!--<module name="MagicNumber"/>-->
+        <!-- upto @marcusline -->
+        <!--<module name="MissingSwitchDefault"/>-->
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+
+        <!-- Checks for class design                         -->
+        <!-- See http://checkstyle.sf.net/config_design.html -->
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+        <!-- FIXME check with @marcuslinke -->
+        <!--<module name="VisibilityModifier"/>-->
+
+        <!-- Miscellaneous other checks.                   -->
+        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <module name="ArrayTypeStyle"/>
+        <module name="TodoComment">
+            <property name="format" value="(TODO)|(FIXME)"/>
+            <property name="severity" value="info"/>
+        </module>
+        <!--<module name="FinalParameters"/>-->
+        <module name="UpperEll"/>
+
     </module>
 
 </module>