optable-targeting: Patch host macro params to use {{}} instead of {}

Author: softcoder594

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

@@ -27,8 +27,8 @@ 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 HttpClient httpClient;

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

@@ -245,6 +245,6 @@ protected OptableTargetingProperties givenOptableTargetingProperties(String key,
     }
 
     protected Query givenQuery() {
-        return Query.of("que", "ry");
+        return Query.of("?que", "ry");
     }
 }

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

@@ -153,6 +153,31 @@ public void shouldUseAuthorizationHeaderIfApiKeyIsPresent() {
         assertThat(result.result()).isNull();
     }
 
+    @Test
+    public void shouldBuildApiUrlByReplacingTenantAndOriginMacros() {
+        //  given
+        target = new APIClientImpl(
+                "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")));
+
+        // when
+        final Future<TargetingResult> result = target.getTargeting(givenOptableTargetingProperties(false),
+                givenQuery(), List.of("8.8.8.8"), timeout);
+
+        // then
+        final ArgumentCaptor<String> endpointCaptor = ArgumentCaptor.forClass(String.class);
+        verify(httpClient).get(endpointCaptor.capture(), any(), anyLong());
+        assertThat(endpointCaptor.getValue())
+                .isEqualTo("http://endpoint.optable.com?t=accountId&o=origin?query");
+        assertThat(result.result()).isNull();
+    }
+
     @Test
     public void shouldNotUseAuthorizationHeaderIfApiKeyIsAbsent() {
         //  given

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

@@ -50,4 +50,4 @@ hooks:
     enabled: true
   modules:
     optable-targeting:
-      api-endpoint: https://na.edge.optable.co/v2/targeting?t={TENANT}&o={ORIGIN}
+      api-endpoint: https://na.edge.optable.co/v2/targeting?t={{TENANT}}&o={{ORIGIN}}