Skip to content

Commit

Permalink
fix: Apply feedback and add changelog.
Browse files Browse the repository at this point in the history
  • Loading branch information
iocanel committed Mar 26, 2019
1 parent 6ae92cf commit 725ccd8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
Improvements

* Fix #1425: Preserve labels and fields when using CRD's withResourceVersion()
* Introduce file and dir read / copy from pods

Dependency Upgrade
* Upgrade Sundrio to 0.16.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package io.fabric8.kubernetes.client.dsl.internal;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -331,12 +330,12 @@ public InputStream read() {
}
}

private InputStream readFile(String source) throws Exception {
private InputStream readFile(String source) {
//Let's wrap the code to a callable inner class to avoid NoClassDef when loading this class.
try {
return new Callable<InputStream>() {
@Override
public InputStream call() throws Exception {
public InputStream call() {
try {
PipedOutputStream out = new PipedOutputStream();
PipedInputStream in = new PipedInputStream(out, 1024);
Expand Down Expand Up @@ -374,8 +373,8 @@ public void onClose(int code, String reason) {

//
//
// The copy and read utilities below have been inspired by Brendan Burns copy utilities on the offical kubernetes-client.
// More specifically: https://github.com/fabric8io/kubernetes-client/pull/1444
// The copy and read utilities below have been inspired by Brendan Burns copy utilities on the official kubernetes-client.
// More specifically: https://github.com/kubernetes-client/java/pull/375
//

private void copyFile(String source, File target) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

@RunWith(ArquillianConditionalRunner.class)
Expand Down

0 comments on commit 725ccd8

Please sign in to comment.