Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,11 @@ LIMIT 1
}

static Map<String, String> 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<String, String> getAdminEndpointConfig() {
Expand Down Expand Up @@ -101,6 +102,7 @@ LIMIT 1
"settings.database.idle-connection-timeout": "300"
].asImmutable()
}

static Map<String, String> getPostgreSqlConfig(PostgreSQLContainer postgres = Dependencies.postgresqlContainer) {
["settings.database.type" : "postgres",
"settings.database.host" : postgres.getNetworkAliases().get(0),
Expand Down
Loading