Fix conflicts

Author: AntoxaAntoxic

src/main/java/org/prebid/server/cache/CoreCacheService.java

@@ -6,10 +6,11 @@
 import com.iab.openrtb.response.Bid;
 import io.vertx.core.Future;
 import io.vertx.core.MultiMap;
+import io.vertx.uritemplate.UriTemplate;
+import io.vertx.uritemplate.Variables;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.client.utils.URIBuilder;
 import org.prebid.server.auction.model.AuctionContext;
 import org.prebid.server.auction.model.BidInfo;
 import org.prebid.server.auction.model.CachedDebugLog;
@@ -47,7 +48,6 @@
 import org.prebid.server.vertx.httpclient.HttpClient;
 import org.prebid.server.vertx.httpclient.model.HttpClientResponse;
 
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.time.Clock;
 import java.util.ArrayList;
@@ -70,8 +70,6 @@ public class CoreCacheService {
     private static final String BID_WURL_ATTRIBUTE = "wurl";
     private static final String TRACE_INFO_SEPARATOR = "-";
     private static final int MAX_DATACENTER_REGION_LENGTH = 4;
-    private static final String UUID_QUERY_PARAMETER = "uuid";
-    private static final String CH_QUERY_PARAMETER = "ch";
 
     private final HttpClient httpClient;
     private final URL externalEndpointUrl;
@@ -648,18 +646,16 @@ public Future<HttpClientResponse> getCachedObject(String key, String ch, Timeout
             return Future.failedFuture(new TimeoutException("Timeout has been exceeded"));
         }
 
-        final URL endpointUrl = ObjectUtils.firstNonNull(internalEndpointUrl, externalEndpointUrl);
-        final String url;
-        try {
-            final URIBuilder uriBuilder = new URIBuilder(endpointUrl.toString());
-            uriBuilder.addParameter(UUID_QUERY_PARAMETER, key);
-            if (StringUtils.isNotBlank(ch)) {
-                uriBuilder.addParameter(CH_QUERY_PARAMETER, ch);
-            }
-            url = uriBuilder.build().toString();
-        } catch (URISyntaxException e) {
-            return Future.failedFuture(new IllegalArgumentException("Configured cache url is malformed", e));
+        final String endpointUrl = ObjectUtils.firstNonNull(internalEndpointUrl, externalEndpointUrl).toString();
+        final StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append(endpointUrl);
+        stringBuilder.append(endpointUrl.contains("?") ? "{&uuid}" : "{?uuid}");
+        if (StringUtils.isNotBlank(ch)) {
+            stringBuilder.append("{&ch}");
         }
+        final String url = UriTemplate.of(stringBuilder.toString()).expandToString(Variables.variables()
+                .set("uuid", key)
+                .set("ch", ch));
 
         final long startTime = clock.millis();
         return httpClient.get(url, cacheHeaders, remainingTimeout)

src/test/java/org/prebid/server/cache/CoreCacheServiceTest.java

@@ -1455,15 +1455,19 @@ public void getCachedObjectShouldAddUuidAndChQueryParamsBeforeSendingWhenChIsPre
                 MultiMap.caseInsensitiveMultiMap().add("Header", "Value"),
                 "body");
 
-        given(httpClient.get(eq("http://cache-service/cache?uuid=key&ch=ch"), any(), anyLong()))
-                .willReturn(Future.succeededFuture(response));
+        given(httpClient.get(any(), any(), anyLong())).willReturn(Future.succeededFuture(response));
 
         // when
         final Future<HttpClientResponse> result = target.getCachedObject("key", "ch", timeout);
 
         // then
         assertThat(result.result()).isEqualTo(response);
         verify(metrics).updateVtrackCacheReadRequestTime(anyLong(), eq(MetricName.ok));
+        final ArgumentCaptor<String> urlCaptor = ArgumentCaptor.forClass(String.class);
+        verify(httpClient).get(urlCaptor.capture(), any(), anyLong());
+        assertThat(urlCaptor.getValue())
+                .startsWith("http://cache-service/cache?")
+                .contains("uuid=key", "ch=ch");
     }
 
     @Test
@@ -1487,13 +1491,13 @@ public void getCachedObjectShouldAddUuidQueryParamsBeforeSendingWhenChIsAbsent()
 
     @Test
     public void getCachedObjectShouldAddUuidQueryParamsToInternalBeforeSendingWhenChIsAbsent()
-            throws MalformedURLException {
+            throws MalformedURLException, URISyntaxException {
 
         // given
         target = new CoreCacheService(
                 httpClient,
-                new URL("http://cache-service/cache"),
-                new URL("http://internal-cache-service/cache"),
+                new URI("http://cache-service/cache").toURL(),
+                new URI("http://internal-cache-service/cache").toURL(),
                 "http://cache-service-host/cache?uuid=",
                 100L,
                 "ApiKey",
@@ -1525,12 +1529,7 @@ public void getCachedObjectShouldAddUuidQueryParamsToInternalBeforeSendingWhenCh
     @Test
     public void getCachedObjectShouldNotLogErrorMetricsWhenCacheIsNotReached() {
         // given
-        final HttpClientResponse response = HttpClientResponse.of(
-                200,
-                MultiMap.caseInsensitiveMultiMap().add("Header", "Value"),
-                "body");
-
-        given(httpClient.get(eq("http://cache-service/cache?uuid=key&ch=ch"), any(), anyLong()))
+        given(httpClient.get(any(), any(), anyLong()))
                 .willReturn(Future.failedFuture(new TimeoutException("Timeout")));
 
         // when
@@ -1549,8 +1548,7 @@ public void getCachedObjectShouldHandleErrorResponse() {
                 null,
                 jacksonMapper.encodeToString(CacheErrorResponse.builder().message("Resource not found").build()));
 
-        given(httpClient.get(eq("http://cache-service/cache?uuid=key&ch=ch"), any(), anyLong()))
-                .willReturn(Future.succeededFuture(response));
+        given(httpClient.get(any(), any(), anyLong())).willReturn(Future.succeededFuture(response));
 
         // when
         final Future<HttpClientResponse> result = target.getCachedObject("key", "ch", timeout);
@@ -1565,8 +1563,7 @@ public void getCachedObjectShouldFailWhenErrorResponseCanNotBeParsed() {
         // given
         final HttpClientResponse response = HttpClientResponse.of(404, null, "Resource not found");
 
-        given(httpClient.get(eq("http://cache-service/cache?uuid=key&ch=ch"), any(), anyLong()))
-                .willReturn(Future.succeededFuture(response));
+        given(httpClient.get(any(), any(), anyLong())).willReturn(Future.succeededFuture(response));
 
         // when
         final Future<HttpClientResponse> result = target.getCachedObject("key", "ch", timeout);