fix review10: rearrange classes

prebid · Oct 16, 2024 · 8ca1d7b · 8ca1d7b
1 parent 73d252e
commit 8ca1d7b
Show file tree

Hide file tree

Showing 23 changed files with 63 additions and 78 deletions.
diff --git a/...ver/hooks/modules/greenbids/real/time/data/config/GreenbidsRealTimeDataConfiguration.java b/...ver/hooks/modules/greenbids/real/time/data/config/GreenbidsRealTimeDataConfiguration.java
@@ -7,18 +7,16 @@
 import com.maxmind.geoip2.DatabaseReader;
 import io.vertx.core.Vertx;
 import org.prebid.server.exception.PreBidException;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholds;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.ThrottlingThresholds;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholdsFactory;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.model.config.GreenbidsRealTimeDataProperties;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.GreenbidsInferenceDataService;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.FilterService;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.ModelCache;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.OnnxModelRunner;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.OnnxModelRunnerFactory;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.OnnxModelRunnerWithThresholds;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.ThresholdCache;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.FilterService;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ModelCache;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunner;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunnerFactory;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunnerWithThresholds;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThresholdCache;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.model.result.GreenbidsInvocationService;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.v1.GreenbidsRealTimeDataModule;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.v1.GreenbidsRealTimeDataProcessedAuctionRequestHook;
 import org.prebid.server.json.ObjectMapperProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

diff --git a/.../data/v1/GreenbidsRealTimeDataModule.java → ...a/config/GreenbidsRealTimeDataModule.java b/.../data/v1/GreenbidsRealTimeDataModule.java → ...a/config/GreenbidsRealTimeDataModule.java
@@ -1,4 +1,4 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.v1;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.config;
 
 import org.prebid.server.hooks.v1.Hook;
 import org.prebid.server.hooks.v1.InvocationContext;

diff --git a/...nfig/GreenbidsRealTimeDataProperties.java → ...nfig/GreenbidsRealTimeDataProperties.java b/...nfig/GreenbidsRealTimeDataProperties.java → ...nfig/GreenbidsRealTimeDataProperties.java
@@ -1,7 +1,6 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.model.config;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.config;
 
 import lombok.Data;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.v1.GreenbidsRealTimeDataModule;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "hooks.modules." + GreenbidsRealTimeDataModule.CODE)

diff --git a/...time/data/model/predictor/ModelCache.java → ...nbids/real/time/data/core/ModelCache.java b/...time/data/model/predictor/ModelCache.java → ...nbids/real/time/data/core/ModelCache.java
@@ -1,4 +1,4 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
 
 import ai.onnxruntime.OrtException;
 import com.github.benmanes.caffeine.cache.Cache;

diff --git a/...data/model/predictor/OnnxModelRunner.java → .../real/time/data/core/OnnxModelRunner.java b/...data/model/predictor/OnnxModelRunner.java → .../real/time/data/core/OnnxModelRunner.java
@@ -1,4 +1,4 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
 
 import ai.onnxruntime.OnnxTensor;
 import ai.onnxruntime.OrtEnvironment;

diff --git a/...del/predictor/OnnxModelRunnerFactory.java → ...ime/data/core/OnnxModelRunnerFactory.java b/...del/predictor/OnnxModelRunnerFactory.java → ...ime/data/core/OnnxModelRunnerFactory.java
@@ -1,4 +1,4 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
 
 import ai.onnxruntime.OrtException;
 

diff --git a/...dictor/OnnxModelRunnerWithThresholds.java → ...a/core/OnnxModelRunnerWithThresholds.java b/...dictor/OnnxModelRunnerWithThresholds.java → ...a/core/OnnxModelRunnerWithThresholds.java
@@ -1,7 +1,7 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
 
 import io.vertx.core.Future;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.core.Partner;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.Partner;
 
 import java.util.Objects;
 

diff --git a/.../data/model/predictor/ThresholdCache.java → ...s/real/time/data/core/ThresholdCache.java b/.../data/model/predictor/ThresholdCache.java → ...s/real/time/data/core/ThresholdCache.java
@@ -1,4 +1,4 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.benmanes.caffeine.cache.Cache;
@@ -8,8 +8,7 @@
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import org.prebid.server.exception.PreBidException;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholds;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholdsFactory;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.ThrottlingThresholds;
 import org.prebid.server.log.Logger;
 import org.prebid.server.log.LoggerFactory;
 

diff --git a/...rebid/server/hooks/modules/greenbids/real/time/data/core/ThrottlingThresholdsFactory.java b/...rebid/server/hooks/modules/greenbids/real/time/data/core/ThrottlingThresholdsFactory.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.ThrottlingThresholds;
 
 import java.io.IOException;
 

diff --git a/...reenbids/real/time/data/core/Partner.java → ...ds/real/time/data/model/data/Partner.java b/...reenbids/real/time/data/core/Partner.java → ...ds/real/time/data/model/data/Partner.java
@@ -1,7 +1,8 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.model.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Value;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.ThrottlingThresholds;
 
 import java.util.Comparator;
 import java.util.List;

