Refactor

Author: CTMBNara

src/main/java/org/prebid/server/auction/externalortb/ProfilesProcessor.java

@@ -12,7 +12,6 @@
 import org.prebid.server.exception.InvalidRequestException;
 import org.prebid.server.execution.timeout.Timeout;
 import org.prebid.server.execution.timeout.TimeoutFactory;
-import org.prebid.server.json.DecodeException;
 import org.prebid.server.json.JacksonMapper;
 import org.prebid.server.json.JsonMerger;
 import org.prebid.server.log.ConditionalLogger;
@@ -239,22 +238,13 @@ private <T> T applyProfiles(List<String> profilesIds,
     }
 
     private ObjectNode mergeProfile(ObjectNode original, Profile profile, String profileId) {
-        final ObjectNode profileBody = parseProfile(profile.getBody(), profileId);
         return switch (profile.getMergePrecedence()) {
-            case REQUEST -> merge(original, profileBody, profileId);
-            case PROFILE -> merge(profileBody, original, profileId);
+            case REQUEST -> merge(original, profile.getBody(), profileId);
+            case PROFILE -> merge(profile.getBody(), original, profileId);
         };
     }
 
-    private ObjectNode parseProfile(String body, String profileId) {
-        try {
-            return mapper.decodeValue(body, ObjectNode.class);
-        } catch (DecodeException e) {
-            throw new InvalidProfileException("Can't parse profile %s: %s".formatted(profileId, e.getMessage()));
-        }
-    }
-
-    private ObjectNode merge(ObjectNode takePrecedence, ObjectNode other, String profileId) {
+    private ObjectNode merge(JsonNode takePrecedence, JsonNode other, String profileId) {
         try {
             return (ObjectNode) jsonMerger.merge(takePrecedence, other);
         } catch (InvalidRequestException e) {

src/main/java/org/prebid/server/settings/helper/DatabaseProfilesResultMapper.java

@@ -1,9 +1,12 @@
 package org.prebid.server.settings.helper;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.RowIterator;
 import io.vertx.sqlclient.RowSet;
 import org.prebid.server.exception.PreBidException;
+import org.prebid.server.json.ObjectMapperProvider;
 import org.prebid.server.log.Logger;
 import org.prebid.server.log.LoggerFactory;
 import org.prebid.server.settings.model.Profile;
@@ -70,16 +73,18 @@ public static StoredDataResult<Profile> map(RowSet<Row> rowSet,
 
             final String fetchedAccountId = Objects.toString(row.getValue(0), null);
             final String id = Objects.toString(row.getValue(1), null);
-            final String profileBody = Objects.toString(row.getValue(2), null);
+            final String profileBodyAsString = Objects.toString(row.getValue(2), null);
             final String mergePrecedenceAsString = Objects.toString(row.getValue(3), null);
             final String typeAsString = Objects.toString(row.getValue(4), null);
 
-            final Profile.Type type;
+            final JsonNode profileBody;
             final Profile.MergePrecedence mergePrecedence;
+            final Profile.Type type;
             try {
-                type = Profile.Type.valueOf(typeAsString);
+                profileBody = ObjectMapperProvider.mapper().readTree(profileBodyAsString);
                 mergePrecedence = Profile.MergePrecedence.valueOf(mergePrecedenceAsString);
-            } catch (IllegalArgumentException e) {
+                type = Profile.Type.valueOf(typeAsString);
+            } catch (IllegalArgumentException | JsonProcessingException e) {
                 logger.error("Profile with id={} has invalid value: ''{}'' and will be ignored.",
                         e, id, typeAsString);
                 continue;

src/main/java/org/prebid/server/settings/model/Profile.java

@@ -1,6 +1,8 @@
 package org.prebid.server.settings.model;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Value;
 
 @Value(staticConstructor = "of")
@@ -11,15 +13,23 @@ public class Profile {
     @JsonProperty("mergeprecedence")
     MergePrecedence mergePrecedence;
 
-    String body;
+    JsonNode body;
 
     public enum Type {
 
-        REQUEST, IMP
+        @JsonAlias("request")
+        REQUEST,
+
+        @JsonAlias("imp")
+        IMP
     }
 
     public enum MergePrecedence {
 
-        REQUEST, PROFILE
+        @JsonAlias("request")
+        REQUEST,
+
+        @JsonAlias("profile")
+        PROFILE
     }
 }