Refactor

Author: CTMBNara

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

@@ -100,8 +100,8 @@ public Future<BidRequest> process(AuctionContext auctionContext, BidRequest bidR
                                 profiles.getStoredIdToImp(),
                                 bidRequest.getImp(),
                                 failOnUnknown)))
-                .recover(e -> Future.failedFuture(
-                        new InvalidRequestException("Error during processing profiles: " + e.getMessage())));
+                .recover(error -> Future.failedFuture(
+                        new InvalidRequestException("Error during processing profiles: " + error.getMessage())));
     }
 
     private AllProfilesIds profilesIds(BidRequest bidRequest, AuctionContext auctionContext, String accountId) {
@@ -218,14 +218,13 @@ private BidRequest applyRequestProfiles(List<String> profilesIds,
                                             boolean failOnUnknown) {
 
         return !idToRequestProfile.isEmpty()
-                ? applyProfiles(profilesIds, idToRequestProfile, bidRequest, BidRequest.class, failOnUnknown)
+                ? applyProfiles(profilesIds, idToRequestProfile, bidRequest, failOnUnknown)
                 : bidRequest;
     }
 
     private <T> T applyProfiles(List<String> profilesIds,
                                 Map<String, Profile> idToProfile,
                                 T original,
-                                Class<T> tClass,
                                 boolean failOnUnknown) {
 
         if (profilesIds.isEmpty()) {
@@ -249,7 +248,7 @@ private <T> T applyProfiles(List<String> profilesIds,
         }
 
         try {
-            return mapper.mapper().treeToValue(result, tClass);
+            return mapper.mapper().treeToValue(result, (Class<T>) original.getClass());
         } catch (JsonProcessingException e) {
             throw new InvalidProfileException(e.getMessage());
         }
@@ -285,7 +284,6 @@ private List<Imp> applyImpsProfiles(List<List<String>> profilesIds,
                     profilesIds.get(i),
                     idToImpProfile,
                     imps.get(i),
-                    Imp.class,
                     failOnUnknown));
         }
 

src/main/java/org/prebid/server/auction/requestfactory/Ortb2RequestFactory.java

@@ -482,7 +482,7 @@ private Future<String> findAccountIdFrom(AuctionContext auctionContext,
             return Future.succeededFuture(accountId);
         }
 
-        return accountIdFromStored(bidRequest)
+        return accountIdFromStoredRequest(bidRequest)
                 .compose(id -> StringUtils.isBlank(id)
                         ? accountIdFromProfiles(auctionContext, bidRequest)
                         : Future.succeededFuture(id));
@@ -511,7 +511,7 @@ private String parentAccountIdFromExtPublisher(ExtPublisher extPublisher) {
         return extPublisherPrebid != null ? StringUtils.stripToNull(extPublisherPrebid.getParentAccount()) : null;
     }
 
-    private Future<String> accountIdFromStored(BidRequest bidRequest) {
+    private Future<String> accountIdFromStoredRequest(BidRequest bidRequest) {
         return storedRequestProcessor.processAuctionRequest(StringUtils.EMPTY, bidRequest)
                 .map(AuctionStoredResult::bidRequest)
                 .map(this::accountIdFromBidRequest);

src/main/java/org/prebid/server/settings/DatabaseApplicationSettings.java

@@ -18,6 +18,7 @@
 import org.prebid.server.settings.model.Profile;
 import org.prebid.server.settings.model.StoredDataResult;
 import org.prebid.server.settings.model.StoredResponseDataResult;
+import org.prebid.server.util.ObjectUtil;
 import org.prebid.server.vertx.database.CircuitBreakerSecuredDatabaseClient;
 import org.prebid.server.vertx.database.DatabaseClient;
 
@@ -129,7 +130,7 @@ private <T> T mapToModelOrError(RowSet<Row> rowSet, Function<Row, T> mapper) {
     }
 
     private Account toAccount(Row row) {
-        final String source = Objects.toString(row.getValue(0), null);
+        final String source = ObjectUtil.getIfNotNull(row.getValue(0), Object::toString);
         try {
             return source != null ? mapper.decodeValue(source, Account.class) : null;
         } catch (DecodeException e) {