Skip to content

Commit 8ca1d7b

Browse files
committed
fix review10: rearrange classes
1 parent 73d252e commit 8ca1d7b

23 files changed

+63
-78
lines changed

extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/config/GreenbidsRealTimeDataConfiguration.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,16 @@
77
import com.maxmind.geoip2.DatabaseReader;
88
import io.vertx.core.Vertx;
99
import org.prebid.server.exception.PreBidException;
10-
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholds;
10+
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.ThrottlingThresholds;
1111
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholdsFactory;
12-
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.config.GreenbidsRealTimeDataProperties;
1312
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.GreenbidsInferenceDataService;
14-
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.FilterService;
15-
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.ModelCache;
16-
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.OnnxModelRunner;
17-
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.OnnxModelRunnerFactory;
18-
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.OnnxModelRunnerWithThresholds;
19-
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.ThresholdCache;
13+
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.FilterService;
14+
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ModelCache;
15+
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunner;
16+
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunnerFactory;
17+
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunnerWithThresholds;
18+
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThresholdCache;
2019
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.result.GreenbidsInvocationService;
21-
import org.prebid.server.hooks.modules.greenbids.real.time.data.v1.GreenbidsRealTimeDataModule;
2220
import org.prebid.server.hooks.modules.greenbids.real.time.data.v1.GreenbidsRealTimeDataProcessedAuctionRequestHook;
2321
import org.prebid.server.json.ObjectMapperProvider;
2422
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.v1;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.config;
22

33
import org.prebid.server.hooks.v1.Hook;
44
import org.prebid.server.hooks.v1.InvocationContext;
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.config;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.config;
22

33
import lombok.Data;
4-
import org.prebid.server.hooks.modules.greenbids.real.time.data.v1.GreenbidsRealTimeDataModule;
54
import org.springframework.boot.context.properties.ConfigurationProperties;
65

76
@ConfigurationProperties(prefix = "hooks.modules." + GreenbidsRealTimeDataModule.CODE)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
22

33
import ai.onnxruntime.OrtException;
44
import com.github.benmanes.caffeine.cache.Cache;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
22

33
import ai.onnxruntime.OnnxTensor;
44
import ai.onnxruntime.OrtEnvironment;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
22

33
import ai.onnxruntime.OrtException;
44

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
22

33
import io.vertx.core.Future;
4-
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.Partner;
4+
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.Partner;
55

66
import java.util.Objects;
77

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44
import com.github.benmanes.caffeine.cache.Cache;
@@ -8,8 +8,7 @@
88
import io.vertx.core.Future;
99
import io.vertx.core.Vertx;
1010
import org.prebid.server.exception.PreBidException;
11-
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholds;
12-
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholdsFactory;
11+
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.ThrottlingThresholds;
1312
import org.prebid.server.log.Logger;
1413
import org.prebid.server.log.LoggerFactory;
1514

extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/core/ThrottlingThresholdsFactory.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.fasterxml.jackson.databind.JsonNode;
44
import com.fasterxml.jackson.databind.ObjectMapper;
5+
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.ThrottlingThresholds;
56

67
import java.io.IOException;
78

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.data;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.Value;
5+
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.ThrottlingThresholds;
56

67
import java.util.Comparator;
78
import java.util.List;
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter;
22

33
import ai.onnxruntime.OnnxTensor;
44
import ai.onnxruntime.OnnxValue;
55
import ai.onnxruntime.OrtException;
66
import ai.onnxruntime.OrtSession;
77
import org.prebid.server.exception.PreBidException;
8+
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunner;
89
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.ThrottlingMessage;
910
import org.springframework.util.CollectionUtils;
1011

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter;
22

33
import lombok.Value;
44

extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/model/result/GreenbidsInvocationService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.apache.commons.lang3.StringUtils;
88
import org.prebid.server.analytics.reporter.greenbids.model.ExplorationResult;
99
import org.prebid.server.analytics.reporter.greenbids.model.Ortb2ImpExtResult;
10-
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.Partner;
10+
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.Partner;
1111
import org.prebid.server.hooks.v1.InvocationAction;
1212

1313
import java.util.List;

extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/model/result/RtdFilterResult.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHook.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
import org.prebid.server.auction.model.AuctionContext;
1212
import org.prebid.server.exception.PreBidException;
1313
import org.prebid.server.hooks.execution.v1.auction.AuctionRequestPayloadImpl;
14-
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.Partner;
14+
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.Partner;
1515
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.GreenbidsInferenceDataService;
1616
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.ThrottlingMessage;
17-
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.FilterService;
18-
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.OnnxModelRunner;
19-
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor.OnnxModelRunnerWithThresholds;
17+
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.FilterService;
18+
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunner;
19+
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunnerWithThresholds;
2020
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.result.AnalyticsResult;
2121
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.result.GreenbidsInvocationResult;
2222
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.result.GreenbidsInvocationService;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
22

33
import ai.onnxruntime.OrtException;
44
import com.github.benmanes.caffeine.cache.Cache;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
22

33
import ai.onnxruntime.OnnxTensor;
44
import ai.onnxruntime.OrtException;
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.core;
22

33
import com.github.benmanes.caffeine.cache.Cache;
44
import com.google.cloud.storage.Blob;
@@ -13,8 +13,7 @@
1313
import org.mockito.Mock;
1414
import org.mockito.junit.jupiter.MockitoExtension;
1515
import org.prebid.server.exception.PreBidException;
16-
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholds;
17-
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.ThrottlingThresholdsFactory;
16+
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter.ThrottlingThresholds;
1817
import org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider;
1918

