Checkstyle: whitespace checks.

KostyaSha · KostyaSha · commit c76a187bee6b · 2016-02-02T18:03:49.000+03:00
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -70,7 +70,7 @@ public void bind(ExposedPort exposedPort, Binding binding) {
             if (binding == null) {
                 ports.put(exposedPort, null);
             } else {
-                ports.put(exposedPort, new Binding[] { binding });
+                ports.put(exposedPort, new Binding[]{binding});
             }
         }
     }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -178,7 +178,7 @@ private static Properties overrideDockerPropertiesWithSystemProperties(Propertie
         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, }) {
diff --git a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -87,7 +87,7 @@ public SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKe
         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/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -147,7 +147,7 @@ public int read() throws IOException {
                     }
 
                     @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);
                     }
 
diff --git 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 @@ private 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/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -98,17 +98,20 @@
 
         <!-- Checks for whitespace                               -->
         <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
+        <!-- @KostyaSha unsure -->
+        <!--<module name="EmptyForIteratorPad"/>-->
         <module name="MethodParamPad"/>
         <module name="NoWhitespaceAfter"/>
         <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap">
-            <property name="option" value="eol"/>
-        </module>
+        <!-- upto @marcuslinke -->
+        <!--<module name="OperatorWrap">-->
+            <!--<property name="option" value="eol"/>-->
+        <!--</module>-->
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
         <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround"/>
+        <!-- some weirdness with logger in CommitCmdExec and CreateImageCmdExec -->
+        <!--<module name="WhitespaceAround"/>-->
 
     </module>
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public void bind(ExposedPort exposedPort, Binding binding) {`
`70`	`70`	`if (binding == null) {`
`71`	`71`	`ports.put(exposedPort, null);`
`72`	`72`	`} else {`
`73`		`- ports.put(exposedPort, new Binding[] { binding });`
	`73`	`+ ports.put(exposedPort, new Binding[]{binding});`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public int read() throws IOException {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`@Override`
`150`		`- public int read(byte [] buff, int offset, int len) throws IOException {`
	`150`	`+ public int read(byte[] buff, int offset, int len) throws IOException {`
`151`	`151`	`return tarInputStream.read(buff, offset, len);`
`152`	`152`	`}`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ private CertificateUtils() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public static boolean verifyCertificatesExist(String dockerCertPath) {`
`34`		`- String[] files = { "ca.pem", "cert.pem", "key.pem" };`
	`34`	`+ String[] files = {"ca.pem", "cert.pem", "key.pem"};`
`35`	`35`	`for (String file : files) {`
`36`	`36`	`File path = new File(dockerCertPath, file);`
`37`	`37`	`return path.exists();`