Bidder Configuration Fixes

AntoxaAntoxic · AntoxaAntoxic · commit 704ab67b15b2 · 2025-08-08T08:35:19.000+02:00
diff --git a/src/main/java/org/prebid/server/bidder/adkernel/AdkernelBidder.java b/src/main/java/org/prebid/server/bidder/adkernel/AdkernelBidder.java
@@ -41,6 +41,8 @@ public class AdkernelBidder implements Bidder<BidRequest> {
             new TypeReference<>() {
             };
 
+    private static final String ZONE_ID_MACRO = "{{ZoneId}}";
+
     private static final String MF_SUFFIX = "__mf";
     private static final String MF_SUFFIX_BANNER = "b" + MF_SUFFIX;
     private static final String MF_SUFFIX_VIDEO = "v" + MF_SUFFIX;
@@ -49,11 +51,11 @@ public class AdkernelBidder implements Bidder<BidRequest> {
 
     private static final int MF_SUFFIX_LENGTH = MF_SUFFIX.length() + 1;
 
-    private final String endpointTemplate;
+    private final String endpointUrl;
     private final JacksonMapper mapper;
 
-    public AdkernelBidder(String endpointTemplate, JacksonMapper mapper) {
-        this.endpointTemplate = HttpUtil.validateUrl(Objects.requireNonNull(endpointTemplate));
+    public AdkernelBidder(String endpointUrl, JacksonMapper mapper) {
+        this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl));
         this.mapper = Objects.requireNonNull(mapper);
     }
 
@@ -183,10 +185,9 @@ private HttpRequest<BidRequest> createHttpRequest(Map.Entry<ExtImpAdkernel, List
                                                       App app) {
 
         final ExtImpAdkernel impExt = extAndImp.getKey();
-        final String uri = endpointTemplate.formatted(impExt.getZoneId());
+        final String uri = endpointUrl.replace(ZONE_ID_MACRO, HttpUtil.encodeUrl(impExt.getZoneId().toString()));
 
-        final MultiMap headers = HttpUtil.headers()
-                .add(HttpUtil.X_OPENRTB_VERSION_HEADER, "2.5");
+        final MultiMap headers = HttpUtil.headers().add(HttpUtil.X_OPENRTB_VERSION_HEADER, "2.5");
 
         final BidRequest outgoingRequest = createBidRequest(extAndImp.getValue(), requestBuilder, site, app);
 
diff --git a/src/main/java/org/prebid/server/bidder/audiencenetwork/AudienceNetworkBidder.java b/src/main/java/org/prebid/server/bidder/audiencenetwork/AudienceNetworkBidder.java
@@ -53,23 +53,26 @@ public class AudienceNetworkBidder implements Bidder<BidRequest> {
 
     private static final List<Integer> SUPPORTED_BANNER_HEIGHT = Arrays.asList(250, 50);
 
+    private static final String PLATFORM_MACRO = "{{PlatformId}}";
+    private static final String REQUEST_MACRO = "{{RequestId}}";
+    private static final String PUBLISHER_MACRO = "{{PublisherId}}";
+
     private final String endpointUrl;
     private final String platformId;
     private final String appSecret;
-    private final String timeoutNotificationUrlTemplate;
+    private final String timeoutNotificationUrl;
     private final JacksonMapper mapper;
 
     public AudienceNetworkBidder(String endpointUrl,
                                  String platformId,
                                  String appSecret,
-                                 String timeoutNotificationUrlTemplate,
+                                 String timeoutNotificationUrl,
                                  JacksonMapper mapper) {
 
         this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl));
         this.platformId = checkBlankString(Objects.requireNonNull(platformId), "platform-id");
         this.appSecret = checkBlankString(Objects.requireNonNull(appSecret), "app-secret");
-        this.timeoutNotificationUrlTemplate = HttpUtil.validateUrl(
-                Objects.requireNonNull(timeoutNotificationUrlTemplate));
+        this.timeoutNotificationUrl = HttpUtil.validateUrl(Objects.requireNonNull(timeoutNotificationUrl));
         this.mapper = Objects.requireNonNull(mapper);
     }
 
@@ -343,7 +346,9 @@ public HttpRequest<Void> makeTimeoutNotification(HttpRequest<BidRequest> httpReq
 
         return HttpRequest.<Void>builder()
                 .method(HttpMethod.GET)
-                .uri(timeoutNotificationUrlTemplate.formatted(platformId, publisherId, requestId))
+                .uri(timeoutNotificationUrl.replace(PLATFORM_MACRO, HttpUtil.encodeUrl(platformId))
+                        .replace(PUBLISHER_MACRO, HttpUtil.encodeUrl(publisherId))
+                        .replace(REQUEST_MACRO, HttpUtil.encodeUrl(requestId)))
                 .build();
     }
 }
