add-D4Metric-6.3

src/main/java/com/demo/seecanalysisbackend/config/ElasticsearchConfig.java

@@ -1,13 +1,9 @@
 package com.demo.seecanalysisbackend.config;
 
-import org.apache.hc.core5.http.EntityDetails;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.protocol.HttpContext;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
 import org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration;
-import org.springframework.data.elasticsearch.client.elc.rest5_client.Rest5Clients;
 
 import java.net.URI;
 import java.time.Duration;
@@ -31,9 +27,6 @@ public class ElasticsearchConfig extends ElasticsearchConfiguration {
     @Value("${spring.elasticsearch.client.connection-timeout:${spring.elasticsearch.connection-timeout:5s}}")
     private Duration connectionTimeout;
 
-    @Value("${spring.elasticsearch.client.force-json-media-type:true}")
-    private boolean forceJsonMediaType;
-
     @Override
     public ClientConfiguration clientConfiguration() {
         String[] hosts = Arrays.stream(uris.split(","))
@@ -47,17 +40,6 @@ public class ElasticsearchConfig extends ElasticsearchConfiguration {
             .withConnectTimeout(connectionTimeout)
             .withSocketTimeout(socketTimeout);
 
-        if (forceJsonMediaType) {
-            builder = builder.withClientConfigurer(
-                Rest5Clients.ElasticsearchRest5ClientConfigurationCallback.from(restClientBuilder -> {
-                    restClientBuilder.setHttpClientConfigCallback(httpClientBuilder ->
-                        httpClientBuilder.addRequestInterceptorLast(this::rewriteMediaTypeHeaders)
-                    );
-                    return restClientBuilder;
-                })
-            );
-        }
-
         if (username != null && !username.isBlank()) {
             return builder.withBasicAuth(username, password == null ? "" : password).build();
         }
@@ -65,16 +47,6 @@ public class ElasticsearchConfig extends ElasticsearchConfiguration {
         return builder.build();
     }
 
-    private void rewriteMediaTypeHeaders(HttpRequest request, EntityDetails entityDetails, HttpContext context) {
-        request.removeHeaders("Accept");
-        request.setHeader("Accept", "application/json");
-
-        if (entityDetails != null) {
-            request.removeHeaders("Content-Type");
-            request.setHeader("Content-Type", "application/json");
-        }
-    }
-
     private String toHostPort(String uriText) {
         URI uri = URI.create(uriText);
         int port = uri.getPort();

src/main/resources/application.yml

@@ -10,7 +10,6 @@ spring:
     socket-timeout: ${ELASTICSEARCH_SOCKET_TIMEOUT:10s}
     client:
       compatibility-mode: ${ELASTICSEARCH_COMPATIBILITY_MODE:false}
-      force-json-media-type: ${ELASTICSEARCH_FORCE_JSON_MEDIA_TYPE:true}
       connection-timeout: ${ELASTICSEARCH_CLIENT_CONNECTION_TIMEOUT:5s}
       socket-timeout: ${ELASTICSEARCH_CLIENT_SOCKET_TIMEOUT:60s}