Moved article code to libraries, added a null check and reverted change to core-java pom.xml (#2530)

This commit is contained in:
shekhar-s 2017-08-31 02:10:37 -06:00 committed by Zeger Hendrikse
parent 9c03b45c23
commit 2f3e36405a
2 changed files with 8 additions and 14 deletions

View File

@ -162,12 +162,6 @@
<version>${avaitility.version}</version> <version>${avaitility.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring-core.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
@ -433,8 +427,6 @@
<mockito.version>2.8.9</mockito.version> <mockito.version>2.8.9</mockito.version>
<assertj.version>3.6.1</assertj.version> <assertj.version>3.6.1</assertj.version>
<avaitility.version>1.7.0</avaitility.version> <avaitility.version>1.7.0</avaitility.version>
<spring-core.version>4.3.10.RELEASE</spring-core.version>
<!-- maven plugins --> <!-- maven plugins -->
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version> <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>

View File

@ -1,4 +1,4 @@
package org.baeldung.java.io; package com.baeldung.java.io;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -68,6 +68,7 @@ public class JavaDirectoryDeleteUnitTest {
boolean deleteDirectory(File directoryToBeDeleted) { boolean deleteDirectory(File directoryToBeDeleted) {
File[] allContents = directoryToBeDeleted.listFiles(); File[] allContents = directoryToBeDeleted.listFiles();
if (allContents != null) {
for (File file : allContents) { for (File file : allContents) {
if (file.isDirectory()) { if (file.isDirectory()) {
deleteDirectory(file); deleteDirectory(file);
@ -75,6 +76,7 @@ public class JavaDirectoryDeleteUnitTest {
file.delete(); file.delete();
} }
} }
}
return directoryToBeDeleted.delete(); return directoryToBeDeleted.delete();
} }