From 639fdbe0a2b96a580b4d28053f9a71b266cba5a3 Mon Sep 17 00:00:00 2001 From: Abraham Elmahrek Date: Mon, 16 Mar 2015 20:27:12 -0700 Subject: [PATCH] SQOOP-2219: Sqoop2: Skip missing input in DirectoryExistsValidator (Jarek Jarcec Cecho via Abraham Elmahrek) --- .../validators/DirectoryExistsValidator.java | 5 +++++ .../validators/TestDirectoryExistsValidator.java | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/common/src/main/java/org/apache/sqoop/validation/validators/DirectoryExistsValidator.java b/common/src/main/java/org/apache/sqoop/validation/validators/DirectoryExistsValidator.java index d81e6b03..60fda502 100644 --- a/common/src/main/java/org/apache/sqoop/validation/validators/DirectoryExistsValidator.java +++ b/common/src/main/java/org/apache/sqoop/validation/validators/DirectoryExistsValidator.java @@ -17,6 +17,7 @@ */ package org.apache.sqoop.validation.validators; +import org.apache.commons.lang.StringUtils; import org.apache.sqoop.validation.Status; import java.io.File; @@ -27,6 +28,10 @@ public class DirectoryExistsValidator extends AbstractValidator { @Override public void validate(String filePath) { + if(StringUtils.isBlank(filePath)) { + return; + } + File file = new File(filePath); if(!file.exists()) { diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestDirectoryExistsValidator.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestDirectoryExistsValidator.java index e6c4ec30..458aa899 100644 --- a/common/src/test/java/org/apache/sqoop/validation/validators/TestDirectoryExistsValidator.java +++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestDirectoryExistsValidator.java @@ -38,6 +38,19 @@ public void setUp() { assertEquals(0, validator.getMessages().size()); } + @Test + public void testNull() { + validator.validate(null); + assertEquals(Status.OK, validator.getStatus()); + } + + @Test + public void testEmpty() { + validator.validate(""); + assertEquals(Status.OK, validator.getStatus()); + } + + @Test public void testExistingDirectory() { File tmpDir = Files.createTempDir();