Skip to content

Commit 2f3e364

Browse files
shekhar-srivastavazhendrikse
authored andcommitted
Moved article code to libraries, added a null check and reverted change to core-java pom.xml (eugenp#2530)
1 parent 9c03b45 commit 2f3e364

2 files changed

Lines changed: 8 additions & 14 deletions

File tree

core-java/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,6 @@
162162
<version>${avaitility.version}</version>
163163
<scope>test</scope>
164164
</dependency>
165-
<dependency>
166-
<groupId>org.springframework</groupId>
167-
<artifactId>spring-core</artifactId>
168-
<version>${spring-core.version}</version>
169-
<scope>test</scope>
170-
</dependency>
171165

172166
<dependency>
173167
<groupId>commons-codec</groupId>
@@ -433,8 +427,6 @@
433427
<mockito.version>2.8.9</mockito.version>
434428
<assertj.version>3.6.1</assertj.version>
435429
<avaitility.version>1.7.0</avaitility.version>
436-
<spring-core.version>4.3.10.RELEASE</spring-core.version>
437-
438430

439431
<!-- maven plugins -->
440432
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>

core-java/src/test/java/org/baeldung/java/io/JavaDirectoryDeleteUnitTest.java renamed to libraries/src/test/java/com/baeldung/java/io/JavaDirectoryDeleteUnitTest.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.java.io;
1+
package com.baeldung.java.io;
22

33
import static org.junit.Assert.assertFalse;
44
import static org.junit.Assert.assertTrue;
@@ -68,11 +68,13 @@ public void checkAndCleanupIfRequired() throws IOException {
6868
boolean deleteDirectory(File directoryToBeDeleted) {
6969
File[] allContents = directoryToBeDeleted.listFiles();
7070

71-
for (File file : allContents) {
72-
if (file.isDirectory()) {
73-
deleteDirectory(file);
74-
} else {
75-
file.delete();
71+
if (allContents != null) {
72+
for (File file : allContents) {
73+
if (file.isDirectory()) {
74+
deleteDirectory(file);
75+
} else {
76+
file.delete();
77+
}
7678
}
7779
}
7880

0 commit comments

Comments
 (0)