designType

Change-Id: I8bcbac4a6e1a1f2779a3243615c742719d29f8e5
Issue-ID: DCAEGEN2-1625
Signed-off-by: ZhangZihao <zhangzihao@chinamobile.com>

diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/DesignTypeController.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/DesignTypeController.java
index db789a4..35d206b 100755 (executable)
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/DesignTypeController.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/DesignTypeController.java
@@ -20,8 +20,11 @@
 \r
 package org.onap.datalake.feeder.controller;\r
 \r
+import java.util.ArrayList;\r
 import java.util.List;\r
 \r
+import org.onap.datalake.feeder.domain.DesignType;\r
+import org.onap.datalake.feeder.dto.DesignTypeConfig;\r
 import org.onap.datalake.feeder.service.DesignTypeService;\r
 import org.springframework.beans.factory.annotation.Autowired;\r
 import org.springframework.http.MediaType;\r
@@ -34,7 +37,6 @@ import io.swagger.annotations.ApiOperation;
  *\r
  * @author guochunmeng\r
  */\r
-@CrossOrigin(origins = "*")\r
 @RestController\r
 @RequestMapping(value = "/designTypes", produces = { MediaType.APPLICATION_JSON_VALUE })\r
 public class DesignTypeController {\r
@@ -44,11 +46,9 @@ public class DesignTypeController {
        \r
        @GetMapping("")\r
        @ResponseBody\r
-       @ApiOperation(value="List all designTypes names")\r
-    public List<String> getTemplateTypeName() {\r
-\r
-        return designTypeService.listNames();\r
-\r
+       @ApiOperation(value="List all designTypes")\r
+    public List<DesignTypeConfig> getDesignType() {\r
+               return designTypeService.getDesignTypes();\r
     }\r
     \r
 }\r

diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/DesignType.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/DesignType.java
index a771645..62a7c0c 100644 (file)
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/DesignType.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/DesignType.java
@@ -24,6 +24,7 @@ package org.onap.datalake.feeder.domain;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import lombok.Getter;
 import lombok.Setter;
+import org.onap.datalake.feeder.dto.DesignTypeConfig;
 
 import javax.persistence.*;
 
@@ -53,4 +54,12 @@ public class DesignType {
     @Column(name = "`note`")
     private String note;
 
+    public DesignTypeConfig getDesignTypeConfig() {
+
+        DesignTypeConfig designTypeConfig = new DesignTypeConfig();
+        designTypeConfig.setDesignType(getName());
+        designTypeConfig.setDisplay(getDisplay());
+        return designTypeConfig;
+    }
+
 }

diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/dto/DesignTypeConfig.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/dto/DesignTypeConfig.java
new file mode 100644 (file)
index 0000000..a4ed6d3
--- /dev/null
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/dto/DesignTypeConfig.java
@@ -0,0 +1,40 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : DataLake
+ * ================================================================================
+ * Copyright 2019 QCT
+ *=================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.datalake.feeder.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * JSON request body for DesignType Config.
+ *
+ * @author guochunmeng
+ *
+ */
+@Setter
+@Getter
+public class DesignTypeConfig {
+
+    private String designType;
+
+    private String display;
+
+}

diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/DesignTypeService.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/DesignTypeService.java
index eafc4bf..86baebf 100755 (executable)
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/DesignTypeService.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/DesignTypeService.java
@@ -24,7 +24,10 @@ import java.util.ArrayList;
 import java.util.List;\r
 \r
 import org.onap.datalake.feeder.domain.DesignType;\r
+import org.onap.datalake.feeder.dto.DesignTypeConfig;\r
 import org.onap.datalake.feeder.repository.DesignTypeRepository;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
 import org.springframework.beans.factory.annotation.Autowired;\r
 import org.springframework.stereotype.Service;\r
 \r
@@ -35,22 +38,25 @@ import org.springframework.stereotype.Service;
  */\r
 @Service\r
 public class DesignTypeService {\r
-       \r
+\r
+       private final Logger log = LoggerFactory.getLogger(this.getClass());\r
+\r
        @Autowired\r
        DesignTypeRepository designTypeRepository;\r
-       \r
-       public List<String> listNames(){\r
-               \r
-               List<String> names = new ArrayList<>();\r
-               \r
-               Iterable<DesignType> ret = designTypeRepository.findAll();\r
+\r
+       public List<DesignTypeConfig> getDesignTypes(){\r
                \r
-               for(DesignType designType:ret) {\r
-                       \r
-                       names.add(designType.getName());\r
-                       \r
+               List<DesignType> designTypeList = null;\r
+               List<DesignTypeConfig> designTypeConfigList = new ArrayList<>();\r
+               designTypeList = (List<DesignType>)designTypeRepository.findAll();\r
+               if (designTypeList != null && designTypeList.size() > 0) {\r
+                       log.info("DesignTypeList is not null");\r
+                       for(DesignType designType : designTypeList) {\r
+                               designTypeConfigList.add(designType.getDesignTypeConfig());\r
+                       }\r
                }\r
                \r
-               return names;\r
+               return designTypeConfigList;\r
        }\r
+\r
 }\r

diff --git a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/DesignTypeControllerTest.java b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/DesignTypeControllerTest.java
index ab9d901..69e592a 100644 (file)
--- a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/DesignTypeControllerTest.java
+++ b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/DesignTypeControllerTest.java
@@ -55,7 +55,7 @@ public class DesignTypeControllerTest {
         DesignType testDesignType = fillDomain();
         List<String> designTypeNamesList = new ArrayList<>();
         designTypeNamesList.add(testDesignType.getName());
-        assertEquals(1, testDesignTypeController.getTemplateTypeName().size());
+        assertEquals(1, testDesignTypeController.getDesignType().size());
     }
 
     public void setAccessPrivateFields(DesignTypeController designTypeController) throws NoSuchFieldException, IllegalAccessException {