Format sources

Marcus Linke · Marcus Linke · commit 63688e056a56 · 2015-08-15T19:09:06.000+02:00
diff --git a/src/main/java/com/github/dockerjava/core/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
@@ -49,7 +49,7 @@ public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuch
         keyStore.load(null);
 
         keyStore.setKeyEntry("docker", keyPair.getPrivate(), "docker".toCharArray(),
-                privateCertificates.toArray(new Certificate[privateCertificates.size()]) );
+                privateCertificates.toArray(new Certificate[privateCertificates.size()]));
         return keyStore;
     }
 
@@ -82,7 +82,8 @@ public static KeyStore createTrustStore(final String dockerCertPath) throws IOEx
 
     }
 
-    private static List<Certificate> loadCertificates(final String dockerCertPath) throws IOException, CertificateException {
+    private static List<Certificate> loadCertificates(final String dockerCertPath) throws IOException,
+            CertificateException {
         File certificate = new File(dockerCertPath, "cert.pem");
         BufferedReader reader = new BufferedReader(new FileReader(certificate));
         PEMParser pemParser = null;
diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -18,8 +18,8 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
             throws IOException {
         File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");
         tarFile.deleteOnExit();
-        try(TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(
-                new BufferedOutputStream(new FileOutputStream(tarFile))))) {
+        try (TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(new BufferedOutputStream(
+                new FileOutputStream(tarFile))))) {
             tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
             for (File file : files) {
                 TarArchiveEntry tarEntry = new TarArchiveEntry(file);
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -177,8 +177,8 @@ private static Properties overrideDockerPropertiesWithSystemProperties(Propertie
 
         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, }) {
+                DOCKER_IO_SERVER_ADDRESS_PROPERTY, DOCKER_IO_DOCKER_CERT_PATH_PROPERTY,
+                DOCKER_IO_DOCKER_CFG_PATH_PROPERTY, }) {
             if (systemProperties.containsKey(key)) {
                 overriddenProperties.setProperty(key, systemProperties.getProperty(key));
             }
@@ -337,8 +337,7 @@ public int hashCode() {
     public String toString() {
         return "DockerClientConfig{" + "uri=" + uri + ", version='" + version + '\'' + ", username='" + username + '\''
                 + ", password='" + password + '\'' + ", email='" + email + '\'' + ", serverAddress='" + serverAddress
-                + '\'' + ", dockerCfgPath='" + dockerCfgPath + '\'' + ", sslConfig='" + sslConfig + '\''
-                + '}';
+                + '\'' + ", dockerCfgPath='" + dockerCfgPath + '\'' + ", sslConfig='" + sslConfig + '\'' + '}';
     }
 
     public static class DockerClientConfigBuilder {
@@ -415,7 +414,7 @@ public final DockerClientConfigBuilder withSSLConfig(SSLConfig config) {
 
         public DockerClientConfig build() {
             return new DockerClientConfig(uri, version, username, password, email, serverAddress, dockerCfgPath,
-                     sslConfig);
+                    sslConfig);
         }
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -38,7 +38,8 @@ public void onStart(Closeable stream) {
 
     @Override
     public void onError(Throwable throwable) {
-        if(closed) return;
+        if (closed)
+            return;
 
         try {
             LOGGER.error("Error during callback", throwable);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -35,7 +35,8 @@ protected String registryAuth(AuthConfig authConfig) {
 
     protected String registryConfigs(AuthConfigurations authConfigs) {
         try {
-            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfigs).getBytes());
+            String json = new ObjectMapper().writeValueAsString(authConfigs.getConfigs());
+            return Base64.encodeBase64String(json.getBytes());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -124,8 +124,8 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         if (clientRequestFilters != null) {
             for (ClientRequestFilter clientRequestFilter : clientRequestFilters) {
-                if(clientRequestFilter != null)
-                clientConfig.register(clientRequestFilter);
+                if (clientRequestFilter != null)
+                    clientConfig.register(clientRequestFilter);
             }
         }
 
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -186,8 +186,8 @@ public static void assertContainerHasVolumes(InspectContainerResponse inspectCon
     }
 
     protected String containerLog(String containerId) throws Exception {
-        return dockerClient.logContainerCmd(containerId).withStdOut()
-                .exec(new LogContainerTestCallback()).awaitCompletion().toString();
+        return dockerClient.logContainerCmd(containerId).withStdOut().exec(new LogContainerTestCallback())
+                .awaitCompletion().toString();
     }
 
     public static class LogContainerTestCallback extends LogContainerResultCallback {
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -10,7 +10,7 @@ public class DockerClientImplTest {
     @Test
     public void configuredInstanceAuthConfig() throws Exception {
         // given a config with null serverAddress
-        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null,null);
+        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null, null);
         DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig);
 
         // when we get the auth config
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -94,8 +94,8 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut().withFollowStream()
-                .exec(callback).awaitCompletion(15, TimeUnit.SECONDS).close();
+        dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut().withFollowStream().exec(callback)
+                .awaitCompletion(15, TimeUnit.SECONDS).close();
 
         System.out.println("log: " + callback.toString());
 
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -135,5 +135,4 @@ public void asyncMultipleLogContainer() throws Exception {
         assertTrue(loggingCallback.toString().contains(snippet));
     }
 
-
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
@@ -65,18 +65,14 @@ public void pushLatest() throws Exception {
         LOG.info("Removing image: {}", imageId);
         dockerClient.removeImageCmd(imageId).exec();
 
-        dockerClient.pullImageCmd(username + "/busybox")
-                .exec(new PullImageResultCallback()).awaitSuccess();
+        dockerClient.pullImageCmd(username + "/busybox").exec(new PullImageResultCallback()).awaitSuccess();
     }
 
     @Test(expectedExceptions = DockerClientException.class)
     public void pushNonExistentImage() throws Exception {
 
-        dockerClient.pushImageCmd(username + "/xxx").exec(new PushImageResultCallback())
-                .awaitSuccess();
-
+        dockerClient.pushImageCmd(username + "/xxx").exec(new PushImageResultCallback()).awaitSuccess();
 
     }
 
-
 }
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
@@ -17,6 +17,7 @@
 public class DockerfileAddMultipleFilesTest extends TestCase {
 
     private static final Logger log = LoggerFactory.getLogger(DockerfileAddMultipleFilesTest.class);
+
     private static final Function<File, String> TO_FILE_NAMES = new Function<File, String>() {
         @Override
         public String apply(File file) {
@@ -26,7 +27,8 @@ public String apply(File file) {
 
     @Test
     public void testAddMultipleFiles() throws IOException {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddMultipleFiles").getFile());
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddMultipleFiles")
+                .getFile());
         Dockerfile dockerfile = new Dockerfile(new File(baseDir, "Dockerfile"));
         Dockerfile.ScannedResult result = dockerfile.parse();
         Collection<String> filesToAdd = transform(result.filesToAdd, TO_FILE_NAMES);
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
@@ -20,16 +20,14 @@ public class DockerfileStatementAddTest extends TestCase {
 
     @DataProvider(name = "valid scenarios")
     public Object[][] validScenarios() {
-        return new Object[][] {
-                {"ADD src dest", contains("src"), "dest"},
-                {"ADD \"src file\" \"dest\"", contains("src file"), "dest"},
-                {"ADD src\"file dest", contains("src\"file"), "dest"},
-                {"ADD src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest"},
-                {"COPY src dest", contains("src"), "dest"},
-                {"COPY \"src file\" \"dest\"", contains("src file"), "dest"},
-                {"COPY src\"file dest", contains("src\"file"), "dest"},
-                {"COPY src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest"}
-        };
+        return new Object[][] { { "ADD src dest", contains("src"), "dest" },
+                { "ADD \"src file\" \"dest\"", contains("src file"), "dest" },
+                { "ADD src\"file dest", contains("src\"file"), "dest" },
+                { "ADD src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest" },
+                { "COPY src dest", contains("src"), "dest" },
+                { "COPY \"src file\" \"dest\"", contains("src file"), "dest" },
+                { "COPY src\"file dest", contains("src\"file"), "dest" },
+                { "COPY src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest" } };
     }
 
     @Test(dataProvider = "valid scenarios")

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuch`
`49`	`49`	`keyStore.load(null);`
`50`	`50`
`51`	`51`	`keyStore.setKeyEntry("docker", keyPair.getPrivate(), "docker".toCharArray(),`
`52`		`- privateCertificates.toArray(new Certificate[privateCertificates.size()]) );`
	`52`	`+ privateCertificates.toArray(new Certificate[privateCertificates.size()]));`
`53`	`53`	`return keyStore;`
`54`	`54`	`}`
`55`	`55`
`@@ -82,7 +82,8 @@ public static KeyStore createTrustStore(final String dockerCertPath) throws IOEx`
`82`	`82`
`83`	`83`	`}`
`84`	`84`
`85`		`- private static List<Certificate> loadCertificates(final String dockerCertPath) throws IOException, CertificateException {`
	`85`	`+ private static List<Certificate> loadCertificates(final String dockerCertPath) throws IOException,`
	`86`	`+ CertificateException {`
`86`	`87`	`File certificate = new File(dockerCertPath, "cert.pem");`
`87`	`88`	`BufferedReader reader = new BufferedReader(new FileReader(certificate));`
`88`	`89`	`PEMParser pemParser = null;`
Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,8 @@ private static Properties overrideDockerPropertiesWithSystemProperties(Propertie`
`177`	`177`
`178`	`178`	`for (String key : new String[] { DOCKER_IO_URL_PROPERTY, DOCKER_IO_VERSION_PROPERTY,`
`179`	`179`	`DOCKER_IO_USERNAME_PROPERTY, DOCKER_IO_PASSWORD_PROPERTY, DOCKER_IO_EMAIL_PROPERTY,`
`180`		`- DOCKER_IO_SERVER_ADDRESS_PROPERTY,`
`181`		`- DOCKER_IO_DOCKER_CERT_PATH_PROPERTY, DOCKER_IO_DOCKER_CFG_PATH_PROPERTY, }) {`
	`180`	`+ DOCKER_IO_SERVER_ADDRESS_PROPERTY, DOCKER_IO_DOCKER_CERT_PATH_PROPERTY,`
	`181`	`+ DOCKER_IO_DOCKER_CFG_PATH_PROPERTY, }) {`
`182`	`182`	`if (systemProperties.containsKey(key)) {`
`183`	`183`	`overriddenProperties.setProperty(key, systemProperties.getProperty(key));`
`184`	`184`	`}`
`@@ -337,8 +337,7 @@ public int hashCode() {`
`337`	`337`	`public String toString() {`
`338`	`338`	`return "DockerClientConfig{" + "uri=" + uri + ", version='" + version + '\'' + ", username='" + username + '\''`
`339`	`339`	`+ ", password='" + password + '\'' + ", email='" + email + '\'' + ", serverAddress='" + serverAddress`
`340`		`- + '\'' + ", dockerCfgPath='" + dockerCfgPath + '\'' + ", sslConfig='" + sslConfig + '\''`
`341`		`- + '}';`
	`340`	`+ + '\'' + ", dockerCfgPath='" + dockerCfgPath + '\'' + ", sslConfig='" + sslConfig + '\'' + '}';`
`342`	`341`	`}`
`343`	`342`
`344`	`343`	`public static class DockerClientConfigBuilder {`
`@@ -415,7 +414,7 @@ public final DockerClientConfigBuilder withSSLConfig(SSLConfig config) {`
`415`	`414`
`416`	`415`	`public DockerClientConfig build() {`
`417`	`416`	`return new DockerClientConfig(uri, version, username, password, email, serverAddress, dockerCfgPath,`
`418`		`- sslConfig);`
	`417`	`+ sslConfig);`
`419`	`418`	`}`
`420`	`419`	`}`
`421`	`420`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ protected String registryAuth(AuthConfig authConfig) {`
`35`	`35`
`36`	`36`	`protected String registryConfigs(AuthConfigurations authConfigs) {`
`37`	`37`	`try {`
`38`		`- return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfigs).getBytes());`
	`38`	`+ String json = new ObjectMapper().writeValueAsString(authConfigs.getConfigs());`
	`39`	`+ return Base64.encodeBase64String(json.getBytes());`
`39`	`40`	`} catch (IOException e) {`
`40`	`41`	`throw new RuntimeException(e);`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,8 @@ public void init(DockerClientConfig dockerClientConfig) {`
`124`	`124`
`125`	`125`	`if (clientRequestFilters != null) {`
`126`	`126`	`for (ClientRequestFilter clientRequestFilter : clientRequestFilters) {`
`127`		`- if(clientRequestFilter != null)`
`128`		`- clientConfig.register(clientRequestFilter);`
	`127`	`+ if (clientRequestFilter != null)`
	`128`	`+ clientConfig.register(clientRequestFilter);`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -186,8 +186,8 @@ public static void assertContainerHasVolumes(InspectContainerResponse inspectCon`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`protected String containerLog(String containerId) throws Exception {`
`189`		`- return dockerClient.logContainerCmd(containerId).withStdOut()`
`190`		`- .exec(new LogContainerTestCallback()).awaitCompletion().toString();`
	`189`	`+ return dockerClient.logContainerCmd(containerId).withStdOut().exec(new LogContainerTestCallback())`
	`190`	`+ .awaitCompletion().toString();`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`public static class LogContainerTestCallback extends LogContainerResultCallback {`
Original file line number	Diff line number	Diff line change
`@@ -135,5 +135,4 @@ public void asyncMultipleLogContainer() throws Exception {`
`135`	`135`	`assertTrue(loggingCallback.toString().contains(snippet));`
`136`	`136`	`}`
`137`	`137`
`138`		`-`
`139`	`138`	`}`