diff --git a/src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java b/src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java index 79517afcc6d..be937e1bb44 100644 --- a/src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java @@ -128,7 +128,7 @@ static class HttpSettingsConfiguration { @Bean HttpApplicationSettings httpApplicationSettings( - @Value("${settings.http.rfc3986-compatible:false}") boolean isRfc3986Compatible, + @Value("${settings.http.rfc3986-compatible:true}") boolean isRfc3986Compatible, HttpClient httpClient, JacksonMapper mapper, @Value("${settings.http.endpoint}") String endpoint, diff --git a/src/test/groovy/org/prebid/server/functional/testcontainers/PbsConfig.groovy b/src/test/groovy/org/prebid/server/functional/testcontainers/PbsConfig.groovy index 857cf3cec8d..1163c070e1e 100644 --- a/src/test/groovy/org/prebid/server/functional/testcontainers/PbsConfig.groovy +++ b/src/test/groovy/org/prebid/server/functional/testcontainers/PbsConfig.groovy @@ -52,10 +52,11 @@ LIMIT 1 } static Map getHttpSettingsConfig(String rootUri = networkServiceContainer.rootUri) { - ["settings.http.endpoint" : "$rootUri/stored-requests".toString(), - "settings.http.amp-endpoint" : "$rootUri/amp-stored-requests".toString(), - "settings.http.video-endpoint" : "$rootUri/video-stored-requests".toString(), - "settings.http.category-endpoint": "$rootUri/video-categories".toString()].asImmutable() + ["settings.http.endpoint" : "$rootUri/stored-requests".toString(), + "settings.http.amp-endpoint" : "$rootUri/amp-stored-requests".toString(), + "settings.http.video-endpoint" : "$rootUri/video-stored-requests".toString(), + "settings.http.rfc3986-compatible": "false", + "settings.http.category-endpoint" : "$rootUri/video-categories".toString()].asImmutable() } static Map getAdminEndpointConfig() { @@ -101,6 +102,7 @@ LIMIT 1 "settings.database.idle-connection-timeout": "300" ].asImmutable() } + static Map getPostgreSqlConfig(PostgreSQLContainer postgres = Dependencies.postgresqlContainer) { ["settings.database.type" : "postgres", "settings.database.host" : postgres.getNetworkAliases().get(0),