From 9f4759c7d09b8ba1b1ef73c904ae8699182e32b5 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Thu, 12 Apr 2018 13:16:26 +0200 Subject: Fix build issue Fix build issue due to rebase conflict resolution Issue-ID: CLAMP-151 Change-Id: Id65f78a03b54a9e30263c1d560f444cd58be780b Signed-off-by: Determe, Sebastien (sd378r) --- .../onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java index 6a9828df0..ded75dd50 100644 --- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java +++ b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java @@ -46,10 +46,10 @@ import org.onap.clamp.clds.model.CldsModel; import org.onap.clamp.clds.model.CldsTemplate; import org.onap.clamp.clds.service.CldsService; import org.onap.clamp.clds.service.CldsTemplateService; -import org.springframework.transaction.annotation.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; +import org.springframework.transaction.annotation.Transactional; import org.yaml.snakeyaml.Yaml; /** @@ -169,7 +169,8 @@ public class CsarInstallerImpl implements CsarInstaller { return policyNameList.get(0); } - private String queryDcaeToGetServiceTypeId(BlueprintArtifact blueprintArtifact) throws IOException, ParseException { + private String queryDcaeToGetServiceTypeId(BlueprintArtifact blueprintArtifact) + throws IOException, ParseException, InterruptedException { return dcaeInventoryService.getDcaeInformation(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact.getBlueprintInvariantServiceUuid(), blueprintArtifact.getBlueprintInvariantResourceUuid()).getTypeId(); -- cgit 1.2.3-korg