From 6558bd6870e650dbd6232ab129dc82aebe5f8fba Mon Sep 17 00:00:00 2001 From: Joanna Jeremicz Date: Fri, 15 Jan 2021 09:56:54 +0100 Subject: Refactor AppConfigService with tests - Refactor AppConfigService - Bump bpgenerator version to 1.7.2 Issue-ID: DCAEGEN2-1179 Signed-off-by: Joanna Jeremicz Change-Id: Iae52bda14f928db102d4c3466ba97f948ca98727 --- .../service/common/AppConfigService.java | 73 +++------------------- 1 file changed, 9 insertions(+), 64 deletions(-) (limited to 'mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java') diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java index 7c87af7..f0d0e50 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/AppConfigService.java @@ -5,6 +5,8 @@ * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. * * ================================================================================ + * * Modifications Copyright (c) 2021 Nokia + * * ================================================================================ * * 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 @@ -55,6 +57,9 @@ public class AppConfigService { @Autowired private BlueprintHelperService blueprintHelperService; + @Autowired + private StreamService streamService; + /** * Creates Inputs section under App Config with Publishes, Subscribes, Parameters sections by * checking Datarouter/MessageRouter/override/Dmaap values @@ -77,70 +82,10 @@ public class AppConfigService { Calls[] call = new Calls[0]; appconfig.setService_calls(call); - Map streamPublishes = new TreeMap<>(); - if (onapComponentSpec.getStreams() != null) { - if (onapComponentSpec.getStreams().getPublishes() != null) { - for (Publishes publishes : onapComponentSpec.getStreams().getPublishes()) { - if (blueprintHelperService.isDataRouterType(publishes.getType())) { - String config = publishes.getConfig_key(); - String name = config + Constants._FEED; - Map dmaapDataRouterResponse = - dmaapService.createDmaapDataRouter(inputs, config, name, isDmaap); - inputs = - (Map>) dmaapDataRouterResponse - .get("inputs"); - Dmaap dmaap = (Dmaap) dmaapDataRouterResponse.get("dmaap"); - dmaap.setType(publishes.getType()); - streamPublishes.put(config, dmaap); - } else if (blueprintHelperService.isMessageRouterType(publishes.getType())) { - String config = publishes.getConfig_key(); - String name = config + Constants._TOPIC; - Map dmaapDataRouterResponse = - dmaapService - .createDmaapMessageRouter(inputs, config, 'p', name, name, isDmaap); - inputs = - (Map>) dmaapDataRouterResponse - .get("inputs"); - Dmaap dmaap = (Dmaap) dmaapDataRouterResponse.get("dmaap"); - dmaap.setType(publishes.getType()); - streamPublishes.put(config, dmaap); - } - } - } - } - - Map streamSubscribes = new TreeMap<>(); - - if (onapComponentSpec.getStreams() != null) { - if (onapComponentSpec.getStreams().getSubscribes() != null) { - for (Subscribes subscribes : onapComponentSpec.getStreams().getSubscribes()) { - if (blueprintHelperService.isDataRouterType(subscribes.getType())) { - String config = subscribes.getConfig_key(); - String name = config + Constants._FEED; - Map dmaapDataRouterResponse = - dmaapService.createDmaapDataRouter(inputs, config, name, isDmaap); - inputs = - (Map>) dmaapDataRouterResponse - .get("inputs"); - Dmaap dmaap = (Dmaap) dmaapDataRouterResponse.get("dmaap"); - dmaap.setType(subscribes.getType()); - streamSubscribes.put(config, dmaap); - } else if (blueprintHelperService.isMessageRouterType(subscribes.getType())) { - String config = subscribes.getConfig_key(); - String name = config + Constants._TOPIC; - Map dmaapDataRouterResponse = - dmaapService - .createDmaapMessageRouter(inputs, config, 's', name, name, isDmaap); - inputs = - (Map>) dmaapDataRouterResponse - .get("inputs"); - Dmaap dmaap = (Dmaap) dmaapDataRouterResponse.get("dmaap"); - dmaap.setType(subscribes.getType()); - streamSubscribes.put(config, dmaap); - } - } - } - } + Map streamPublishes = streamService.createStreamPublishes( + onapComponentSpec, blueprintHelperService, dmaapService, inputs, isDmaap); + Map streamSubscribes = streamService.createStreamSubscribes( + onapComponentSpec, blueprintHelperService, dmaapService, inputs, isDmaap); appconfig.setStreams_publishes(streamPublishes); appconfig.setStreams_subscribes(streamSubscribes); -- cgit 1.2.3-korg