aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-04-12 13:16:26 +0200
committerDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-04-12 13:16:26 +0200
commit9f4759c7d09b8ba1b1ef73c904ae8699182e32b5 (patch)
treea358c11ad2e27e7f4ba6a2d007822a5f42878e80 /src/main
parentd16052ac1ed8cf545637d5c78de87cd17d6db0bf (diff)
Fix build issue
Fix build issue due to rebase conflict resolution Issue-ID: CLAMP-151 Change-Id: Id65f78a03b54a9e30263c1d560f444cd58be780b Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java5
1 files 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();
f='#n207'>207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260