From 2697bf2ba1833af83b71729933e6c65e91e348b2 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Fri, 11 Nov 2016 12:09:16 -0800 Subject: [PATCH] Add Content-Type to allowed headers for CloudFoundry actuators See gh-7108 --- .../CloudFoundryActuatorAutoConfiguration.java | 4 ++-- .../CloudFoundryActuatorAutoConfigurationTests.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java index 9186d8a43fa..e3d299224bc 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java @@ -90,8 +90,8 @@ public class CloudFoundryActuatorAutoConfiguration { corsConfiguration.addAllowedOrigin(CorsConfiguration.ALL); corsConfiguration.setAllowedMethods( Arrays.asList(HttpMethod.GET.name(), HttpMethod.POST.name())); - corsConfiguration - .setAllowedHeaders(Arrays.asList("Authorization", "X-Cf-App-Instance")); + corsConfiguration.setAllowedHeaders( + Arrays.asList("Authorization", "X-Cf-App-Instance", "Content-Type")); return corsConfiguration; } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java index a7a11b17901..53830fd3428 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java @@ -82,10 +82,10 @@ public class CloudFoundryActuatorAutoConfigurationTests { CorsConfiguration corsConfiguration = (CorsConfiguration) ReflectionTestUtils .getField(handlerMapping, "corsConfiguration"); assertThat(corsConfiguration.getAllowedOrigins()).contains("*"); - assertThat(corsConfiguration.getAllowedMethods()).contains(HttpMethod.GET.name(), - HttpMethod.POST.name()); - assertThat(corsConfiguration.getAllowedHeaders() - .containsAll(Arrays.asList("Authorization", "X-Cf-App-Instance"))); + assertThat(corsConfiguration.getAllowedMethods()).containsAll( + Arrays.asList(HttpMethod.GET.name(), HttpMethod.POST.name())); + assertThat(corsConfiguration.getAllowedHeaders()).containsAll( + Arrays.asList("Authorization", "X-Cf-App-Instance", "Content-Type")); } @Test