Skip to content

remove commons-lang3 and replace isEmpty checks #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThijsMesman merged 1 commit into from
Jul 29, 2025
Merged

remove commons-lang3 and replace isEmpty checks #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<beanmapper.version>6.0.0</beanmapper.version>
<commons.lang.version>3.18.0</commons.lang.version>
<el.api.version>6.0.1</el.api.version>
<el.impl.version>4.0.2</el.impl.version>
<guava.version>33.3.1-jre</guava.version>
Expand Down Expand Up @@ -94,11 +93,6 @@
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang.version}</version>
</dependency>

<!-- Spring integration -->
<dependency>
Expand Down
16 changes: 9 additions & 7 deletions src/main/java/io/beanmapper/spring/util/JsonUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -33,17 +31,21 @@ public static Set<String> getPropertyNamesFromJson(String json, ObjectMapper obj
throw new IllegalStateException("Could not retrieve property names from JSON.", e);
}
}

private static Set<String> getPropertyNames(JsonNode node, String base) {
Set<String> propertyNames = new HashSet<>();
Iterator<String> 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();
}
}
3 changes: 1 addition & 2 deletions src/main/java/io/beanmapper/spring/web/MergedFormMethodArgumentResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down