Merge pull request #226 from graphql-java-kickstart/bugfix/168-cors-incompatibility

Refactored cors configuration for java modules (fixes #168)

Author: oliemansm

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLWebAutoConfiguration.java

@@ -61,13 +61,14 @@
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.servlet.DispatcherServlet;
-import org.springframework.web.servlet.config.annotation.CorsRegistryWorkaround;
 
 import javax.annotation.PostConstruct;
 import javax.servlet.MultipartConfigElement;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -88,6 +89,7 @@
 @EnableConfigurationProperties({GraphQLServletProperties.class})
 public class GraphQLWebAutoConfiguration {
 
+
     public static final String QUERY_EXECUTION_STRATEGY = "queryExecutionStrategy";
     public static final String MUTATION_EXECUTION_STRATEGY = "mutationExecutionStrategy";
     public static final String SUBSCRIPTION_EXECUTION_STRATEGY = "subscriptionExecutionStrategy";
@@ -143,8 +145,12 @@ public GraphQLErrorStartupListener graphQLErrorStartupListener() {
     @ConditionalOnClass(CorsFilter.class)
     @ConditionalOnProperty(value = "graphql.servlet.corsEnabled", havingValue = "true", matchIfMissing = true)
     public CorsFilter corsConfigurer() {
+        Map<String, CorsConfiguration> corsConfigurations = new LinkedHashMap<>(1);
+        CorsConfiguration corsConfiguration = new CorsConfiguration().applyPermitDefaultValues();
+        corsConfigurations.put(graphQLServletProperties.getCorsMapping(), corsConfiguration);
+
         UrlBasedCorsConfigurationSource configurationSource = new UrlBasedCorsConfigurationSource();
-        configurationSource.setCorsConfigurations(CorsRegistryWorkaround.getCorsConfiguration(graphQLServletProperties.getCorsMapping()));
+        configurationSource.setCorsConfigurations(corsConfigurations);
         configurationSource.setAlwaysUseFullPath(true);
 
         return new CorsFilter(configurationSource);