From bd28818bdba4ede90fe80877bf6839004516000a Mon Sep 17 00:00:00 2001
From: "Muthuramalingam, Brinda Santh(bs2796)" <bs2796@att.com>
Date: Sat, 1 Dec 2018 19:54:07 -0500
Subject: Enable Webflux Service.

Change-Id: I99bacee9b63aa788bb368dec60981bf19ea759c4
Issue-ID: CCSDK-781
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>
---
 ms/controllerblueprints/modules/service/pom.xml                       | 4 ----
 .../ccsdk/apps/controllerblueprints/service/DataBaseInitService.java  | 2 +-
 .../apps/controllerblueprints/service/SchemaGeneratorService.java     | 2 +-
 .../apps/controllerblueprints/service/domain/ConfigModelContent.java  | 1 +
 .../service/repository/ConfigModelContentRepository.java              | 1 +
 .../ccsdk/apps/controllerblueprints/service/rs/ConfigModelRest.java   | 1 +
 .../ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java     | 1 +
 .../apps/controllerblueprints/service/rs/ResourceDictionaryRest.java  | 1 +
 .../apps/controllerblueprints/service/rs/ServiceTemplateRest.java     | 1 +
 .../apps/controllerblueprints/service/utils/ConfigModelUtils.java     | 1 +
 10 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'ms/controllerblueprints/modules')

diff --git a/ms/controllerblueprints/modules/service/pom.xml b/ms/controllerblueprints/modules/service/pom.xml
index cd95abf9..017cfde4 100644
--- a/ms/controllerblueprints/modules/service/pom.xml
+++ b/ms/controllerblueprints/modules/service/pom.xml
@@ -46,10 +46,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/DataBaseInitService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/DataBaseInitService.java
index 74faa4df..a4b874ee 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/DataBaseInitService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/DataBaseInitService.java
@@ -54,7 +54,7 @@ import java.util.List;
  * @author Brinda Santh
  * @version 1.0
  */
-
+@Deprecated
 @Component
 @ConditionalOnProperty(name = "blueprints.load.initial-data", havingValue = "true")
 public class DataBaseInitService {
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/SchemaGeneratorService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/SchemaGeneratorService.java
index 04a95fd1..ff8b07a9 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/SchemaGeneratorService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/SchemaGeneratorService.java
@@ -37,7 +37,7 @@ import java.util.Map;
  * @author Brinda Santh
  * @version 1.0
  */
-
+@Deprecated
 public class SchemaGeneratorService {
     private static EELFLogger log = EELFManager.getInstance().getLogger(SchemaGeneratorService.class);
 
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ConfigModelContent.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ConfigModelContent.java
index 71904fb3..56135471 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ConfigModelContent.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/domain/ConfigModelContent.java
@@ -62,6 +62,7 @@ public class ConfigModelContent {
     @Column(name = "description")
     private String description;
 
+    @Deprecated
     @Lob
     @Column(name = "content", nullable = false)
     @ApiModelProperty(required=true)
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ConfigModelContentRepository.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ConfigModelContentRepository.java
index 733cbbdb..81c26373 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ConfigModelContentRepository.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ConfigModelContentRepository.java
@@ -31,6 +31,7 @@ import java.util.Optional;
  * @author Brinda Santh
  * @version 1.0
  */
+@Deprecated
 @Repository
 public interface ConfigModelContentRepository extends JpaRepository<ConfigModelContent, Long> {
 
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ConfigModelRest.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ConfigModelRest.java
index 95e551b1..b025b2ff 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ConfigModelRest.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ConfigModelRest.java
@@ -27,6 +27,7 @@ import java.util.List;
 /**
  * {@inheritDoc}
  */
+@Deprecated
 @RestController
 @RequestMapping(value = "/api/v1/config-model")
 public class ConfigModelRest {
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java
index 0f485a08..69c20925 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java
@@ -28,6 +28,7 @@ import java.util.List;
 /**
  * {@inheritDoc}
  */
+@Deprecated
 @RestController
 @RequestMapping(value = "/api/v1/model-type")
 public class ModelTypeRest {
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRest.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRest.java
index 9b2209e8..932cdfac 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRest.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRest.java
@@ -29,6 +29,7 @@ import java.util.List;
 /**
  * {@inheritDoc}
  */
+@Deprecated
 @RestController
 @RequestMapping(value = "/api/v1/dictionary")
 public class ResourceDictionaryRest {
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRest.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRest.java
index caa6bba4..3798ee6d 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRest.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ServiceTemplateRest.java
@@ -32,6 +32,7 @@ import java.util.List;
 /**
  * {@inheritDoc}
  */
+@Deprecated
 @RestController
 @RequestMapping(value = "/api/v1/service-template")
 public class ServiceTemplateRest {
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/utils/ConfigModelUtils.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/utils/ConfigModelUtils.java
index e9ee1bc0..3c6b14ba 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/utils/ConfigModelUtils.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/utils/ConfigModelUtils.java
@@ -37,6 +37,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+@Deprecated
 public class ConfigModelUtils {
 
     private ConfigModelUtils() {
-- 
cgit 1.2.3-korg