fix review10: refactos

Author: EvgeniiMunin

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

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
@@ -197,8 +198,7 @@ public void callShouldNotFilterBiddersAndReturnAnalyticsTagWhenExploration() thr
                         "activities.results"
                                 + ".values._children"
                                 + ".adunitcodevalue._children"
-                                + ".greenbids._children.fingerprint",
-                        "activities.results.values._children.adunitcodevalue._children.tid")
+                                + ".greenbids._children.fingerprint")
                 .isEqualTo(toAnalyticsTags(List.of(expectedAnalyticsResult)));
     }
 
@@ -249,8 +249,7 @@ public void callShouldFilterBiddersBasedOnModelWhenAnyFeatureNotAvailable() thro
                         "activities.results"
                                 + ".values._children"
                                 + ".adunitcodevalue._children"
-                                + ".greenbids._children.fingerprint",
-                        "activities.results.values._children.adunitcodevalue._children.tid")
+                                + ".greenbids._children.fingerprint")
                 .isEqualTo(toAnalyticsTags(List.of(expectedAnalyticsResult)));
         assertThat(resultBidRequest).usingRecursiveComparison()
                 .ignoringFields("imp.ext._children.tid", "device")
@@ -306,8 +305,7 @@ public void callShouldFilterBiddersBasedOnModelResults() throws OrtException, IO
                         "activities.results"
                                 + ".values._children"
                                 + ".adunitcodevalue._children"
-                                + ".greenbids._children.fingerprint",
-                        "activities.results.values._children.adunitcodevalue._children.tid")
+                                + ".greenbids._children.fingerprint")
                 .isEqualTo(toAnalyticsTags(List.of(expectedAnalyticsResult)));
         assertThat(resultBidRequest).usingRecursiveComparison()
                 .ignoringFields("imp.ext._children.tid")
@@ -373,7 +371,7 @@ private BidRequest expectedUpdatedBidRequest(
 
         final ObjectNode extNode = jacksonMapper.mapper().createObjectNode();
         extNode.set("prebid", prebidNode);
-        extNode.set("tid", null);
+        extNode.set("tid", TextNode.valueOf("67eaab5f-27a6-4689-93f7-bd8f024576e3"));
 
         final Imp imp = Imp.builder()
                 .id("adunitcodevalue")

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

@@ -24,7 +24,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mock.Strictness.LENIENT;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;

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

@@ -15,7 +15,7 @@
 import java.util.stream.StreamSupport;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class OnnxModelRunnerTest {
 
@@ -62,9 +62,8 @@ public void runModelShouldThrowOrtExceptionWhenNonValidThrottlingInferenceRow()
                 "Chrome 59", "adunitcodevalue", "US", "www.leparisien.fr", "PC", "10", "1"}};
 
         // when & then
-        assertThrows(OrtException.class, () -> {
-            target.runModel(throttlingInferenceRowWithMissingColumn);
-        });
+        assertThatThrownBy(() -> target.runModel(throttlingInferenceRowWithMissingColumn))
+                .isInstanceOf(OrtException.class);
     }
 
     private OnnxModelRunner givenOnnxModelRunner() throws OrtException, IOException {

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

@@ -1,6 +1,7 @@
 package org.prebid.server.hooks.modules.greenbids.real.time.data.v1;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
 import com.iab.openrtb.request.Banner;
 import com.iab.openrtb.request.BidRequest;
 import com.iab.openrtb.request.Device;
@@ -16,6 +17,8 @@
 
 public class TestBidRequestProvider {
 
+    private TestBidRequestProvider() { }
+
     public static BidRequest givenBidRequest(
             UnaryOperator<BidRequest.BidRequestBuilder> bidRequestCustomizer,
             List<Imp> imps,
@@ -57,7 +60,7 @@ public static ObjectNode givenImpExt(JacksonMapper jacksonMapper) {
 
         final ObjectNode extNode = jacksonMapper.mapper().createObjectNode();
         extNode.set("prebid", prebidNode);
-        extNode.set("tid", null);
+        extNode.set("tid", TextNode.valueOf("67eaab5f-27a6-4689-93f7-bd8f024576e3"));
 
         return extNode;
     }

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

@@ -27,7 +27,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mock.Strictness.LENIENT;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;