Add Vert.x UriTemplate

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

@@ -56,5 +56,4 @@ public void updateShouldRemoveImpFromUpdateBidRequestWhenAllBiddersFiltered() {
         assertThat(result.getImp()).isEmpty();
 
     }
-
 }

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

@@ -187,5 +187,4 @@ public void getShouldThrowExceptionWhenBucketNotFound() {
             assertThat(ar.cause().getMessage()).contains("Bucket not found");
         });
     }
-
 }

extra/modules/live-intent-omni-channel-identity/src/main/java/org/prebid/server/hooks/modules/liveintent/omni/channel/identity/v1/hooks/LiveIntentOmniChannelIdentityProcessedAuctionRequestHook.java

@@ -72,7 +72,7 @@ public LiveIntentOmniChannelIdentityProcessedAuctionRequestHook(LiveIntentOmniCh
                                                                     double logSamplingRate) {
 
         this.config = Objects.requireNonNull(config);
-        HttpUtil.validateUrlSyntax(config.getIdentityResolutionEndpoint());
+        HttpUtil.validateUrl(config.getIdentityResolutionEndpoint());
         this.mapper = Objects.requireNonNull(mapper);
         this.httpClient = Objects.requireNonNull(httpClient);
         this.logSamplingRate = logSamplingRate;

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

@@ -15,6 +15,7 @@
 import org.prebid.server.log.Logger;
 import org.prebid.server.log.LoggerFactory;
 import org.prebid.server.util.HttpUtil;
+import org.prebid.server.util.Uri;
 import org.prebid.server.validation.ValidationException;
 import org.prebid.server.vertx.httpclient.HttpClient;
 import org.prebid.server.vertx.httpclient.model.HttpClientResponse;
@@ -27,10 +28,10 @@ public class APIClientImpl implements APIClient {
     private static final Logger logger = LoggerFactory.getLogger(APIClientImpl.class);
     private static final ConditionalLogger conditionalLogger = new ConditionalLogger(logger);
 
-    private static final String TENANT = "{{TENANT}}";
-    private static final String ORIGIN = "{{ORIGIN}}";
+    private static final String TENANT = "TENANT";
+    private static final String ORIGIN = "ORIGIN";
 
-    private final String endpoint;
+    private final Uri endpoint;
     private final HttpClient httpClient;
     private final JacksonMapper mapper;
     private final double logSamplingRate;
@@ -40,7 +41,7 @@ public APIClientImpl(String endpoint,
                          JacksonMapper mapper,
                          double logSamplingRate) {
 
-        this.endpoint = HttpUtil.validateUrl(Objects.requireNonNull(endpoint));
+        this.endpoint = Uri.of(endpoint);
         this.httpClient = Objects.requireNonNull(httpClient);
         this.mapper = Objects.requireNonNull(mapper);
         this.logSamplingRate = logSamplingRate;
@@ -64,8 +65,9 @@ public Future<TargetingResult> getTargeting(OptableTargetingProperties propertie
 
     private String resolveEndpoint(String tenant, String origin) {
         return endpoint
-                .replace(TENANT, tenant)
-                .replace(ORIGIN, origin);
+                .replaceMacro(TENANT, tenant)
+                .replaceMacro(ORIGIN, origin)
+                .expand();
     }
 
     private static MultiMap headers(OptableTargetingProperties properties, List<String> ips, String userAgent) {

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

@@ -15,10 +15,10 @@
 import com.iab.openrtb.response.Bid;
 import com.iab.openrtb.response.BidResponse;
 import com.iab.openrtb.response.SeatBid;
+import io.netty.handler.codec.http.HttpResponseStatus;
 import io.vertx.core.MultiMap;
 import io.vertx.core.http.impl.headers.HeadersMultiMap;
 import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpStatus;
 import org.prebid.server.activity.infrastructure.ActivityInfrastructure;
 import org.prebid.server.auction.gpp.model.GppContext;
 import org.prebid.server.auction.model.AuctionContext;
@@ -194,11 +194,11 @@ protected Device givenDevice() {
 
     protected HttpClientResponse givenSuccessHttpResponse(String fileName) {
         final MultiMap headers = HeadersMultiMap.headers().add("Content-Type", "application/json");
-        return HttpClientResponse.of(HttpStatus.SC_OK, headers, givenBodyFromFile(fileName));
+        return HttpClientResponse.of(HttpResponseStatus.OK.code(), headers, givenBodyFromFile(fileName));
     }
 
     protected HttpClientResponse givenFailHttpResponse(String fileName) {
-        return givenFailHttpResponse(HttpStatus.SC_BAD_REQUEST, fileName);
+        return givenFailHttpResponse(HttpResponseStatus.BAD_REQUEST.code(), fileName);
     }
 
     protected HttpClientResponse givenFailHttpResponse(int statusCode, String fileName) {

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

@@ -1,8 +1,8 @@
 package org.prebid.server.hooks.modules.optable.targeting.v1.net;
 
+import io.netty.handler.codec.http.HttpResponseStatus;
 import io.vertx.core.Future;
 import io.vertx.core.MultiMap;
-import org.apache.http.HttpStatus;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -122,8 +122,8 @@ public void shouldNotFailWhenHttpClientIsCrashed() {
     @Test
     public void shouldNotFailWhenInternalErrorOccurs() {
         //  given
-        when(httpClient.get(any(), any(), anyLong())).thenReturn(Future.succeededFuture(
-                givenFailHttpResponse(HttpStatus.SC_INTERNAL_SERVER_ERROR, "plain_text_response.json")));
+        when(httpClient.get(any(), any(), anyLong())).thenReturn(Future.succeededFuture(givenFailHttpResponse(
+                HttpResponseStatus.INTERNAL_SERVER_ERROR.code(), "plain_text_response.json")));
 
         // when
         final Future<TargetingResult> result = target.getTargeting(
@@ -143,8 +143,8 @@ public void shouldUseAuthorizationHeaderIfApiKeyIsPresent() {
         target = new APIClientImpl("http://endpoint.optable.com", httpClient, jacksonMapper, 10);
 
         when(httpClient.get(any(), any(), anyLong()))
-                .thenReturn(Future.succeededFuture(givenFailHttpResponse(HttpStatus.SC_INTERNAL_SERVER_ERROR,
-                        "plain_text_response.json")));
+                .thenReturn(Future.succeededFuture(givenFailHttpResponse(
+                        HttpResponseStatus.INTERNAL_SERVER_ERROR.code(), "plain_text_response.json")));
 
         // when
         final Future<TargetingResult> result = target.getTargeting(givenOptableTargetingProperties(false),
@@ -162,14 +162,14 @@ public void shouldUseAuthorizationHeaderIfApiKeyIsPresent() {
     public void shouldBuildApiUrlByReplacingTenantAndOriginMacros() {
         //  given
         target = new APIClientImpl(
-                "http://endpoint.optable.com?t={{TENANT}}&o={{ORIGIN}}",
+                "http://endpoint.optable.com?t={TENANT}&o={ORIGIN}",
                 httpClient,
                 jacksonMapper,
                 10);
 
         when(httpClient.get(any(), any(), anyLong()))
-                .thenReturn(Future.succeededFuture(givenFailHttpResponse(HttpStatus.SC_INTERNAL_SERVER_ERROR,
-                        "plain_text_response.json")));
+                .thenReturn(Future.succeededFuture(givenFailHttpResponse(
+                        HttpResponseStatus.INTERNAL_SERVER_ERROR.code(), "plain_text_response.json")));
 
         // when
         final Future<TargetingResult> result = target.getTargeting(givenOptableTargetingProperties(false),
@@ -187,7 +187,7 @@ public void shouldBuildApiUrlByReplacingTenantAndOriginMacros() {
     public void shouldNotUseAuthorizationHeaderIfApiKeyIsAbsent() {
         //  given
         when(httpClient.get(any(), any(), anyLong())).thenReturn(Future.succeededFuture(
-                givenFailHttpResponse(HttpStatus.SC_INTERNAL_SERVER_ERROR, "plain_text_response.json")));
+                givenFailHttpResponse(HttpResponseStatus.INTERNAL_SERVER_ERROR.code(), "plain_text_response.json")));
 
         // when
         final Future<TargetingResult> result = target.getTargeting(
@@ -209,7 +209,7 @@ public void shouldNotUseAuthorizationHeaderIfApiKeyIsAbsent() {
     public void shouldPassThroughIpAddressesAndUserAgent() {
         //  given
         when(httpClient.get(any(), any(), anyLong())).thenReturn(Future.succeededFuture(
-                givenFailHttpResponse(HttpStatus.SC_INTERNAL_SERVER_ERROR, "plain_text_response.json")));
+                givenFailHttpResponse(HttpResponseStatus.INTERNAL_SERVER_ERROR.code(), "plain_text_response.json")));
 
         // when
         final Future<TargetingResult> result = target.getTargeting(
@@ -233,7 +233,7 @@ public void shouldPassThroughIpAddressesAndUserAgent() {
     public void shouldNotPassThroughIpAddressAndUserAgentWhenNotSpecified() {
         //  given
         when(httpClient.get(any(), any(), anyLong())).thenReturn(Future.succeededFuture(
-                givenFailHttpResponse(HttpStatus.SC_INTERNAL_SERVER_ERROR, "plain_text_response.json")));
+                givenFailHttpResponse(HttpResponseStatus.INTERNAL_SERVER_ERROR.code(), "plain_text_response.json")));
 
         // when
         final Future<TargetingResult> result = target.getTargeting(

extra/modules/pb-response-correction/src/main/java/org/prebid/server/hooks/modules/pb/response/correction/core/correction/appvideohtml/AppVideoHtmlCorrection.java

@@ -134,5 +134,4 @@ private ExtBidPrebid parseExtBidPrebid(Bid bid) {
             return null;
         }
     }
-
 }

extra/modules/pb-response-correction/src/test/java/org/prebid/server/hooks/modules/pb/response/correction/core/correction/appvideohtml/AppVideoHtmlCorrectionProducerTest.java

@@ -62,5 +62,4 @@ public void shouldProduceReturnTrueWhenConfigIsEnabledAndBidRequestHasApp() {
     private static Config givenConfig(boolean enabled) {
         return Config.of(true, AppVideoHtmlConfig.of(enabled, null));
     }
-
 }

extra/modules/pb-richmedia-filter/src/main/java/org/prebid/server/hooks/modules/pb/richmedia/filter/config/PbRichmediaFilterModuleConfiguration.java

@@ -34,5 +34,4 @@ PbRichmediaFilterModule pbRichmediaFilterModule(
                         new BidResponsesMraidFilter(),
                         new ModuleConfigResolver(mapper, globalProperties))));
     }
-
 }

extra/modules/pb-richmedia-filter/src/main/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/BidResponsesMraidFilter.java

@@ -64,5 +64,4 @@ public MraidFilterResult filterByPattern(String mraidScriptPattern,
 
         return MraidFilterResult.of(filteredResponses, analyticsResults);
     }
-
 }

extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/BidResponsesMraidFilterTest.java

@@ -103,5 +103,4 @@ private static BidderBid givenBid(String impId, String adm) {
     private static BidderError givenError(String... rejectedImps) {
         return BidderError.of("Invalid bid", BidderError.Type.invalid_bid, Set.of(rejectedImps));
     }
-
 }

extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/core/ModuleConfigResolverTest.java

@@ -99,5 +99,4 @@ public void resolveShouldReturnGlobalConfigWhenAccountConfigMissingProperties()
         // then
         assertThat(actualProperties).isEqualTo(GLOBAL_PROPERTIES);
     }
-
 }

extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/v1/PbRichmediaFilterAllProcessedBidResponsesHookTest.java

@@ -280,5 +280,4 @@ private static AnalyticsResult givenAnalyticsResult(String bidder, String... rej
                         Bid.builder().id("bid-" + impId).impid(impId).build()).build()).toList(),
                 RESPONSE_REJECTED_INVALID_CREATIVE);
     }
-
 }

extra/modules/pb-richmedia-filter/src/test/java/org/prebid/server/hooks/modules/pb/richmedia/filter/v1/PbRichmediaFilterModuleTest.java

@@ -11,5 +11,4 @@ public void shouldHaveValidInitialConfigs() {
         // given and when and then
         assertThat(PbRichmediaFilterModule.CODE).isEqualTo("pb-richmedia-filter");
     }
-
 }

extra/modules/pb-rule-engine/src/test/java/org/prebid/server/hooks/modules/rule/engine/core/request/schema/functions/DomainFunctionTest.java

@@ -132,5 +132,4 @@ private static SchemaFunctionArguments<BidRequest, RequestRuleContext> givenFunc
                 null,
                 RequestRuleContext.of(AuctionContext.builder().build(), Granularity.Request.instance(), "datacenter"));
     }
-
 }

extra/pom.xml

@@ -39,9 +39,7 @@
         <commons.collections.version>4.4</commons.collections.version>
         <commons.compress.version>1.27.1</commons.compress.version>
         <commons-math3.version>3.6.1</commons-math3.version>
-        <commons-validator.version>1.10.0</commons-validator.version>
         <scram.version>2.1</scram.version>
-        <httpclient.version>4.5.14</httpclient.version>
         <ipaddress.version>5.5.1</ipaddress.version>
         <oshi.version>6.8.0</oshi.version>
         <json-schema-validator.version>1.5.6</json-schema-validator.version>
@@ -137,23 +135,6 @@
                 <artifactId>commons-math3</artifactId>
                 <version>${commons-math3.version}</version>
             </dependency>
-            <dependency>
-                <groupId>commons-validator</groupId>
-                <artifactId>commons-validator</artifactId>
-                <version>${commons-validator.version}</version>
-            </dependency>
-            <!-- TODO: refactor code to replace URIBuilder with something else so that this dep can be removed -->
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>${httpclient.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>com.github.seancfoley</groupId>
                 <artifactId>ipaddress</artifactId>

pom.xml

@@ -80,6 +80,10 @@
             <groupId>io.vertx</groupId>
             <artifactId>vertx-auth-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-uri-template</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.ongres.scram</groupId>
             <artifactId>client</artifactId>
@@ -110,14 +114,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-validator</groupId>
-            <artifactId>commons-validator</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.github.seancfoley</groupId>
             <artifactId>ipaddress</artifactId>

sample/configs/prebid-config-db.yaml

@@ -2,7 +2,7 @@ status-response: "ok"
 adapters:
   appnexus:
     enabled: true
-  ix:
+  criteo:
     enabled: true
   openx:
     enabled: true

sample/configs/prebid-config-s3.yaml

@@ -7,7 +7,7 @@ server:
 adapters:
   appnexus:
     enabled: true
-  ix:
+  criteo:
     enabled: true
   openx:
     enabled: true

sample/configs/prebid-config-with-51d-dd.yaml

@@ -2,7 +2,7 @@ status-response: "ok"
 adapters:
   appnexus:
     enabled: true
-  ix:
+  criteo:
     enabled: true
   openx:
     enabled: true

sample/configs/prebid-config-with-module.yaml

@@ -2,7 +2,7 @@ status-response: "ok"
 adapters:
   appnexus:
     enabled: true
-  ix:
+  criteo:
     enabled: true
   openx:
     enabled: true

sample/configs/prebid-config-with-optable.yaml

@@ -2,7 +2,7 @@ status-response: "ok"
 adapters:
   appnexus:
     enabled: true
-  ix:
+  criteo:
     enabled: true
   openx:
     enabled: true

sample/configs/prebid-config-with-wurfl.yaml

@@ -2,7 +2,7 @@ status-response: "ok"
 adapters:
   appnexus:
     enabled: true
-  ix:
+  criteo:
     enabled: true
   openx:
     enabled: true

sample/configs/prebid-config.yaml

@@ -2,7 +2,7 @@ status-response: "ok"
 adapters:
   appnexus:
     enabled: true
-  ix:
+  criteo:
     enabled: true
   openx:
     enabled: true