Skip to content

Commit 88ac98a

Browse files
committed
Remove unnecessary use of commons-io
1 parent f47525b commit 88ac98a

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ dependencies {
6464
compileOnly project.deps.gocdPluginApi
6565
implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
6666
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
67-
implementation group: 'commons-io', name: 'commons-io', version: '2.11.0'
6867
implementation group: 'io.fabric8', name: 'kubernetes-client', version: '5.12.4'
6968
implementation group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.9.10'
7069
implementation group: 'org.freemarker', name: 'freemarker', version: '2.3.32'

src/main/java/cd/go/contrib/elasticagent/KubernetesInstanceFactory.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@
2626
import com.github.mustachejava.MustacheFactory;
2727
import io.fabric8.kubernetes.api.model.*;
2828
import io.fabric8.kubernetes.client.KubernetesClient;
29-
import org.apache.commons.io.FileUtils;
3029
import org.apache.commons.lang3.StringUtils;
3130

32-
import java.io.File;
3331
import java.io.IOException;
32+
import java.io.InputStream;
3433
import java.io.StringReader;
3534
import java.io.StringWriter;
3635
import java.net.URL;
36+
import java.nio.file.Files;
37+
import java.nio.file.Path;
3738
import java.time.Instant;
3839
import java.time.format.DateTimeParseException;
3940
import java.util.*;
@@ -262,17 +263,16 @@ else if ("yaml".equalsIgnoreCase(fileType)) {
262263
throw new IllegalArgumentException("RemoteFileType value should be one of `json` or `yaml`.");
263264
}
264265

265-
File podSpecFile = new File(String.format("pod_spec_%s", UUID.randomUUID().toString()));
266-
try {
267-
FileUtils.copyURLToFile(new URL(fileToDownload), podSpecFile);
266+
Path podSpecFile = Path.of(String.format("pod_spec_%s", UUID.randomUUID()));
267+
try (InputStream downloadStream = new URL(fileToDownload).openStream()){
268+
Files.copy(downloadStream, podSpecFile);
268269
LOG.debug(format("Finished downloading %s to %s", fileToDownload, podSpecFile));
269-
String spec = FileUtils.readFileToString(podSpecFile, UTF_8);
270+
String spec = Files.readString(podSpecFile, UTF_8);
270271
String templatizedPodSpec = getTemplatizedPodSpec(spec);
271272
elasticAgentPod = mapper.readValue(templatizedPodSpec, Pod.class);
272273
setPodNameIfNecessary(elasticAgentPod, spec);
273-
FileUtils.deleteQuietly(podSpecFile);
274+
Files.deleteIfExists(podSpecFile);
274275
LOG.debug(format("Deleted %s", podSpecFile));
275-
276276
} catch (IOException e) {
277277
//ignore error here, handle this inside validate profile!
278278
LOG.error(e.getMessage());

src/test/java/cd/go/contrib/elasticagent/KubernetesAgentInstancesIntegrationTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,12 @@
2222
import io.fabric8.kubernetes.client.KubernetesClient;
2323
import io.fabric8.kubernetes.client.dsl.MixedOperation;
2424
import io.fabric8.kubernetes.client.dsl.PodResource;
25-
import org.apache.commons.io.FileUtils;
26-
import org.junit.jupiter.api.AfterEach;
2725
import org.junit.jupiter.api.BeforeEach;
2826
import org.junit.jupiter.api.Test;
2927
import org.mockito.ArgumentCaptor;
3028
import org.mockito.Mock;
3129
import org.mockito.stubbing.Answer;
3230

33-
import java.io.File;
3431
import java.util.ArrayList;
3532
import java.util.HashMap;
3633
import java.util.List;
@@ -83,11 +80,6 @@ public void setUp() {
8380
settings = PluginSettingsMother.defaultPluginSettings();
8481
}
8582

86-
@AfterEach
87-
public void tearDown() {
88-
FileUtils.deleteQuietly(new File("pod_spec"));
89-
}
90-
9183
@Test
9284
public void shouldCreateKubernetesPodForCreateAgentRequest() {
9385
KubernetesInstance kubernetesInstance = kubernetesAgentInstances.create(createAgentRequest, settings, mockedPluginRequest, consoleLogAppender);

0 commit comments

Comments
 (0)