Merge "Enable Webflux Service."

2 files changed, 13 insertions, 4 deletions

diff --git a/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/apps/blueprintsprocessor/SwaggerConfig.java b/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/apps/blueprintsprocessor/SwaggerConfig.java
index 72fa260b9..3537a91d7 100644
--- a/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/apps/blueprintsprocessor/SwaggerConfig.java
+++ b/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/apps/blueprintsprocessor/SwaggerConfig.java
@@ -20,14 +20,12 @@ package org.onap.ccsdk.apps.blueprintsprocessor;
 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

 import org.springframework.context.annotation.Bean;

-import org.springframework.context.annotation.Configuration;

 import springfox.documentation.builders.PathSelectors;

 import springfox.documentation.builders.RequestHandlerSelectors;

 import springfox.documentation.service.ApiInfo;

 import springfox.documentation.service.Contact;

 import springfox.documentation.spi.DocumentationType;

 import springfox.documentation.spring.web.plugins.Docket;

-import springfox.documentation.swagger2.annotations.EnableSwagger2;

 

 import java.util.Arrays;

 import java.util.Collections;

@@ -39,8 +37,10 @@ import java.util.Set;
  *

  * @author Brinda Santh 8/13/2018

  */

-@Configuration

-@EnableSwagger2

+//@Configuration

+//@EnableSwagger2

+@SuppressWarnings("unused")

+@Deprecated

 public class SwaggerConfig {

 

     @Bean

diff --git a/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/apps/blueprintsprocessor/WebConfig.java b/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/apps/blueprintsprocessor/WebConfig.java
index 3742f5604..796a2d794 100644
--- a/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/apps/blueprintsprocessor/WebConfig.java
+++ b/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/apps/blueprintsprocessor/WebConfig.java
@@ -35,4 +35,13 @@ public class WebConfig extends WebFluxConfigurationSupport {
         registry.addResourceHandler("/webjars/**")

                 .addResourceLocations("classpath:/META-INF/resources/webjars/");

     }

+

+    @Override

+    public void addCorsMappings(CorsRegistry corsRegistry) {

+        corsRegistry.addMapping("/**")

+                .allowedOrigins("*")

+                .allowedMethods("*")

+                .allowedHeaders("DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range")

+                .maxAge(3600);

+    }

 }