diff --git a/pom.xml b/pom.xml
index e30e558..eb43a18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,6 @@
UTF-8
6.0.0
- 3.18.0
6.0.1
4.0.2
33.3.1-jre
@@ -94,11 +93,6 @@
guava
${guava.version}
-
- org.apache.commons
- commons-lang3
- ${commons.lang.version}
-
diff --git a/src/main/java/io/beanmapper/spring/util/JsonUtil.java b/src/main/java/io/beanmapper/spring/util/JsonUtil.java
index aa8a5af..efdc328 100644
--- a/src/main/java/io/beanmapper/spring/util/JsonUtil.java
+++ b/src/main/java/io/beanmapper/spring/util/JsonUtil.java
@@ -4,8 +4,6 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.commons.lang3.StringUtils;
-
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -17,10 +15,10 @@
* @since Nov 13, 2015
*/
public class JsonUtil {
-
+
/**
* Retrieve the property names mentioned in a JSON content.
- *
+ *
* @param json the JSON content
* @param objectMapper the object mapper
* @return set of the property names
@@ -33,17 +31,21 @@ public static Set getPropertyNamesFromJson(String json, ObjectMapper obj
throw new IllegalStateException("Could not retrieve property names from JSON.", e);
}
}
-
+
private static Set getPropertyNames(JsonNode node, String base) {
Set propertyNames = new HashSet<>();
Iterator iterator = node.fieldNames();
while (iterator.hasNext()) {
String fieldName = iterator.next();
- String propertyName = StringUtils.isEmpty(base) ? fieldName : base + "." + fieldName;
+
+ String propertyName = isEmpty(base) ? fieldName : base + "." + fieldName;
propertyNames.add(propertyName);
propertyNames.addAll(getPropertyNames(node.get(fieldName), propertyName));
}
return propertyNames;
}
-}
+ private static boolean isEmpty(String str) {
+ return str == null || str.isEmpty();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/io/beanmapper/spring/web/MergedFormMethodArgumentResolver.java b/src/main/java/io/beanmapper/spring/web/MergedFormMethodArgumentResolver.java
index 4a88bee..5764a00 100644
--- a/src/main/java/io/beanmapper/spring/web/MergedFormMethodArgumentResolver.java
+++ b/src/main/java/io/beanmapper/spring/web/MergedFormMethodArgumentResolver.java
@@ -15,7 +15,6 @@
import io.beanmapper.spring.Lazy;
import io.beanmapper.spring.web.converter.StructuredBody;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
@@ -134,7 +133,7 @@ private void validateObject(WebRequestParameters webRequestParameters, Object ob
}
private Long resolveId(NativeWebRequest webRequest, String mergeId) {
- if (StringUtils.isEmpty(mergeId)) {
+ if(mergeId == null || mergeId.isEmpty()) {
return null;
}