diff --git a/...e/data/model/predictor/FilterService.java → ...time/data/model/filter/FilterService.java b/...e/data/model/predictor/FilterService.java → ...time/data/model/filter/FilterService.java
@@ -1,10 +1,11 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter;
 
 import ai.onnxruntime.OnnxTensor;
 import ai.onnxruntime.OnnxValue;
 import ai.onnxruntime.OrtException;
 import ai.onnxruntime.OrtSession;
 import org.prebid.server.exception.PreBidException;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunner;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.ThrottlingMessage;
 import org.springframework.util.CollectionUtils;
 

diff --git a/.../time/data/core/ThrottlingThresholds.java → ...ta/model/filter/ThrottlingThresholds.java b/.../time/data/core/ThrottlingThresholds.java → ...ta/model/filter/ThrottlingThresholds.java
@@ -1,4 +1,4 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter;
 
 import lombok.Value;
 

diff --git a/...erver/hooks/modules/greenbids/real/time/data/model/result/GreenbidsInvocationService.java b/...erver/hooks/modules/greenbids/real/time/data/model/result/GreenbidsInvocationService.java
@@ -7,7 +7,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.prebid.server.analytics.reporter.greenbids.model.ExplorationResult;
 import org.prebid.server.analytics.reporter.greenbids.model.Ortb2ImpExtResult;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.core.Partner;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.Partner;
 import org.prebid.server.hooks.v1.InvocationAction;
 
 import java.util.List;

diff --git a/...rg/prebid/server/hooks/modules/greenbids/real/time/data/model/result/RtdFilterResult.java b/...rg/prebid/server/hooks/modules/greenbids/real/time/data/model/result/RtdFilterResult.java
diff --git a/...modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHook.java b/...modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHook.java
@@ -11,12 +11,12 @@
 import org.prebid.server.auction.model.AuctionContext;
 import org.prebid.server.exception.PreBidException;
 import org.prebid.server.hooks.execution.v1.auction.AuctionRequestPayloadImpl;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.core.Partner;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.Partner;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.GreenbidsInferenceDataService;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.ThrottlingMessage;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.FilterService;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.OnnxModelRunner;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.OnnxModelRunnerWithThresholds;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.FilterService;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunner;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunnerWithThresholds;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.model.result.AnalyticsResult;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.model.result.GreenbidsInvocationResult;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.model.result.GreenbidsInvocationService;

diff --git a/.../data/model/predictor/ModelCacheTest.java → ...s/real/time/data/core/ModelCacheTest.java b/.../data/model/predictor/ModelCacheTest.java → ...s/real/time/data/core/ModelCacheTest.java
@@ -1,4 +1,4 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
 
 import ai.onnxruntime.OrtException;
 import com.github.benmanes.caffeine.cache.Cache;

diff --git a/.../model/predictor/OnnxModelRunnerTest.java → ...l/time/data/core/OnnxModelRunnerTest.java b/.../model/predictor/OnnxModelRunnerTest.java → ...l/time/data/core/OnnxModelRunnerTest.java
@@ -1,4 +1,4 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
 
 import ai.onnxruntime.OnnxTensor;
 import ai.onnxruntime.OrtException;

diff --git a/...a/model/predictor/ThresholdCacheTest.java → ...al/time/data/core/ThresholdCacheTest.java b/...a/model/predictor/ThresholdCacheTest.java → ...al/time/data/core/ThresholdCacheTest.java
@@ -1,4 +1,4 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.google.cloud.storage.Blob;
@@ -13,8 +13,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.prebid.server.exception.PreBidException;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholds;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholdsFactory;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.ThrottlingThresholds;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider;
 
 import java.io.IOException;
