use default message converters. only override jackson msg converter

admin-ch · Nov 11, 2021 · 58844dd · 58844dd
1 parent eefac48
commit 58844dd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/...java/ch/admin/bag/covidcertificate/backend/verification/check/ws/VerificationCheckWS.java b/...java/ch/admin/bag/covidcertificate/backend/verification/check/ws/VerificationCheckWS.java
@@ -14,7 +14,6 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @Configuration
 @ComponentScan(
@@ -24,7 +23,6 @@
             "ch.admin.bag.covidcertificate.rest"
         })
 @EnableAutoConfiguration
-@EnableWebMvc
 public class VerificationCheckWS {
 
     public static void main(String[] args) {

diff --git a/...java/ch/admin/bag/covidcertificate/backend/verification/check/ws/config/WsBaseConfig.java b/...java/ch/admin/bag/covidcertificate/backend/verification/check/ws/config/WsBaseConfig.java
@@ -18,21 +18,23 @@
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.module.kotlin.KotlinModule;
 import java.time.Instant;
-import java.util.List;
+import java.util.Collections;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.MediaType;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-public abstract class WsBaseConfig implements WebMvcConfigurer {
+public abstract class WsBaseConfig {
 
-    @Override
-    public void configureMessageConverters(final List<HttpMessageConverter<?>> converters) {
-        converters.add(new MappingJackson2HttpMessageConverter(objectMapper()));
-        WebMvcConfigurer.super.configureMessageConverters(converters);
+    @Bean
+    public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter() {
+        MappingJackson2HttpMessageConverter jacksonConverter =
+                new MappingJackson2HttpMessageConverter(objectMapper());
+        jacksonConverter.setSupportedMediaTypes(
+                Collections.singletonList(MediaType.APPLICATION_JSON));
+        return jacksonConverter;
     }
 
     @Bean