Checkstyle: fixed braces.

KostyaSha · KostyaSha · commit 1fc561bf1245 · 2016-02-02T18:03:50.000+03:00
diff --git 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 String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -127,4 +128,5 @@ public boolean equals(Object obj) {
             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
@@ -72,8 +72,9 @@ public boolean equals(Object obj) {
             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/Device.java b/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -52,8 +52,9 @@ public boolean equals(Object obj) {
             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
@@ -151,8 +151,9 @@ public boolean equals(Object obj) {
         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
@@ -28,6 +28,7 @@ public String toString() {
         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 int hashCode() {
         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
@@ -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 static Identifier fromCompoundString(String 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/Link.java b/src/main/java/com/github/dockerjava/api/model/Link.java
@@ -74,8 +74,9 @@ public boolean equals(final Object obj) {
         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
@@ -98,8 +98,9 @@ public LoggingType deserialize(JsonParser jsonParser, DeserializationContext des
                 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
@@ -64,8 +64,9 @@ public boolean equals(Object obj) {
             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
@@ -249,8 +249,9 @@ public boolean equals(Object obj) {
                 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
@@ -37,8 +37,9 @@ public String toString() {
     }
 
     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
@@ -89,10 +89,14 @@ public static RestartPolicy parse(String serialized) throws IllegalArgumentExcep
         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 boolean equals(Object obj) {
             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
@@ -45,6 +45,7 @@ public Integer getHard() {
         return hard;
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof Ulimit) {
@@ -60,4 +61,5 @@ public boolean equals(Object obj) {
     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
@@ -30,8 +30,9 @@ public boolean equals(Object obj) {
         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
@@ -69,8 +69,9 @@ public boolean equals(Object obj) {
             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
@@ -77,8 +77,9 @@ public boolean equals(Object obj) {
             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
@@ -63,6 +63,7 @@ public AuthConfigurations getAuthConfigurations() {
         return authConfigurations;
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -87,6 +88,7 @@ public boolean equals(Object obj) {
             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
@@ -272,8 +272,9 @@ public AuthConfig effectiveAuthConfig(String imageName) {
 
         AuthConfig otherAuthConfig = getAuthConfig();
 
-        if (otherAuthConfig != null)
+        if (otherAuthConfig != null) {
             authConfig = otherAuthConfig;
+        }
 
         return authConfig;
     }
@@ -294,6 +295,7 @@ public AuthConfigurations getAuthConfigurations() {
         return new AuthConfigurations();
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -335,6 +337,7 @@ public int hashCode() {
         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
@@ -214,20 +214,23 @@ public PushImageCmd pushImageCmd(String name) {
         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/KeystoreSSLConfig.java b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -81,8 +81,9 @@ public SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKe
         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());
diff --git 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 boolean isGreaterOrEqual(final RemoteApiVersion other) {
         return false;
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public boolean equals(final Object o) {
         if (this == o)
@@ -136,6 +137,7 @@ public boolean equals(final Object o) {
         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/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -47,11 +47,11 @@ public void onStart(Closeable stream) {
     @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 void onComplete() {
     @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/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -248,13 +248,16 @@ public BuildImageCmd withBaseDirectory(File baseDirectory) {
     @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/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -221,21 +221,24 @@ private String effectiveMatchingIgnorePattern(File file) {
 
             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/FiltersBuilder.java b/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ public String toString() {`
`79`	`79`	`return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);`
`80`	`80`	`}`
`81`	`81`
	`82`	`+ //CHECKSTYLE:OFF`
`82`	`83`	`@Override`
`83`	`84`	`public int hashCode() {`
`84`	`85`	`final int prime = 31;`
`@@ -127,4 +128,5 @@ public boolean equals(Object obj) {`
`127`	`128`	`return false;`
`128`	`129`	`return true;`
`129`	`130`	`}`
	`131`	`+ //CHECKSTYLE:ON`
`130`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public String toString() {`
`28`	`28`	`return String.format("%s: %s", streamType, new String(payload).trim());`
`29`	`29`	`}`
`30`	`30`
	`31`	`+ //CHECKSTYLE:OFF`
`31`	`32`	`@Override`
`32`	`33`	`public boolean equals(Object o) {`
`33`	`34`	`if (this == o)`
`@@ -47,4 +48,5 @@ public int hashCode() {`
`47`	`48`	`result = 31 * result + Arrays.hashCode(payload);`
`48`	`49`	`return result;`
`49`	`50`	`}`
	`51`	`+ //CHECKSTYLE:ON`
`50`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,9 @@ public LoggingType deserialize(JsonParser jsonParser, DeserializationContext des`
`98`	`98`	`JsonNode node = oc.readTree(jsonParser);`
`99`	`99`
`100`	`100`	`for (LoggingType loggingType : values()) {`
`101`		`- if (loggingType.getType().equals(node.asText()))`
	`101`	`+ if (loggingType.getType().equals(node.asText())) {`
`102`	`102`	`return loggingType;`
	`103`	`+ }`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`throw new IllegalArgumentException("No enum constant " + LoggingType.class + "." + node.asText());`
Original file line number	Diff line number	Diff line change
`@@ -249,8 +249,9 @@ public boolean equals(Object obj) {`
`249`	`249`	`Binding other = (Binding) obj;`
`250`	`250`	`return new EqualsBuilder().append(hostIp, other.getHostIp()).append(hostPort, other.getHostPort())`
`251`	`251`	`.isEquals();`
`252`		`- } else`
	`252`	`+ } else {`
`253`	`253`	`return super.equals(obj);`
	`254`	`+ }`
`254`	`255`	`}`
`255`	`256`	`}`
`256`	`257`