2019
import java.io.IOException;
@@ -66,7 +65,7 @@ public void setUp() {
6665
target = new ThresholdCache(
6766
storage,
6867
GCS_BUCKET_NAME,
69-
TestBidRequestProvider.mapper,
68+
TestBidRequestProvider.MAPPER,
7069
cache,
7170
THRESHOLD_CACHE_KEY_PREFIX,
7271
vertx,
@@ -123,7 +122,7 @@ public void getShouldFetchThresholdsWhenNotInCache() throws IOException {
123122
when(storage.get(GCS_BUCKET_NAME)).thenReturn(bucket);
124123
when(bucket.get(THRESHOLDS_PATH)).thenReturn(blob);
125124
when(blob.getContent()).thenReturn(bytes);
126-
when(throttlingThresholdsFactory.create(bytes, TestBidRequestProvider.mapper))
125+
when(throttlingThresholdsFactory.create(bytes, TestBidRequestProvider.MAPPER))
127126
.thenReturn(throttlingThresholds);
128127

129128
// when
@@ -164,7 +163,7 @@ public void getShouldThrowExceptionWhenLoadingJsonFails() throws IOException {
164163
when(storage.get(GCS_BUCKET_NAME)).thenReturn(bucket);
165164
when(bucket.get(THRESHOLDS_PATH)).thenReturn(blob);
166165
when(blob.getContent()).thenReturn(bytes);
167-
when(throttlingThresholdsFactory.create(bytes, TestBidRequestProvider.mapper)).thenThrow(
166+
when(throttlingThresholdsFactory.create(bytes, TestBidRequestProvider.MAPPER)).thenThrow(
168167
new IOException("Failed to load throttling thresholds json"));
169168

170169
// when

extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/model/data/GreenbidsInferenceDataServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class GreenbidsInferenceDataServiceTest {
4848

4949
@BeforeEach
5050
public void setUp() {
51-
target = new GreenbidsInferenceDataService(dbReader, TestBidRequestProvider.mapper);
51+
target = new GreenbidsInferenceDataService(dbReader, TestBidRequestProvider.MAPPER);
5252
}
5353

5454
@Test
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.predictor;
1+
package org.prebid.server.hooks.modules.greenbids.real.time.data.model.filter;
22

33
import ai.onnxruntime.OnnxTensor;
44
import ai.onnxruntime.OnnxValue;
@@ -10,6 +10,7 @@
1010
import org.mockito.Mock;
1111
import org.mockito.junit.jupiter.MockitoExtension;
1212
import org.prebid.server.exception.PreBidException;
13+
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.OnnxModelRunner;
1314
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.ThrottlingMessage;
1415

1516
import java.io.IOException;

extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/model/result/GreenbidsInvocationServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.junit.jupiter.api.extension.ExtendWith;
1111
import org.mockito.junit.jupiter.MockitoExtension;
1212
import org.prebid.server.analytics.reporter.greenbids.model.Ortb2ImpExtResult;
13-
import org.prebid.server.hooks.modules.greenbids.real.time.data.core.Partner;
13+
import org.prebid.server.hooks.modules.greenbids.real.time.data.model.data.Partner;
1414
import org.prebid.server.hooks.v1.InvocationAction;
1515

1616
import java.util.HashMap;

extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/util/TestBidRequestProvider.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.iab.openrtb.request.Format;
1010
import com.iab.openrtb.request.Imp;
1111
import com.iab.openrtb.request.Site;
12-
import org.prebid.server.json.JacksonMapper;
1312
import org.prebid.server.json.ObjectMapperProvider;
1413
import org.prebid.server.proto.openrtb.ext.request.ExtRequest;
1514

@@ -19,7 +18,7 @@
1918

2019
public class TestBidRequestProvider {
2120

22-
public static final ObjectMapper mapper = ObjectMapperProvider.mapper();
21+
public static final ObjectMapper MAPPER = ObjectMapperProvider.mapper();
2322

2423
private TestBidRequestProvider() { }
2524

@@ -42,27 +41,27 @@ public static Site givenSite(UnaryOperator<Site.SiteBuilder> siteCustomizer) {
4241
}
4342

4443
public static ObjectNode givenImpExt() {
45-
final ObjectNode bidderNode = mapper.createObjectNode();
44+
final ObjectNode bidderNode = MAPPER.createObjectNode();
4645

47-
final ObjectNode rubiconNode = mapper.createObjectNode();
46+
final ObjectNode rubiconNode = MAPPER.createObjectNode();
4847
rubiconNode.put("accountId", 1001);
4948
rubiconNode.put("siteId", 267318);
5049
rubiconNode.put("zoneId", 1861698);
5150
bidderNode.set("rubicon", rubiconNode);
5251

53-
final ObjectNode appnexusNode = mapper.createObjectNode();
52+
final ObjectNode appnexusNode = MAPPER.createObjectNode();
5453
appnexusNode.put("placementId", 123456);
5554
bidderNode.set("appnexus", appnexusNode);
5655

57-
final ObjectNode pubmaticNode = mapper.createObjectNode();
56+
final ObjectNode pubmaticNode = MAPPER.createObjectNode();
5857
pubmaticNode.put("publisherId", "156209");
5958
pubmaticNode.put("adSlot", "slot1@300x250");
6059
bidderNode.set("pubmatic", pubmaticNode);
6160

62-
final ObjectNode prebidNode = mapper.createObjectNode();
61+
final ObjectNode prebidNode = MAPPER.createObjectNode();
6362
prebidNode.set("bidder", bidderNode);
6463

65-
final ObjectNode extNode = mapper.createObjectNode();
64+
final ObjectNode extNode = MAPPER.createObjectNode();
6665
extNode.set("prebid", prebidNode);
6766
extNode.set("tid", TextNode.valueOf("67eaab5f-27a6-4689-93f7-bd8f024576e3"));
6867

0 commit comments

Comments
 (0)