Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<!-- Dependency versions -->
<spring.boot.version>4.0.6</spring.boot.version>
<beanmapper.version>5.0.0</beanmapper.version>
<beanmapper.version>7.0.2</beanmapper.version>
<commons-lang.version>3.18.0</commons-lang.version>

<!-- Plugin versions -->
Expand Down Expand Up @@ -99,7 +99,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>provided</scope>
</dependency>
Expand Down
289 changes: 0 additions & 289 deletions pom.xml.versionsBackup

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/
package nl._42.restzilla.config;

import com.fasterxml.jackson.databind.ObjectMapper;
import io.beanmapper.BeanMapper;
import io.beanmapper.config.BeanMapperBuilder;
import io.beanmapper.utils.Classes;
Expand All @@ -30,6 +29,7 @@
import org.springframework.util.ClassUtils;
import org.springframework.validation.Validator;
import org.springframework.web.servlet.HandlerMapping;
import tools.jackson.databind.ObjectMapper;

import java.util.HashSet;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package nl._42.restzilla.web;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.io.CharStreams;
import io.beanmapper.BeanMapper;
import jakarta.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -32,6 +31,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.method.HandlerMethod;
import tools.jackson.databind.ObjectMapper;

import java.io.Serializable;
import java.lang.reflect.Method;
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/nl/_42/restzilla/web/util/JsonUtil.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package nl._42.restzilla.web.util;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import tools.jackson.databind.JsonNode;
import tools.jackson.databind.ObjectMapper;
import org.springframework.util.StringUtils;

import java.io.IOException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
Expand All @@ -28,14 +27,14 @@ public static Set<String> getPropertyNamesFromJson(String json, ObjectMapper obj
try {
JsonNode tree = objectMapper.readTree(json);
return getPropertyNames(tree, "");
} catch (IOException e) {
} catch (RuntimeException e) {
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();
Iterator<String> iterator = node.propertyNames().iterator();
while (iterator.hasNext()) {
String fieldName = iterator.next();
String propertyName = StringUtils.isEmpty(base) ? fieldName : base + "." + fieldName;
Expand Down
Loading
Loading