Bumped vert.x to 5.1.0. Fixed functional test that has been failing due to case-sensitive headers check.

Author: And1sS

extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/v1/net/APIClientImpl.java

@@ -3,7 +3,7 @@
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.vertx.core.Future;
 import io.vertx.core.MultiMap;
-import io.vertx.core.http.impl.headers.HeadersMultiMap;
+import io.vertx.core.http.HttpHeaders;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.prebid.server.execution.timeout.Timeout;
@@ -69,7 +69,7 @@ private String resolveEndpoint(String tenant, String origin) {
     }
 
     private static MultiMap headers(OptableTargetingProperties properties, List<String> ips, String userAgent) {
-        final MultiMap headers = HeadersMultiMap.httpHeaders()
+        final MultiMap headers = HttpHeaders.headers()
                 .add(HttpUtil.ACCEPT_HEADER, "application/json");
 
         if (userAgent != null) {

extra/modules/optable-targeting/src/test/java/org/prebid/server/hooks/modules/optable/targeting/v1/BaseOptableTest.java

@@ -16,7 +16,7 @@
 import com.iab.openrtb.response.BidResponse;
 import com.iab.openrtb.response.SeatBid;
 import io.vertx.core.MultiMap;
-import io.vertx.core.http.impl.headers.HeadersMultiMap;
+import io.vertx.core.http.HttpHeaders;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpStatus;
 import org.prebid.server.activity.infrastructure.ActivityInfrastructure;
@@ -193,7 +193,7 @@ protected Device givenDevice() {
     }
 
     protected HttpClientResponse givenSuccessHttpResponse(String fileName) {
-        final MultiMap headers = HeadersMultiMap.httpHeaders().add("Content-Type", "application/json");
+        final MultiMap headers = HttpHeaders.headers().add("Content-Type", "application/json");
         return HttpClientResponse.of(HttpStatus.SC_OK, headers, givenBodyFromFile(fileName));
     }
 

extra/pom.xml

@@ -34,7 +34,7 @@
 
         <!-- Project production dependency versions -->
         <spring.boot.version>3.5.10</spring.boot.version>
-        <vertx.version>5.0.10</vertx.version>
+        <vertx.version>5.1.0</vertx.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
         <commons.collections.version>4.4</commons.collections.version>
         <commons.compress.version>1.27.1</commons.compress.version>

src/main/java/org/prebid/server/analytics/reporter/pubstack/PubstackAnalyticsReporter.java

@@ -1,6 +1,5 @@
 package org.prebid.server.analytics.reporter.pubstack;
 
-import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
 import io.vertx.core.Promise;
 import io.vertx.core.Vertx;
@@ -119,19 +118,22 @@ public String name() {
     @Override
     public void initialize(Promise<Void> initializePromise) {
         vertx.setPeriodic(configurationRefreshDelay, id -> fetchRemoteConfig());
-        fetchRemoteConfig();
-        initializePromise.tryComplete();
+        fetchRemoteConfig()
+                .onSuccess(initializePromise::succeed)
+                .onFailure(initializePromise::fail);
     }
 
     void shutdown() {
         eventHandlers.values().forEach(PubstackEventHandler::reportEvents);
     }
 
-    private void fetchRemoteConfig() {
+    private Future<Void> fetchRemoteConfig() {
         logger.info("[pubstack] Updating config: {}", pubstackConfig);
-        httpClient.get(makeEventEndpointUrl(pubstackConfig.getEndpoint(), pubstackConfig.getScopeId()), timeout)
+        return httpClient.get(makeEventEndpointUrl(pubstackConfig.getEndpoint(), pubstackConfig.getScopeId()), timeout)
                 .map(this::processRemoteConfigurationResponse)
-                .onComplete(this::updateConfigsOnChange);
+                .map(this::updateConfigsOnChange)
+                .onFailure(PubstackAnalyticsReporter::logError)
+                .mapEmpty();
     }
 
     private PubstackConfig processRemoteConfigurationResponse(HttpClientResponse response) {
@@ -148,15 +150,14 @@ private PubstackConfig processRemoteConfigurationResponse(HttpClientResponse res
         }
     }
 
-    private void updateConfigsOnChange(AsyncResult<PubstackConfig> asyncConfigResult) {
-        if (asyncConfigResult.failed()) {
-            logger.error("[pubstask] Fail to fetch remote configuration: {}", asyncConfigResult.cause().getMessage());
-        } else if (!Objects.equals(pubstackConfig, asyncConfigResult.result())) {
-            final PubstackConfig pubstackConfig = asyncConfigResult.result();
+    private Void updateConfigsOnChange(PubstackConfig config) {
+        if (!Objects.equals(pubstackConfig, config)) {
             eventHandlers.values().forEach(PubstackEventHandler::reportEvents);
-            this.pubstackConfig = pubstackConfig;
+            this.pubstackConfig = config;
             updateHandlers(pubstackConfig);
         }
+
+        return null;
     }
 
     private void updateHandlers(PubstackConfig pubstackConfig) {
@@ -187,4 +188,8 @@ private String makeEventHandlerEndpoint(String endpoint, EventType eventType) {
             throw new PreBidException(message);
         }
     }
+
+    private static void logError(Throwable throwable) {
+        logger.error("[pubstask] Fail to fetch remote configuration: {}", throwable.getCause().getMessage());
+    }
 }

src/test/groovy/org/prebid/server/functional/tests/SetUidSpec.groovy

@@ -514,7 +514,7 @@ class SetUidSpec extends BaseSpec {
     }
 
     List<String> getSetUidsHeaders(SetuidResponse response, boolean includeEmpty = false) {
-        response.headers.get("Set-Cookie").findAll { cookie ->
+        response.headers.get("set-cookie").findAll { cookie ->
             includeEmpty || !(cookie =~ /\buids\d*=\s*;/)
         }
     }

src/test/java/org/prebid/server/analytics/reporter/pubstack/PubstackAnalyticsReporterTest.java

@@ -26,6 +26,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
@@ -106,14 +107,19 @@ public void initializeShouldFetchConfigAndSetPeriodicTimerForConfigUpdate() thro
     @Test
     public void initializeShouldFailUpdateSendBuffersAndSetTimerWhenEndpointFromRemoteConfigIsNotValid()
             throws JsonProcessingException {
+
         // given
+        final Promise<Void> promise = Promise.promise();
         final PubstackConfig pubstackConfig = PubstackConfig.of("newScopeId", "invalid",
                 Collections.singletonMap(EventType.auction, true));
         given(httpClient.get(anyString(), anyLong())).willReturn(
                 Future.succeededFuture(HttpClientResponse.of(200, null, mapper.writeValueAsString(pubstackConfig))));
 
-        // when and then
-        assertThatThrownBy(() -> pubstackAnalyticsReporter.initialize(Promise.promise()))
+        // when
+        pubstackAnalyticsReporter.initialize(promise);
+
+        // then
+        assertThatThrownBy(() -> promise.future().await(5, TimeUnit.SECONDS))
                 .hasMessage("[pubstack] Failed to create event report url for endpoint: invalid")
                 .isInstanceOf(PreBidException.class);
         verify(auctionHandler).reportEvents();

src/test/java/org/prebid/server/bidder/criteo/CriteoBidderTest.java

@@ -9,7 +9,6 @@
 import com.iab.openrtb.response.SeatBid;
 import io.vertx.core.MultiMap;
 import io.vertx.core.http.HttpMethod;
-import io.vertx.core.http.impl.headers.HeadersMultiMap;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.prebid.server.VertxTest;
@@ -74,7 +73,7 @@ public void makeHttpRequestsShouldEncodePassedBidRequest() {
                 .build());
 
         assertThat(result.getValue()).usingRecursiveComparison()
-                .withComparatorForType((a, b) -> a.entries().equals(b.entries()) ? 0 : 1, HeadersMultiMap.class)
+                .withComparatorForType((a, b) -> a.entries().equals(b.entries()) ? 0 : 1, MultiMap.class)
                 .isEqualTo(expectedResult.getValue());
         assertThat(result.getErrors()).isEmpty();
     }

src/test/java/org/prebid/server/bidder/gothamads/GothamAdsBidderTest.java

@@ -10,7 +10,6 @@
 import com.iab.openrtb.response.SeatBid;
 import io.vertx.core.MultiMap;
 import io.vertx.core.http.HttpMethod;
-import io.vertx.core.http.impl.headers.HeadersMultiMap;
 import org.junit.jupiter.api.Test;
 import org.prebid.server.VertxTest;
 import org.prebid.server.bidder.gotthamads.GothamAdsBidder;
@@ -106,7 +105,7 @@ public void makeHttpRequestsShouldMakeCorrectRequest() {
 
         assertThat(result.getValue())
                 .usingRecursiveComparison()
-                .withComparatorForType((a, b) -> a.entries().equals(b.entries()) ? 0 : 1, HeadersMultiMap.class)
+                .withComparatorForType((a, b) -> a.entries().equals(b.entries()) ? 0 : 1, MultiMap.class)
                 .isEqualTo(expectedResult.getValue());
         assertThat(result.getErrors()).isEmpty();
     }

src/test/java/org/prebid/server/bidder/pwbid/PwbidBidderTest.java

@@ -12,7 +12,6 @@
 import com.iab.openrtb.response.SeatBid;
 import io.vertx.core.MultiMap;
 import io.vertx.core.http.HttpMethod;
-import io.vertx.core.http.impl.headers.HeadersMultiMap;
 import org.junit.jupiter.api.Test;
 import org.prebid.server.VertxTest;
 import org.prebid.server.bidder.model.BidderBid;
@@ -75,7 +74,7 @@ public void makeHttpRequestsShouldReturnExpectedHttpRequest() {
 
         assertThat(result.getValue())
                 .usingRecursiveComparison()
-                .withComparatorForType((a, b) -> a.entries().equals(b.entries()) ? 0 : 1, HeadersMultiMap.class)
+                .withComparatorForType((a, b) -> a.entries().equals(b.entries()) ? 0 : 1, MultiMap.class)
                 .isEqualTo(expectedResults.getValue());
         assertThat(result.getErrors()).isEmpty();
     }