diff --git a/src/main/resources/bidder-config/adkernel.yaml b/src/main/resources/bidder-config/adkernel.yaml
@@ -1,6 +1,6 @@
 adapters:
   adkernel:
-    endpoint: http://pbs.adksrv.com/hb?zone=%s
+    endpoint: http://pbs.adksrv.com/hb?zone={{ZoneId}}
     endpoint-compression: gzip
     aliases:
       rxnetwork: ~
diff --git a/src/main/resources/bidder-config/audiencenetwork.yaml b/src/main/resources/bidder-config/audiencenetwork.yaml
@@ -11,4 +11,4 @@ adapters:
       vendor-id: 0
     platform-id:
     app-secret:
-    timeout-notification-url-template: https://www.facebook.com/audiencenetwork/nurl/?partner=%s&app=%s&auction=%s&ortb_loss_code=2
+    timeout-notification-url-template: https://www.facebook.com/audiencenetwork/nurl/?partner={{PlatformId}}&app={{PublisherId}}&auction={{RequestId}}&ortb_loss_code=2
diff --git a/src/main/resources/bidder-config/ix.yaml b/src/main/resources/bidder-config/ix.yaml
@@ -1,7 +1,7 @@
 adapters:
   ix:
     # Please contact the maintainer to obtain endpoint details
-    endpoint: https://
+    endpoint: https://localhost
     ortb-version: "2.6"
     meta-info:
       maintainer-email: pdu-supply-prebid@indexexchange.com
