diff --git a/src/main/java/io/kontur/disasterninja/config/WebConfiguration.java b/src/main/java/io/kontur/disasterninja/config/WebConfiguration.java index 89443ae4..285cb9d9 100644 --- a/src/main/java/io/kontur/disasterninja/config/WebConfiguration.java +++ b/src/main/java/io/kontur/disasterninja/config/WebConfiguration.java @@ -11,7 +11,7 @@ import io.kontur.disasterninja.client.InsightsApiClientDummy; import io.kontur.disasterninja.client.InsightsApiGraphqlClient; import io.kontur.disasterninja.client.InsightsApiGraphqlClientDummy; -import io.kontur.disasterninja.config.interceptor.AcceptLanguageInterceptor; +import io.kontur.disasterninja.config.interceptor.UserLanguageInterceptor; import io.kontur.disasterninja.config.metrics.ParamLessRestTemplateExchangeTagsProvider; import io.kontur.disasterninja.controller.exception.WebApplicationException; import io.micrometer.core.instrument.MeterRegistry; @@ -126,13 +126,13 @@ public RestTemplate userProfileRestTemplate(RestTemplateBuilder builder, HttpCli @Value("${kontur.platform.userProfileApi.url}") String userProfileApiUrl, @Value("${kontur.platform.userProfileApi.connectionTimeout}") Integer connectionTimeout, @Value("${kontur.platform.userProfileApi.readTimeout}") Integer readTimeout, - ClientHttpRequestInterceptor acceptLanguageInterceptor) { + ClientHttpRequestInterceptor userLanguageInterceptor) { return builder .requestFactory(() -> new HttpComponentsClientHttpRequestFactory(httpClient)) .rootUri(userProfileApiUrl) .setConnectTimeout(Duration.of(connectionTimeout, ChronoUnit.SECONDS)) .setReadTimeout(Duration.of(readTimeout, ChronoUnit.SECONDS)) - .additionalInterceptors(acceptLanguageInterceptor) + .additionalInterceptors(userLanguageInterceptor) .build(); } @@ -203,8 +203,8 @@ public InsightsApiClient insightsApiClientDummy() { } @Bean - public ClientHttpRequestInterceptor acceptLanguageInterceptor() { - return new AcceptLanguageInterceptor(); + public ClientHttpRequestInterceptor userLanguageInterceptor() { + return new UserLanguageInterceptor(); } } diff --git a/src/main/java/io/kontur/disasterninja/config/interceptor/AcceptLanguageInterceptor.java b/src/main/java/io/kontur/disasterninja/config/interceptor/UserLanguageInterceptor.java similarity index 79% rename from src/main/java/io/kontur/disasterninja/config/interceptor/AcceptLanguageInterceptor.java rename to src/main/java/io/kontur/disasterninja/config/interceptor/UserLanguageInterceptor.java index 83b5edbb..d27dfffc 100644 --- a/src/main/java/io/kontur/disasterninja/config/interceptor/AcceptLanguageInterceptor.java +++ b/src/main/java/io/kontur/disasterninja/config/interceptor/UserLanguageInterceptor.java @@ -10,15 +10,15 @@ import javax.servlet.http.HttpServletRequest; import java.io.IOException; -public class AcceptLanguageInterceptor implements ClientHttpRequestInterceptor { +public class UserLanguageInterceptor implements ClientHttpRequestInterceptor { @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { HttpServletRequest currentRequest = getCurrentHttpRequest(); if (currentRequest != null) { - String acceptLanguage = currentRequest.getHeader("Accept-Language"); - if (acceptLanguage != null) { - request.getHeaders().add("Accept-Language", acceptLanguage); + String userLanguage = currentRequest.getHeader("User-Language"); + if (userLanguage != null) { + request.getHeaders().add("User-Language", userLanguage); } } return execution.execute(request, body); diff --git a/src/main/java/io/kontur/disasterninja/controller/AppsController.java b/src/main/java/io/kontur/disasterninja/controller/AppsController.java index 26bb6164..9ad41d89 100644 --- a/src/main/java/io/kontur/disasterninja/controller/AppsController.java +++ b/src/main/java/io/kontur/disasterninja/controller/AppsController.java @@ -144,7 +144,7 @@ public AppDto getAppConfig(@RequestParam(name = "appId", required = false) UUID return applicationService.getAppConfig(appId, xForwardedHost); } - @Operation(summary = "Get application asset by language and filename.") + @Operation(summary = "Get application asset by language and filename.", tags = {"Applications"}) @ApiResponse(responseCode = "200", description = "Success. The actual content type will vary based on the asset (e.g., image/jpeg, text/plain, etc.).", content = @Content(mediaType = APPLICATION_OCTET_STREAM_VALUE))