StringUtils to check empty string

geonetwork · Mar 7, 2017 · 26d2a8c · 26d2a8c
1 parent b67b129
commit 26d2a8c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/oaipmh/Harvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/oaipmh/Harvester.java
@@ -34,6 +34,7 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.commons.lang.StringUtils;
 import org.eclipse.emf.common.command.AbortExecutionException;
 import org.fao.geonet.GeonetContext;
 import org.fao.geonet.Logger;
@@ -328,7 +329,7 @@ private void addMetadata(XmlRequest t, RecordInfo ri, String processName, Map<St
 
 
         // Apply the xsl filter choosed by UI
-        if (!params.xslfilter.equals("")) {
+        if (StringUtils.isNotEmpty(params.xslfilter)) {
             md = HarvesterUtil.processMetadata(dataMan.getSchema(schema),
                     md, processName, processParams, log);
         }
@@ -490,7 +491,7 @@ private void updateMetadata(XmlRequest t, RecordInfo ri, String id, String proce
 			String schema = dataMan.autodetectSchema(md, null);
 
 			// Apply the xsl filter choosed by UI
-			if (!params.xslfilter.equals("")) {
+			if (StringUtils.isNotEmpty(params.xslfilter)) {
 			    md = HarvesterUtil.processMetadata(dataMan.getSchema(schema),
 			            md, processName, processParams, log);
 			}

diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/oaipmh/Search.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/oaipmh/Search.java
@@ -25,6 +25,7 @@
 
 import java.util.Date;
 
+import org.apache.commons.lang.StringUtils;
 import org.fao.geonet.Util;
 import org.fao.geonet.domain.ISODate;
 import org.fao.geonet.exceptions.BadInputEx;
@@ -60,7 +61,7 @@ public Search(Element search) throws BadInputEx
 
 		try
 		{
-		    if (!from.equals("") && !from.equals("Invalid Date")) {
+		    if (StringUtils.isNotEmpty(from) && !from.equalsIgnoreCase("Invalid Date")) {
 				fromDate = new ISODate(from);
 				from     = fromDate.getDateAsString();
 			} else {
@@ -77,7 +78,7 @@ public Search(Element search) throws BadInputEx
 
 		try
 		{
-		    if (!until.equals("") && !until.equals("Invalid Date")) {
+		    if (StringUtils.isNotEmpty(until) && !until.equalsIgnoreCase("Invalid Date")) {
 				untilDate = new ISODate(until);
 				until     = untilDate.getDateAsString();
 			} else {