@@ -66,7 +65,7 @@ public void setUp() {
         target = new ThresholdCache(
                 storage,
                 GCS_BUCKET_NAME,
-                TestBidRequestProvider.mapper,
+                TestBidRequestProvider.MAPPER,
                 cache,
                 THRESHOLD_CACHE_KEY_PREFIX,
                 vertx,
@@ -123,7 +122,7 @@ public void getShouldFetchThresholdsWhenNotInCache() throws IOException {
         when(storage.get(GCS_BUCKET_NAME)).thenReturn(bucket);
         when(bucket.get(THRESHOLDS_PATH)).thenReturn(blob);
         when(blob.getContent()).thenReturn(bytes);
-        when(throttlingThresholdsFactory.create(bytes, TestBidRequestProvider.mapper))
+        when(throttlingThresholdsFactory.create(bytes, TestBidRequestProvider.MAPPER))
                 .thenReturn(throttlingThresholds);
 
         // when
@@ -164,7 +163,7 @@ public void getShouldThrowExceptionWhenLoadingJsonFails() throws IOException {
         when(storage.get(GCS_BUCKET_NAME)).thenReturn(bucket);
         when(bucket.get(THRESHOLDS_PATH)).thenReturn(blob);
         when(blob.getContent()).thenReturn(bytes);
-        when(throttlingThresholdsFactory.create(bytes, TestBidRequestProvider.mapper)).thenThrow(
+        when(throttlingThresholdsFactory.create(bytes, TestBidRequestProvider.MAPPER)).thenThrow(
                 new IOException("Failed to load throttling thresholds json"));
 
         // when

diff --git a/.../hooks/modules/greenbids/real/time/data/model/data/GreenbidsInferenceDataServiceTest.java b/.../hooks/modules/greenbids/real/time/data/model/data/GreenbidsInferenceDataServiceTest.java
@@ -48,7 +48,7 @@ public class GreenbidsInferenceDataServiceTest {
 
     @BeforeEach
     public void setUp() {
-        target = new GreenbidsInferenceDataService(dbReader, TestBidRequestProvider.mapper);
+        target = new GreenbidsInferenceDataService(dbReader, TestBidRequestProvider.MAPPER);
     }
 
     @Test

diff --git a/...ta/model/predictor/FilterServiceTest.java → .../data/model/filter/FilterServiceTest.java b/...ta/model/predictor/FilterServiceTest.java → .../data/model/filter/FilterServiceTest.java
@@ -1,4 +1,4 @@
-package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
+package org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter;
 
 import ai.onnxruntime.OnnxTensor;
 import ai.onnxruntime.OnnxValue;
@@ -10,6 +10,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.prebid.server.exception.PreBidException;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunner;
 import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.ThrottlingMessage;
 
 import java.io.IOException;

diff --git a/...r/hooks/modules/greenbids/real/time/data/model/result/GreenbidsInvocationServiceTest.java b/...r/hooks/modules/greenbids/real/time/data/model/result/GreenbidsInvocationServiceTest.java
@@ -10,7 +10,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.prebid.server.analytics.reporter.greenbids.model.Ortb2ImpExtResult;
-import org.prebid.server.hooks.modules.greenbids.real.time.data.core.Partner;
+import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.Partner;
 import org.prebid.server.hooks.v1.InvocationAction;
 
 import java.util.HashMap;

diff --git a/...org/prebid/server/hooks/modules/greenbids/real/time/data/util/TestBidRequestProvider.java b/...org/prebid/server/hooks/modules/greenbids/real/time/data/util/TestBidRequestProvider.java
@@ -9,7 +9,6 @@
 import com.iab.openrtb.request.Format;
 import com.iab.openrtb.request.Imp;
 import com.iab.openrtb.request.Site;
-import org.prebid.server.json.JacksonMapper;
 import org.prebid.server.json.ObjectMapperProvider;
 import org.prebid.server.proto.openrtb.ext.request.ExtRequest;
 
@@ -19,7 +18,7 @@
 
 public class TestBidRequestProvider {
 
-    public static final ObjectMapper mapper = ObjectMapperProvider.mapper();
+    public static final ObjectMapper MAPPER = ObjectMapperProvider.mapper();
 
     private TestBidRequestProvider() { }
 
@@ -42,27 +41,27 @@ public static Site givenSite(UnaryOperator<Site.SiteBuilder> siteCustomizer) {
     }
 
     public static ObjectNode givenImpExt() {
-        final ObjectNode bidderNode = mapper.createObjectNode();
+        final ObjectNode bidderNode = MAPPER.createObjectNode();
 
-        final ObjectNode rubiconNode = mapper.createObjectNode();
+        final ObjectNode rubiconNode = MAPPER.createObjectNode();
         rubiconNode.put("accountId", 1001);
         rubiconNode.put("siteId", 267318);
         rubiconNode.put("zoneId", 1861698);
         bidderNode.set("rubicon", rubiconNode);
 
-        final ObjectNode appnexusNode = mapper.createObjectNode();
+        final ObjectNode appnexusNode = MAPPER.createObjectNode();
         appnexusNode.put("placementId", 123456);
         bidderNode.set("appnexus", appnexusNode);
 
-        final ObjectNode pubmaticNode = mapper.createObjectNode();
+        final ObjectNode pubmaticNode = MAPPER.createObjectNode();
         pubmaticNode.put("publisherId", "156209");
         pubmaticNode.put("adSlot", "slot1@300x250");
         bidderNode.set("pubmatic", pubmaticNode);
 
-        final ObjectNode prebidNode = mapper.createObjectNode();
+        final ObjectNode prebidNode = MAPPER.createObjectNode();
         prebidNode.set("bidder", bidderNode);
 
-        final ObjectNode extNode = mapper.createObjectNode();
+        final ObjectNode extNode = MAPPER.createObjectNode();
         extNode.set("prebid", prebidNode);
         extNode.set("tid", TextNode.valueOf("67eaab5f-27a6-4689-93f7-bd8f024576e3"));