diff --git a/src/test/java/org/prebid/server/bidder/adkernel/AdkernelBidderTest.java b/src/test/java/org/prebid/server/bidder/adkernel/AdkernelBidderTest.java
@@ -46,7 +46,7 @@
 
 public class AdkernelBidderTest extends VertxTest {
 
-    private static final String ENDPOINT_URL = "https://test.com?zone=%s";
+    private static final String ENDPOINT_URL = "https://test.com?zone={{ZoneId}}";
 
     private final AdkernelBidder target = new AdkernelBidder(ENDPOINT_URL, jacksonMapper);
 
diff --git a/src/test/java/org/prebid/server/bidder/audiencenetwork/AudienceNetworkBidderTest.java b/src/test/java/org/prebid/server/bidder/audiencenetwork/AudienceNetworkBidderTest.java
@@ -46,7 +46,8 @@ public class AudienceNetworkBidderTest extends VertxTest {
     private static final String PLATFORM_ID = "101";
     private static final String APP_SECRET = "6237";
     private static final String DEFAULT_BID_CURRENCY = "USD";
-    public static final String TIMEOUT_NOTIFICATION_URL_TEMPLATE = "https://url/?p=%s&a=%s&auction=%s&ortb_loss_code=2";
+    public static final String TIMEOUT_NOTIFICATION_URL_TEMPLATE =
+            "https://url/?p={{PlatformId}}&a={{PublisherId}}&auction={{RequestId}}&ortb_loss_code=2";
 
     private final AudienceNetworkBidder target = new AudienceNetworkBidder(
             ENDPOINT_URL,
diff --git a/src/test/java/org/prebid/server/bidder/huaweiads/HuaweiEndpointResolverTest.java b/src/test/java/org/prebid/server/bidder/huaweiads/HuaweiEndpointResolverTest.java
@@ -3,19 +3,16 @@
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
-@ExtendWith(MockitoExtension.class)
 public class HuaweiEndpointResolverTest {
 
     private static final String ENDPOINT_URL = "https://test-url.org/";
     private static final String CHINESE_ENDPOINT_URL = "https://test-url.org/china";
     private static final String EUROPEAN_ENDPOINT_URL = "https://test-url.org/europe";
-    private static final String RUSSIAN_ENDPOINT_URL = "https://test-url.orc/russia";
+    private static final String RUSSIAN_ENDPOINT_URL = "https://test-url.org/russia";
     private static final String ASIAN_ENDPOINT_URL = "https://test-url.org/asian";
 
     private HuaweiEndpointResolver target;
diff --git a/src/test/java/org/prebid/server/execution/file/supplier/RemoteFileSupplierTest.java b/src/test/java/org/prebid/server/execution/file/supplier/RemoteFileSupplierTest.java
@@ -74,7 +74,7 @@ public void setUp() {
 
     private RemoteFileSupplier target(boolean checkRemoteFileSize) {
         return new RemoteFileSupplier(
-                "https://download.url/",
+                "https://download.url.com/",
                 SAVE_PATH,
                 TMP_PATH,
                 httpClient,
diff --git a/src/test/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreatorTest.java b/src/test/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreatorTest.java
@@ -8,8 +8,6 @@
 import org.prebid.server.spring.config.bidder.model.usersync.UsersyncConfigurationProperties;
 import org.prebid.server.spring.config.bidder.model.usersync.UsersyncMethodConfigurationProperties;
 
-import java.net.MalformedURLException;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -57,7 +55,7 @@ public void createShouldValidateExternalUrl() {
 
         // given, when and then
         assertThatThrownBy(() -> UsersyncerCreator.create(null).apply(config, CookieFamilySource.ROOT))
-                .hasCauseExactlyInstanceOf(MalformedURLException.class)
+                .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("URL supplied is not valid: null");
     }
 
diff --git a/src/test/resources/org/prebid/server/it/test-application.properties b/src/test/resources/org/prebid/server/it/test-application.properties
@@ -16,6 +16,8 @@ adapters.generic.aliases.infytv.enabled=true
 adapters.generic.aliases.infytv.endpoint=http://localhost:8090/infytv-exchange
 adapters.generic.aliases.zeta_global_ssp.enabled=true
 adapters.generic.aliases.zeta_global_ssp.endpoint=http://localhost:8090/zeta_global_ssp-exchange
+adapters.aax.enabled=true
+adapters.aax.endpoint=http://localhost:8090/aax-exchange
 adapters.aceex.enabled=true
 adapters.aceex.endpoint=http://localhost:8090/aceex-exchange
 adapters.acuityads.enabled=true
@@ -34,7 +36,7 @@ adapters.adhese.endpoint=http://localhost:8090/adhese-exchange
 adapters.adkerneladn.enabled=true
 adapters.adkerneladn.endpoint=http://localhost:8090/adkerneladn-exchange?account={{PublisherID}}
 adapters.adkernel.enabled=true
-adapters.adkernel.endpoint=http://localhost:8090/adkernel-exchange?zone=%s
+adapters.adkernel.endpoint=http://localhost:8090/adkernel-exchange?zone={{ZoneId}}
 adapters.adman.enabled=true
 adapters.adman.endpoint=http://localhost:8090/adman-exchange
 adapters.admatic.enabled=true
@@ -632,8 +634,6 @@ adapters.zentotem.enabled=true
 adapters.zentotem.endpoint=http://localhost:8090/zentotem-exchange
 adapters.zeroclickfraud.enabled=true
 adapters.zeroclickfraud.endpoint=http://{{Host}}/zeroclickfraud-exchange?sid={{SourceId}}
-adapters.aax.enabled=true
-adapters.aax.endpoint=http://localhost:8090/aax-exchange
 adapters.zmaticoo.enabled=true
 adapters.zmaticoo.endpoint=http://localhost:8090/zmaticoo-exchange
 adapters.yearxero.enabled=true
