Enable Webflux Service.

Change-Id: I99bacee9b63aa788bb368dec60981bf19ea759c4
Issue-ID: CCSDK-781
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>

diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml
index 086a988..4e652d5 100644 (file)
--- a/ms/blueprintsprocessor/application/pom.xml
+++ b/ms/blueprintsprocessor/application/pom.xml
@@ -36,10 +36,6 @@
             <artifactId>spring-boot-devtools</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <!-- North Bound -->
         <dependency>
             <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>

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 fc1007f..98be9aa 100644 (file)
--- 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;\r
 import org.slf4j.LoggerFactory;\r
 import org.springframework.context.annotation.Bean;\r
-import org.springframework.context.annotation.Configuration;\r
 import springfox.documentation.builders.PathSelectors;\r
 import springfox.documentation.builders.RequestHandlerSelectors;\r
 import springfox.documentation.service.ApiInfo;\r
 import springfox.documentation.service.Contact;\r
 import springfox.documentation.spi.DocumentationType;\r
 import springfox.documentation.spring.web.plugins.Docket;\r
-import springfox.documentation.swagger2.annotations.EnableSwagger2;\r
 \r
 import java.util.Arrays;\r
 import java.util.Collections;\r
@@ -39,8 +37,10 @@ import java.util.Set;
  *\r
  * @author Brinda Santh 8/13/2018\r
  */\r
-@Configuration\r
-@EnableSwagger2\r
+//@Configuration\r
+//@EnableSwagger2\r
+@SuppressWarnings("unused")\r
+@Deprecated\r
 public class SwaggerConfig {\r
     private static final Set<String> DEFAULT_PRODUCES_AND_CONSUMES =\r
             new HashSet<>(Arrays.asList("application/json",\r

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 3742f56..796a2d7 100644 (file)
--- 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/**")\r
                 .addResourceLocations("classpath:/META-INF/resources/webjars/");\r
     }\r
+\r
+    @Override\r
+    public void addCorsMappings(CorsRegistry corsRegistry) {\r
+        corsRegistry.addMapping("/**")\r
+                .allowedOrigins("*")\r
+                .allowedMethods("*")\r
+                .allowedHeaders("DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range")\r
+                .maxAge(3600);\r
+    }\r
 }\r

diff --git a/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt b/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
index adce865..427063e 100644 (file)
--- a/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
+++ b/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
@@ -108,6 +108,11 @@ open class Flags {
 open class Status {\r
     @get:ApiModelProperty(required = true)\r
     var code: Int = 200\r
+    @get:ApiModelProperty(required = true)\r
+    var eventType: String = "EVENT-ACTION-RESPONSE"\r
+    @get:ApiModelProperty(required = true, example = "2012-04-23T18:25:43.511Z")\r
+    @get:JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")\r
+    var timestamp: Date = Date()\r
     @get:ApiModelProperty(required = false)\r
     var errorMessage: String? = null\r
     @get:ApiModelProperty(required = true)\r

diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index ba8e921..3ad3fef 100644 (file)
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -30,8 +30,8 @@
     <name>Blueprints Processor Parent</name>
     <description>Blueprints Processor Parent</description>
     <properties>
-        <spring.boot.version>2.0.6.RELEASE</spring.boot.version>
-        <spring.version>5.0.10.RELEASE</spring.version>
+        <spring.boot.version>2.1.1.RELEASE</spring.boot.version>
+        <spring.version>5.1.3.RELEASE</spring.version>
         <kotlin.version>1.3.10</kotlin.version>
         <kotlin.maven.version>1.3.10</kotlin.maven.version>
         <kotlin.couroutines.version>1.0.1</kotlin.couroutines.version>
@@ -96,6 +96,11 @@
             </dependency>
 
             <!-- GRPC Dependencies -->
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-core</artifactId>
+                <version>${grpc.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-netty</artifactId>
@@ -273,6 +278,12 @@
                 <version>${kotlin.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-testing</artifactId>
+                <version>${grpc.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>