Fix resolving of transient properties in new Spring Framework version

croz-ltd · May 6, 2024 · a648571 · a648571
1 parent 89ba993
commit a648571
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...webmvc/src/main/java/net/croz/nrich/webmvc/advice/ControllerEditorRegistrationAdvice.java b/...webmvc/src/main/java/net/croz/nrich/webmvc/advice/ControllerEditorRegistrationAdvice.java
@@ -43,13 +43,19 @@ public void initBinder(WebDataBinder binder) {
         }
 
         if (ignoreTransientFields) {
-            Object target = binder.getTarget();
+            Class<?> targetType = null;
+            if (binder.getTarget() != null) {
+                targetType = binder.getTarget().getClass();
+            }
+            else if (binder.getTargetType() != null) {
+                targetType = binder.getTargetType().resolve();
+            }
 
-            if (target == null) {
+            if (targetType == null) {
                 return;
             }
 
-            List<String> transientPropertyList = transientPropertyResolverService.resolveTransientPropertyList(target.getClass());
+            List<String> transientPropertyList = transientPropertyResolverService.resolveTransientPropertyList(targetType);
 
             binder.setDisallowedFields(transientPropertyList.toArray(new String[0]));
         }

diff --git a/...vc/src/test/java/net/croz/nrich/webmvc/advice/ControllerEditorRegistrationAdviceTest.java b/...vc/src/test/java/net/croz/nrich/webmvc/advice/ControllerEditorRegistrationAdviceTest.java
@@ -62,7 +62,6 @@ void shouldConvertEmptyStringsToNull() throws Exception {
     void shouldNotBindTransientFields() throws Exception {
         // given
         String requestUrl = fullUrl("transient-properties-serialization");
-        String value = "value";
         Map<String, String> request = createMap("transientProperty", "transient", "property", "nonTransient");
 
         // when