send if-modified-since, if-none-match headers to insights api (#144)

konturio · Jul 9, 2024 · 68d8e1a · 68d8e1a
1 parent 4a8dee1
commit 68d8e1a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/src/main/java/io/kontur/disasterninja/config/WebConfiguration.java b/src/main/java/io/kontur/disasterninja/config/WebConfiguration.java
@@ -19,7 +19,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.UserLanguageInterceptor;
+import io.kontur.disasterninja.config.interceptor.HeaderInterceptor;
 import io.kontur.disasterninja.config.metrics.ParamLessRestTemplateExchangeTagsProvider;
 import io.kontur.disasterninja.controller.exception.WebApplicationException;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -49,6 +49,7 @@
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.concurrent.TimeUnit;
+import java.util.List;
 
 @Configuration
 public class WebConfiguration {
@@ -111,12 +112,14 @@ public RestTemplate layersApiRestTemplate(RestTemplateBuilder builder, HttpClien
     public RestTemplate insightsApiRestTemplate(RestTemplateBuilder builder, HttpClient httpClient,
                                                 @Value("${kontur.platform.insightsApi.url}") String insightsApiUrl,
                                                 @Value("${kontur.platform.insightsApi.connectionTimeout}") Integer connectionTimeout,
-                                                @Value("${kontur.platform.insightsApi.readTimeout}") Integer readTimeout) {
+                                                @Value("${kontur.platform.insightsApi.readTimeout}") Integer readTimeout,
+                                                ClientHttpRequestInterceptor insightsHeadersInterceptor) {
         return builder
                 .requestFactory(() -> new HttpComponentsClientHttpRequestFactory(httpClient))
                 .rootUri(insightsApiUrl)
                 .setConnectTimeout(Duration.of(connectionTimeout, ChronoUnit.SECONDS))
                 .setReadTimeout(Duration.of(readTimeout, ChronoUnit.SECONDS))
+                .additionalInterceptors(insightsHeadersInterceptor)
                 .build();
     }
 
@@ -225,9 +228,14 @@ public InsightsApiClient insightsApiClientDummy() {
         return new InsightsApiClientDummy();
     }
 
+    @Bean
+    public ClientHttpRequestInterceptor insightsHeadersInterceptor() {
+        return new HeaderInterceptor(List.of("If-None-Match", "If-Modified-Since"));
+    }
+
     @Bean
     public ClientHttpRequestInterceptor userLanguageInterceptor() {
-        return new UserLanguageInterceptor();
+        return new HeaderInterceptor(List.of("User-Language"));
     }
 
 }
diff --git a/.../interceptor/UserLanguageInterceptor.java → ...config/interceptor/HeaderInterceptor.java b/.../interceptor/UserLanguageInterceptor.java → ...config/interceptor/HeaderInterceptor.java
@@ -9,16 +9,26 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.List;
 
-public class UserLanguageInterceptor implements ClientHttpRequestInterceptor {
+public class HeaderInterceptor implements ClientHttpRequestInterceptor {
+
+    private List<String> headers;
+
+    public HeaderInterceptor(List<String> headers) {
+        // what request headers should be passed from DN-BE further?
+        this.headers = headers;
+    }
 
     @Override
     public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException {
         HttpServletRequest currentRequest = getCurrentHttpRequest();
         if (currentRequest != null) {
-            String userLanguage = currentRequest.getHeader("User-Language");
-            if (userLanguage != null) {
-                request.getHeaders().add("User-Language", userLanguage);
+            for (String header : headers) {
+                String headerValue = currentRequest.getHeader(header);
+                if (headerValue != null) {
+                    request.getHeaders().add(header, headerValue);
+                }
             }
         }
         return execution.execute(request, body);
@@ -28,4 +38,4 @@ private HttpServletRequest getCurrentHttpRequest() {
         ServletRequestAttributes sra = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         return sra != null ? sra.getRequest() : null;
     }
-}
+}