DSS-1431 : TSLRepository#clearRepository() fails if the cache directo…

…ry doesn't exist
bhushan5640 · Sep 13, 2018 · 6646425 · 6646425
1 parent 076cd47
commit 6646425
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 10 deletions.
diff --git a/dss-tsl-validation/src/main/java/eu/europa/esig/dss/tsl/service/TSLRepository.java b/dss-tsl-validation/src/main/java/eu/europa/esig/dss/tsl/service/TSLRepository.java
@@ -80,6 +80,10 @@ public void setCacheDirectoryPath(String cacheDirectoryPath) {
 		this.cacheDirectoryPath = cacheDirectoryPath;
 	}
 
+	public String getCacheDirectoryPath() {
+		return cacheDirectoryPath;
+	}
+
 	public void setTrustedListsCertificateSource(TrustedListsCertificateSource trustedListsCertificateSource) {
 		this.trustedListsCertificateSource = trustedListsCertificateSource;
 	}
@@ -96,13 +100,9 @@ public Map<String, TSLValidationModel> getAllMapTSLValidationModels() {
 		return Collections.unmodifiableMap(new TreeMap<String, TSLValidationModel>(tsls));
 	}
 
-	public void clearRepository() {
-		try {
-			Utils.cleanDirectory(new File(cacheDirectoryPath));
-			tsls.clear();
-		} catch (IOException e) {
-			LOG.error("Unable to clean cache directory : " + e.getMessage(), e);
-		}
+	public void clearRepository() throws IOException {
+		Utils.cleanDirectory(new File(cacheDirectoryPath));
+		tsls.clear();
 	}
 
 	boolean isLastCountryVersion(TSLLoaderResult resultLoader) {

diff --git a/dss-tsl-validation/src/test/java/eu/europa/esig/dss/tsl/service/TSLRepositoryTest.java b/dss-tsl-validation/src/test/java/eu/europa/esig/dss/tsl/service/TSLRepositoryTest.java
@@ -0,0 +1,48 @@
+package eu.europa.esig.dss.tsl.service;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+public class TSLRepositoryTest {
+
+	@Rule
+	public TemporaryFolder folder = new TemporaryFolder();
+
+	@Test
+	public void clear() throws IOException {
+		File testFolder = folder.newFolder("test");
+		createFile(testFolder, "test1.xml");
+
+		assertEquals(1, testFolder.listFiles().length);
+
+		TSLRepository repo = new TSLRepository();
+		repo.setCacheDirectoryPath(testFolder.getAbsolutePath());
+		repo.clearRepository();
+		assertEquals(0, testFolder.listFiles().length);
+		assertTrue(testFolder.exists());
+	}
+
+	@Test(expected = FileNotFoundException.class)
+	public void clearFolderNotExist() throws IOException {
+		TSLRepository repo = new TSLRepository();
+		repo.setCacheDirectoryPath("wrong");
+		repo.clearRepository();
+	}
+
+	private void createFile(File folder, String name) throws IOException {
+		File file = new File(folder, name);
+		try (FileOutputStream fos = new FileOutputStream(file)) {
+			fos.write(0);
+		}
+	}
+
+}
diff --git a/dss-utils-apache-commons/src/main/java/eu/europa/esig/dss/utils/impl/ApacheCommonsUtils.java b/dss-utils-apache-commons/src/main/java/eu/europa/esig/dss/utils/impl/ApacheCommonsUtils.java
@@ -2,6 +2,7 @@
 
 import java.io.Closeable;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -181,7 +182,12 @@ public void write(byte[] content, OutputStream os) throws IOException {
 
 	@Override
 	public void cleanDirectory(File directory) throws IOException {
-		FileUtils.cleanDirectory(directory);
+		try {
+			FileUtils.cleanDirectory(directory);
+		} catch (IllegalArgumentException e) {
+			// Apache throws IllegalArgumentException
+			throw new FileNotFoundException(e.getMessage());
+		}
 	}
 
 	@Override

diff --git a/dss-utils-google-guava/src/main/java/eu/europa/esig/dss/utils/impl/GoogleGuavaUtils.java b/dss-utils-google-guava/src/main/java/eu/europa/esig/dss/utils/impl/GoogleGuavaUtils.java
@@ -3,11 +3,13 @@
 import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Objects;
 
 import com.google.common.base.Ascii;
 import com.google.common.base.CharMatcher;
@@ -228,8 +230,9 @@ public void write(byte[] content, OutputStream os) throws IOException {
 
 	@Override
 	public void cleanDirectory(File directory) throws IOException {
-		if (directory == null || !directory.exists()) {
-			throw new IllegalArgumentException("Not exists");
+		Objects.requireNonNull(directory, "Directory cannot be null");
+		if (!directory.exists() || !directory.isDirectory()) {
+			throw new FileNotFoundException("Directory '" + directory.getAbsolutePath() + "' not found");
 		} else if (directory.isDirectory()) {
 			File[] listFiles = directory.listFiles();
 			if (listFiles != null) {

diff --git a/dss-utils/src/test/java/eu/europa/esig/dss/utils/impl/AbstractUtilsTest.java b/dss-utils/src/test/java/eu/europa/esig/dss/utils/impl/AbstractUtilsTest.java
@@ -9,19 +9,25 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 import eu.europa.esig.dss.utils.Utils;
 
 public abstract class AbstractUtilsTest {
 
+	@Rule
+	public TemporaryFolder folder = new TemporaryFolder();
+
 	@Test
 	public void isStringEmpty() {
 		assertTrue(Utils.isStringEmpty(""));
@@ -295,4 +301,16 @@ public void listFiles() {
 		listFiles = Utils.listFiles(folder, extensions, true);
 		assertTrue(Utils.isCollectionEmpty(listFiles));
 	}
+
+	@Test
+	public void clearDirectory() throws IOException {
+		File tempFolder = folder.newFolder("test");
+		Utils.cleanDirectory(tempFolder);
+	}
+
+	@Test(expected = FileNotFoundException.class)
+	public void clearDirectoryNotFound() throws IOException {
+		Utils.cleanDirectory(new File("wrong"));
+	}
+
 }