From 132a29d9f579eef3295c923d84be0f4e0f746ce5 Mon Sep 17 00:00:00 2001 From: ZhangZihao Date: Fri, 21 Jun 2019 10:49:10 +0800 Subject: designType Change-Id: I8bcbac4a6e1a1f2779a3243615c742719d29f8e5 Issue-ID: DCAEGEN2-1625 Signed-off-by: ZhangZihao --- .../feeder/controller/DesignTypeController.java | 12 +++---- .../onap/datalake/feeder/domain/DesignType.java | 9 +++++ .../onap/datalake/feeder/dto/DesignTypeConfig.java | 40 ++++++++++++++++++++++ .../datalake/feeder/service/DesignTypeService.java | 30 +++++++++------- 4 files changed, 73 insertions(+), 18 deletions(-) create mode 100644 components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/dto/DesignTypeConfig.java (limited to 'components/datalake-handler/feeder/src/main/java/org') 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 db789a47..35d206bb 100755 --- 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 @@ package org.onap.datalake.feeder.controller; +import java.util.ArrayList; import java.util.List; +import org.onap.datalake.feeder.domain.DesignType; +import org.onap.datalake.feeder.dto.DesignTypeConfig; import org.onap.datalake.feeder.service.DesignTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; @@ -34,7 +37,6 @@ import io.swagger.annotations.ApiOperation; * * @author guochunmeng */ -@CrossOrigin(origins = "*") @RestController @RequestMapping(value = "/designTypes", produces = { MediaType.APPLICATION_JSON_VALUE }) public class DesignTypeController { @@ -44,11 +46,9 @@ public class DesignTypeController { @GetMapping("") @ResponseBody - @ApiOperation(value="List all designTypes names") - public List getTemplateTypeName() { - - return designTypeService.listNames(); - + @ApiOperation(value="List all designTypes") + public List getDesignType() { + return designTypeService.getDesignTypes(); } } 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 a7716451..62a7c0c6 100644 --- 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 index 00000000..a4ed6d33 --- /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 eafc4bf9..86baebf8 100755 --- 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; import org.onap.datalake.feeder.domain.DesignType; +import org.onap.datalake.feeder.dto.DesignTypeConfig; import org.onap.datalake.feeder.repository.DesignTypeRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,22 +38,25 @@ import org.springframework.stereotype.Service; */ @Service public class DesignTypeService { - + + private final Logger log = LoggerFactory.getLogger(this.getClass()); + @Autowired DesignTypeRepository designTypeRepository; - - public List listNames(){ - - List names = new ArrayList<>(); - - Iterable ret = designTypeRepository.findAll(); + + public List getDesignTypes(){ - for(DesignType designType:ret) { - - names.add(designType.getName()); - + List designTypeList = null; + List designTypeConfigList = new ArrayList<>(); + designTypeList = (List)designTypeRepository.findAll(); + if (designTypeList != null && designTypeList.size() > 0) { + log.info("DesignTypeList is not null"); + for(DesignType designType : designTypeList) { + designTypeConfigList.add(designType.getDesignTypeConfig()); + } } - return names; + return designTypeConfigList; } + } -- cgit 1.2.3-korg