feature(refactoring):xxx fixed commit id on docker hub image.

eclipse-tractusx · Jun 18, 2024 · 634651e · 634651e
1 parent 507e7c9
commit 634651e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 84 deletions.
diff --git a/...nd/src/main/java/org/eclipse/tractusx/traceability/common/config/PolicyStartUpConfig.java b/...nd/src/main/java/org/eclipse/tractusx/traceability/common/config/PolicyStartUpConfig.java
@@ -75,6 +75,7 @@ public class PolicyStartUpConfig {
     public void registerDecentralRegistryPermissions() throws JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new JavaTimeModule());
+        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
         List<AcceptedPolicy> acceptedPolicy = buildAcceptedPolicies();
         defaultAcceptedPoliciesProvider.addAcceptedPolicies(acceptedPolicy);
         log.info("Successfully added permission to irs client lib provider: {}", mapper.writeValueAsString(acceptedPolicy));

diff --git a/...va/org/eclipse/tractusx/traceability/common/config/RequestResponseLoggingInterceptor.java b/...va/org/eclipse/tractusx/traceability/common/config/RequestResponseLoggingInterceptor.java
diff --git a/.../main/java/org/eclipse/tractusx/traceability/common/config/RestTemplateConfiguration.java b/.../main/java/org/eclipse/tractusx/traceability/common/config/RestTemplateConfiguration.java
@@ -103,7 +103,6 @@ public RestTemplate edcRestTemplate(@Autowired EdcProperties edcProperties) {
                 .rootUri(edcProperties.getProviderEdcUrl())
                 .defaultHeader(EDC_API_KEY_HEADER_NAME, edcProperties.getApiAuthKey())
                 .setConnectTimeout(Duration.ofSeconds(10L))
-               // .additionalInterceptors(new RequestResponseLoggingInterceptor())
                 .setReadTimeout(Duration.ofSeconds(25L))
                 .build();
     }
@@ -116,7 +115,6 @@ public RestTemplate edcDtrAssetRestTemplate(@Autowired EdcProperties edcProperti
                 .defaultHeader("Content-Type", MediaType.APPLICATION_JSON_VALUE)
                 .defaultHeader(EDC_API_KEY_HEADER_NAME, edcProperties.getApiAuthKey())
                 .setConnectTimeout(Duration.ofSeconds(10L))
-              //  .additionalInterceptors(new RequestResponseLoggingInterceptor())
                 .setReadTimeout(Duration.ofSeconds(25L))
                 .build();
     }
@@ -132,7 +130,6 @@ public RestTemplate digitalTwinRegistryCreateShellRestTemplate() {
     public RestTemplate edcNotificationTemplate(@Autowired EdcProperties edcProperties) {
         return new RestTemplateBuilder()
                 .defaultHeader(EDC_API_KEY_HEADER_NAME, edcProperties.getApiAuthKey())
-             //   .additionalInterceptors(new RequestResponseLoggingInterceptor())
                 .build();
     }
 
@@ -183,17 +180,8 @@ public RestTemplate digitalTwinRegistryRestTemplate(
     /* RestTemplate used by the edc client library*/
     @Bean(EDC_CLIENT_REST_TEMPLATE)
     public RestTemplate edcClientRestTemplate() {
-        ClientHttpRequestFactory factory = new BufferingClientHttpRequestFactory(new SimpleClientHttpRequestFactory());
-        RestTemplate restTemplate = new RestTemplate(factory);
-
-        List<ClientHttpRequestInterceptor> interceptors = restTemplate.getInterceptors();
-        if (CollectionUtils.isEmpty(interceptors)) {
-            interceptors = new ArrayList<>();
-        }
-       // interceptors.add(new RequestResponseLoggingInterceptor());
-        restTemplate.setErrorHandler(new DefaultResponseErrorHandler());
-      //  restTemplate.setInterceptors(interceptors);
-        return restTemplate;
+        return new RestTemplateBuilder()
+                .build();
     }
 
     private RestTemplateBuilder oAuthRestTemplate(final RestTemplateBuilder restTemplateBuilder,