diff options
Diffstat (limited to 'ueb-listener')
3 files changed, 28 insertions, 31 deletions
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java index 671d47a9..601569a1 100644 --- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java +++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncArtifactMap.java @@ -4,6 +4,7 @@ * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights * reserved. + * Modifications Copyright © 2018 IBM. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,6 +42,16 @@ public class SdncArtifactMap { private String rpc; private int pass; + private SdncArtifactType(String tag, String rpc, String pass) { + this.tag = tag; + this.rpc = rpc; + try { + this.pass = Integer.parseInt(pass); + } catch (Exception e) { + LOG.error("Invalid pass value for artifact map entry ({} {} {})", tag, rpc, pass, e); + } + } + public String getTag() { return tag; } @@ -58,26 +69,16 @@ public class SdncArtifactMap { public String getRpcUrl(String base) { return base+rpc; } - - private SdncArtifactType(String tag, String rpc, String pass) { - this.tag = tag; - this.rpc = rpc; - try { - this.pass = Integer.parseInt(pass); - } catch (Exception e) { - LOG.error("Invalid pass value for artifact map entry ({} {} {})", tag, rpc, pass, e); - } - } } private Map<String, SdncArtifactType> mapItems = new HashMap<>(); - private int NumPasses = 1; + private int numPasses = 1; public int getNumPasses() { - return NumPasses; + return numPasses; } public void load(String fileName) { @@ -93,8 +94,8 @@ public class SdncArtifactMap { if (lnFields.length == 3) { SdncArtifactType entry = new SdncArtifactType(lnFields[0], lnFields[1], lnFields[2]); mapItems.put(entry.getTag(), entry); - if (entry.getPass() + 1 > NumPasses ) { - NumPasses = entry.getPass() + 1; + if (entry.getPass() + 1 > numPasses ) { + numPasses = entry.getPass() + 1; } } } diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java index 0500954d..0088a14a 100644 --- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java +++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java @@ -4,6 +4,7 @@ * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights * reserved. + * Modifications Copyright © 2018 IBM. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,10 +59,6 @@ public class SdncUebConfiguration implements IConfiguration{ private SdncArtifactMap artifactMap = SdncArtifactMap.getInstance(); - public String getAsdcApiNamespace() { - return asdcApiNamespace; - } - private String incomingDir = null; private String archiveDir = null; @@ -74,14 +71,6 @@ public class SdncUebConfiguration implements IConfiguration{ private String xsltPathList; - public String getXsltPathList() { - return xsltPathList; - } - - public String getOverrideFile() { - return overrideFile; - } - public SdncUebConfiguration() { String propDir = System.getenv(SDNC_CONFIG_DIR); if (propDir == null) { @@ -103,6 +92,17 @@ public class SdncUebConfiguration implements IConfiguration{ } } + public String getAsdcApiNamespace() { + return asdcApiNamespace; + } + + public String getXsltPathList() { + return xsltPathList; + } + + public String getOverrideFile() { + return overrideFile; + } public void init(String propDir) throws IOException { String propPath; diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModuleModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModuleModel.java index 2ba8de0f..914401ff 100644 --- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModuleModel.java +++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFModuleModel.java @@ -4,6 +4,7 @@ * ================================================================================ * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights * reserved. + * Modifications Copyright © 2018 IBM. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,14 +25,9 @@ package org.onap.ccsdk.sli.northbound.uebclient; import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; import org.onap.sdc.tosca.parser.impl.SdcPropertyNames; import org.onap.sdc.toscaparser.api.Group; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class SdncVFModuleModel extends SdncBaseModel { - private static final Logger LOG = LoggerFactory - .getLogger(SdncVFModuleModel.class); - public SdncVFModuleModel(ISdcCsarHelper sdcCsarHelper, Group group, SdncVFModel vfNodeModel) { super(sdcCsarHelper, group); |