Merge pull request #1573 from /issues/1572-json-null

Fix #1572: Handle explicit null JSON value in final fields
wultra · Feb 9, 2024 · 6ecf88c · 6ecf88c
2 parents de5499f + 41a84d1
commit 6ecf88c
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 0 deletions.
diff --git a/...src/main/java/io/getlime/security/powerauth/lib/dataadapter/model/request/AfsRequest.java b/...src/main/java/io/getlime/security/powerauth/lib/dataadapter/model/request/AfsRequest.java
@@ -17,6 +17,8 @@
  */
 package io.getlime.security.powerauth.lib.dataadapter.model.request;
 
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import io.getlime.security.powerauth.lib.dataadapter.model.entity.OperationContext;
 
 import java.util.LinkedHashMap;
@@ -52,6 +54,7 @@ public class AfsRequest {
     /**
      * Extra parameters sent with the request depending on AFS type, e.g. cookies for Threat Mark.
      */
+    @JsonSetter(nulls = Nulls.SKIP)
     private final Map<String, Object> extras = new LinkedHashMap<>();
 
     /**

diff --git a/...a/io/getlime/security/powerauth/lib/dataadapter/model/request/SaveConsentFormRequest.java b/...a/io/getlime/security/powerauth/lib/dataadapter/model/request/SaveConsentFormRequest.java
@@ -17,6 +17,8 @@
  */
 package io.getlime.security.powerauth.lib.dataadapter.model.request;
 
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import io.getlime.security.powerauth.lib.dataadapter.model.entity.ConsentOption;
 import io.getlime.security.powerauth.lib.dataadapter.model.entity.OperationContext;
 
@@ -48,6 +50,7 @@ public class SaveConsentFormRequest {
     /**
      * Consent options with values set by the user.
      */
+    @JsonSetter(nulls = Nulls.SKIP)
     private final List<ConsentOption> options;
 
     /**

diff --git a/.../getlime/security/powerauth/lib/dataadapter/model/request/ValidateConsentFormRequest.java b/.../getlime/security/powerauth/lib/dataadapter/model/request/ValidateConsentFormRequest.java
@@ -17,6 +17,8 @@
  */
 package io.getlime.security.powerauth.lib.dataadapter.model.request;
 
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import io.getlime.security.powerauth.lib.dataadapter.model.entity.ConsentOption;
 import io.getlime.security.powerauth.lib.dataadapter.model.entity.OperationContext;
 
@@ -53,6 +55,7 @@ public class ValidateConsentFormRequest {
     /**
      * Consent options with values set by the user.
      */
+    @JsonSetter(nulls = Nulls.SKIP)
     private final List<ConsentOption> options;
 
     /**

diff --git a/...ava/io/getlime/security/powerauth/lib/nextstep/model/request/CreateHashConfigRequest.java b/...ava/io/getlime/security/powerauth/lib/nextstep/model/request/CreateHashConfigRequest.java
@@ -17,6 +17,8 @@
  */
 package io.getlime.security.powerauth.lib.nextstep.model.request;
 
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import io.getlime.security.powerauth.lib.nextstep.model.entity.enumeration.HashAlgorithm;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -39,6 +41,8 @@ public class CreateHashConfigRequest {
     private String hashConfigName;
     @NotNull
     private HashAlgorithm algorithm;
+
+    @JsonSetter(nulls = Nulls.SKIP)
     private final Map<String, String> parameters = new LinkedHashMap<>();
 
 }
diff --git a/...java/io/getlime/security/powerauth/lib/nextstep/model/request/CreateOperationRequest.java b/...java/io/getlime/security/powerauth/lib/nextstep/model/request/CreateOperationRequest.java
@@ -17,6 +17,8 @@
  */
 package io.getlime.security.powerauth.lib.nextstep.model.request;
 
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import io.getlime.security.powerauth.lib.nextstep.model.entity.ApplicationContext;
 import io.getlime.security.powerauth.lib.nextstep.model.entity.KeyValueParameter;
 import io.getlime.security.powerauth.lib.nextstep.model.entity.OperationFormData;
@@ -52,6 +54,8 @@ public class CreateOperationRequest {
     private String organizationId;
     @Size(min = 1, max = 256)
     private String externalTransactionId;
+
+    @JsonSetter(nulls = Nulls.SKIP)
     private final List<KeyValueParameter> params = new ArrayList<>();
     private OperationFormData formData;
     private ApplicationContext applicationContext;

diff --git a/...java/io/getlime/security/powerauth/lib/nextstep/model/request/CreateUserAliasRequest.java b/...java/io/getlime/security/powerauth/lib/nextstep/model/request/CreateUserAliasRequest.java
@@ -17,6 +17,8 @@
  */
 package io.getlime.security.powerauth.lib.nextstep.model.request;
 
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
@@ -41,6 +43,8 @@ public class CreateUserAliasRequest {
     @NotBlank
     @Size(min = 2, max = 256)
     private String aliasValue;
+
+    @JsonSetter(nulls = Nulls.SKIP)
     private final Map<String, Object> extras = new LinkedHashMap<>();
 
 }
diff --git a/...main/java/io/getlime/security/powerauth/lib/nextstep/model/request/CreateUserRequest.java b/...main/java/io/getlime/security/powerauth/lib/nextstep/model/request/CreateUserRequest.java
@@ -17,6 +17,8 @@
  */
 package io.getlime.security.powerauth.lib.nextstep.model.request;
 
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import io.getlime.security.powerauth.lib.nextstep.model.entity.enumeration.ContactType;
 import io.getlime.security.powerauth.lib.nextstep.model.entity.enumeration.CredentialType;
 import io.getlime.security.powerauth.lib.nextstep.model.entity.enumeration.CredentialValidationMode;
@@ -40,14 +42,18 @@ public class CreateUserRequest {
     @Size(min = 1, max = 256)
     private String userId;
 
+    @JsonSetter(nulls = Nulls.SKIP)
     private final Map<String, Object> extras = new LinkedHashMap<>();
 
+    @JsonSetter(nulls = Nulls.SKIP)
     private final List<String> roles = new ArrayList<>();
 
     @Valid
+    @JsonSetter(nulls = Nulls.SKIP)
     private final List<NewContact> contacts = new ArrayList<>();
 
     @Valid
+    @JsonSetter(nulls = Nulls.SKIP)
     private final List<NewCredential> credentials = new ArrayList<>();
 
     /**
@@ -87,6 +93,7 @@ public static class NewCredential {
         // Null value allowed, defaults to CredentialValidationMode.VALIDATE_USERNAME_AND_CREDENTIAL
         private CredentialValidationMode validationMode;
         @Valid
+        @JsonSetter(nulls = Nulls.SKIP)
         private final List<CredentialHistory> credentialHistory = new ArrayList<>();
 
     }

diff --git a/...ain/java/io/getlime/security/powerauth/lib/nextstep/model/request/LookupUsersRequest.java b/...ain/java/io/getlime/security/powerauth/lib/nextstep/model/request/LookupUsersRequest.java
@@ -17,6 +17,8 @@
  */
 package io.getlime.security.powerauth.lib.nextstep.model.request;
 
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import io.getlime.security.powerauth.lib.nextstep.model.entity.enumeration.CredentialStatus;
 import io.getlime.security.powerauth.lib.nextstep.model.entity.enumeration.UserIdentityStatus;
 import jakarta.validation.constraints.Size;
@@ -42,6 +44,7 @@ public class LookupUsersRequest {
     private UserIdentityStatus userIdentityStatus;
 
     // Filter by roles
+    @JsonSetter(nulls = Nulls.SKIP)
     private final List<String> roles = new ArrayList<>();
 
     // Filter by username and credentialName to allow username -> user ID mapping

diff --git a/...ava/io/getlime/security/powerauth/lib/nextstep/model/request/UpdateAuthMethodRequest.java b/...ava/io/getlime/security/powerauth/lib/nextstep/model/request/UpdateAuthMethodRequest.java
@@ -17,6 +17,8 @@
  */
 package io.getlime.security.powerauth.lib.nextstep.model.request;
 
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import io.getlime.security.powerauth.lib.nextstep.model.enumeration.AuthMethod;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -40,6 +42,7 @@ public class UpdateAuthMethodRequest {
     @NotNull
     private AuthMethod authMethod;
     @NotNull
+    @JsonSetter(nulls = Nulls.SKIP)
     private final Map<String, String> config = new LinkedHashMap<>();
 
 }
diff --git a/...java/io/getlime/security/powerauth/lib/nextstep/model/request/UpdateOperationRequest.java b/...java/io/getlime/security/powerauth/lib/nextstep/model/request/UpdateOperationRequest.java
@@ -17,6 +17,8 @@
  */
 package io.getlime.security.powerauth.lib.nextstep.model.request;
 
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import io.getlime.security.powerauth.lib.nextstep.model.entity.ApplicationContext;
 import io.getlime.security.powerauth.lib.nextstep.model.entity.KeyValueParameter;
 import io.getlime.security.powerauth.lib.nextstep.model.entity.PAAuthenticationContext;
@@ -46,11 +48,15 @@ public class UpdateOperationRequest {
     @Size(min = 2, max = 256)
     private String organizationId;
     private AuthMethod authMethod;
+
+    @JsonSetter(nulls = Nulls.SKIP)
     private final List<AuthInstrument> authInstruments = new ArrayList<>();
     private AuthStepResult authStepResult;
     private AuthMethod targetAuthMethod;
     @Size(min = 2, max = 256)
     private String authStepResultDescription;
+
+    @JsonSetter(nulls = Nulls.SKIP)
     private final List<KeyValueParameter> params = new ArrayList<>();
     private ApplicationContext applicationContext;
     @Size(min = 36, max = 36)

diff --git a/...ain/java/io/getlime/security/powerauth/lib/nextstep/model/request/UpdateUsersRequest.java b/...ain/java/io/getlime/security/powerauth/lib/nextstep/model/request/UpdateUsersRequest.java
@@ -17,6 +17,8 @@
  */
 package io.getlime.security.powerauth.lib.nextstep.model.request;
 
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import io.getlime.security.powerauth.lib.nextstep.model.entity.enumeration.UserIdentityStatus;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -33,6 +35,7 @@
 public class UpdateUsersRequest {
 
     @NotNull
+    @JsonSetter(nulls = Nulls.SKIP)
     private final List<String> userIds = new ArrayList<>();
     @NotNull
     private UserIdentityStatus userIdentityStatus;