From 28f2f39be8498ade8d4791ca98462692e2325961 Mon Sep 17 00:00:00 2001 From: Stephan Zednik Date: Tue, 28 Jun 2016 11:49:32 -0600 Subject: [PATCH 1/2] update containsNullOrEmpty() to check if list is empty Also updated the method to use Apache Commons StringUtil::isBlank(String) function to test for blank values in the list. --- .../edit/n3editing/VTwo/EditN3GeneratorVTwo.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java index 980b538da..78278c502 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java @@ -11,6 +11,7 @@ import java.util.Map; import java.util.Set; import java.util.regex.Matcher; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -78,8 +79,14 @@ public class EditN3GeneratorVTwo { } } - private boolean containsNullOrEmpty(List values) { - return values != null && ( values.contains(null) || values.contains("") ); + private boolean containsNullOrEmpty(List values) { + //return values != null && ( values.contains(null) || values.contains("") ); + if(values == null) return true ; + if(values.isEmpty()) return true ; + for(String str : values) { + if(StringUtils.isBlank(str)) return true ; + } + return false; } /** From 687d7e23ed830b3e84e09482441374c128bb1e91 Mon Sep 17 00:00:00 2001 From: Stephan Zednik Date: Tue, 28 Jun 2016 15:02:53 -0600 Subject: [PATCH 2/2] combined conditional and removed commented code --- .../vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java index 78278c502..3c4fa9fd7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java @@ -80,9 +80,7 @@ public class EditN3GeneratorVTwo { } private boolean containsNullOrEmpty(List values) { - //return values != null && ( values.contains(null) || values.contains("") ); - if(values == null) return true ; - if(values.isEmpty()) return true ; + if(values == null || values.isEmpty()) return true ; for(String str : values) { if(StringUtils.isBlank(str)) return true ; }