diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/quiestionnaire/QuestionnaireDataServiceImpl.java')
1 files changed, 46 insertions, 56 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/quiestionnaire/QuestionnaireDataServiceImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/quiestionnaire/QuestionnaireDataServiceImpl.java index 3af6dfc598..0142091176 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/quiestionnaire/QuestionnaireDataServiceImpl.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/quiestionnaire/QuestionnaireDataServiceImpl.java @@ -13,13 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.openecomp.sdc.vendorsoftwareproduct.quiestionnaire; - +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import org.openecomp.core.utilities.json.JsonUtil; -import org.openecomp.sdc.vendorsoftwareproduct.dao.*; -import org.openecomp.sdc.vendorsoftwareproduct.dao.type.*; +import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDao; +import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDaoFactory; +import org.openecomp.sdc.vendorsoftwareproduct.dao.NicDao; +import org.openecomp.sdc.vendorsoftwareproduct.dao.NicDaoFactory; +import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDao; +import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDaoFactory; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.CompositionEntity; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.NicEntity; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails; +import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspQuestionnaireEntity; import org.openecomp.sdc.vendorsoftwareproduct.informationArtifact.InformationArtifactData; import org.openecomp.sdc.vendorsoftwareproduct.questionnaire.QuestionnaireDataService; import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.ComponentQuestionnaire; @@ -27,67 +37,47 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic.NicQuesti import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp.VspQuestionnaire; import org.openecomp.sdc.versioning.dao.types.Version; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** * Created by TALIO on 11/22/2016 */ public class QuestionnaireDataServiceImpl implements QuestionnaireDataService { - private static final ComponentDao componentDao = - ComponentDaoFactory.getInstance().createInterface(); - private static final NicDao nicDao = NicDaoFactory.getInstance().createInterface(); - private static final VendorSoftwareProductInfoDao vspInfoDao = - VendorSoftwareProductInfoDaoFactory.getInstance().createInterface(); - @Override - public InformationArtifactData generateQuestionnaireDataForInformationArtifact(String vspId, - Version version) { - VspDetails vspDetails = vspInfoDao.get(new VspDetails(vspId, version)); - Collection<ComponentEntity> componentEntities = componentDao.listQuestionnaires(vspId, version); - Collection<NicEntity> nicEntities = nicDao.listByVsp(vspId, version); - VspQuestionnaire vspQuestionnaire = getVspQuestionnaireFromJson(vspId, version); - List<ComponentQuestionnaire> componentQuestionnaireList = - getListOfComponentQuestionnaireFromJson(componentEntities); - List<NicQuestionnaire> nicQuestionnaireList = getListOfNicQuestionnaireFromJson(nicEntities); - return new InformationArtifactData(vspDetails, vspQuestionnaire, componentQuestionnaireList, - nicQuestionnaireList); - } - - private VspQuestionnaire getVspQuestionnaireFromJson(String vspId, Version version) { - VspQuestionnaireEntity vspQuestionnaireEntity = - vspInfoDao.getQuestionnaire(vspId, version); - - if (vspQuestionnaireEntity == null) { - return null; + private static final ComponentDao componentDao = ComponentDaoFactory.getInstance().createInterface(); + private static final NicDao nicDao = NicDaoFactory.getInstance().createInterface(); + private static final VendorSoftwareProductInfoDao vspInfoDao = VendorSoftwareProductInfoDaoFactory.getInstance().createInterface(); + + @Override + public InformationArtifactData generateQuestionnaireDataForInformationArtifact(String vspId, Version version) { + VspDetails vspDetails = vspInfoDao.get(new VspDetails(vspId, version)); + Collection<ComponentEntity> componentEntities = componentDao.listQuestionnaires(vspId, version); + Collection<NicEntity> nicEntities = nicDao.listByVsp(vspId, version); + VspQuestionnaire vspQuestionnaire = getVspQuestionnaireFromJson(vspId, version); + List<ComponentQuestionnaire> componentQuestionnaireList = getListOfComponentQuestionnaireFromJson(componentEntities); + List<NicQuestionnaire> nicQuestionnaireList = getListOfNicQuestionnaireFromJson(nicEntities); + return new InformationArtifactData(vspDetails, vspQuestionnaire, componentQuestionnaireList, nicQuestionnaireList); } - return JsonUtil - .json2Object(vspQuestionnaireEntity.getQuestionnaireData(), VspQuestionnaire.class); - } - - private List<ComponentQuestionnaire> getListOfComponentQuestionnaireFromJson( - Collection<ComponentEntity> entities) { - List<ComponentQuestionnaire> componentQuestionnaireList = new ArrayList<>(); - - for (CompositionEntity componentEntity : entities) { - componentQuestionnaireList.add(JsonUtil - .json2Object(componentEntity.getQuestionnaireData(), ComponentQuestionnaire.class)); + private VspQuestionnaire getVspQuestionnaireFromJson(String vspId, Version version) { + VspQuestionnaireEntity vspQuestionnaireEntity = vspInfoDao.getQuestionnaire(vspId, version); + if (vspQuestionnaireEntity == null) { + return null; + } + return JsonUtil.json2Object(vspQuestionnaireEntity.getQuestionnaireData(), VspQuestionnaire.class); } - return componentQuestionnaireList; - } - - private List<NicQuestionnaire> getListOfNicQuestionnaireFromJson(Collection<NicEntity> entities) { - List<NicQuestionnaire> nicQuestionnaireList = new ArrayList<>(); - - for (NicEntity nicEntity : entities) { - nicQuestionnaireList - .add(JsonUtil.json2Object(nicEntity.getQuestionnaireData(), NicQuestionnaire.class)); + private List<ComponentQuestionnaire> getListOfComponentQuestionnaireFromJson(Collection<ComponentEntity> entities) { + List<ComponentQuestionnaire> componentQuestionnaireList = new ArrayList<>(); + for (CompositionEntity componentEntity : entities) { + componentQuestionnaireList.add(JsonUtil.json2Object(componentEntity.getQuestionnaireData(), ComponentQuestionnaire.class)); + } + return componentQuestionnaireList; } - return nicQuestionnaireList; - } - + private List<NicQuestionnaire> getListOfNicQuestionnaireFromJson(Collection<NicEntity> entities) { + List<NicQuestionnaire> nicQuestionnaireList = new ArrayList<>(); + for (NicEntity nicEntity : entities) { + nicQuestionnaireList.add(JsonUtil.json2Object(nicEntity.getQuestionnaireData(), NicQuestionnaire.class)); + } + return nicQuestionnaireList; + } } |