From 4cfa2e2d98f6877d54da304ef17f096284430908 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 13 Sep 2018 15:25:32 +0100 Subject: Sonar/Checkstyle in service/plugins Sonar and Checkstyle changes in plugins and services, and knock on changes Issue-ID: POLICY-1034 Change-Id: Iff7df74e54fce2c661dcc2fae75ae93d4cacfe5b Signed-off-by: liamfallon --- .../tools/model/generator/model2cli/Model2Cli.java | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'tools/model-generator/src') diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java index cc9ed5cae..88ada24f6 100644 --- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java +++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java @@ -31,7 +31,7 @@ import java.util.Map.Entry; import java.util.Properties; import org.apache.commons.lang3.Validate; -import org.onap.policy.apex.auth.clicodegen.CGCliEditor; +import org.onap.policy.apex.auth.clicodegen.CodeGeneratorCliEditor; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey; @@ -104,7 +104,7 @@ public class Model2Cli { * @throws ApexException if any problem occurred in the model */ public int runApp() throws ApexException { - final CGCliEditor codeGen = new CGCliEditor(); + final CodeGeneratorCliEditor codeGen = new CodeGeneratorCliEditor(); final ApexModelFactory factory = new ApexModelFactory(); final ApexModel model = factory.createApexModel(new Properties(), true); @@ -208,7 +208,7 @@ public class Model2Cli { * @param event the event * @return the parameters for event */ - private List getParametersForEvent(final CGCliEditor cg, final AxEvent event) { + private List getParametersForEvent(final CodeGeneratorCliEditor cg, final AxEvent event) { final Collection fields = event.getFields(); final List ret = new ArrayList<>(fields.size()); for (final AxField f : fields) { @@ -229,7 +229,7 @@ public class Model2Cli { * @param task the task * @return the context references for task */ - private List getCtxtRefsForTask(final CGCliEditor cg, final AxTask task) { + private List getCtxtRefsForTask(final CodeGeneratorCliEditor cg, final AxTask task) { final Collection ctxs = task.getContextAlbumReferences(); final List ret = new ArrayList<>(ctxs.size()); final AxArtifactKey tkey = task.getKey(); @@ -250,7 +250,7 @@ public class Model2Cli { * @param task the task * @return the parameters for task */ - private List getParametersForTask(final CGCliEditor cg, final AxTask task) { + private List getParametersForTask(final CodeGeneratorCliEditor cg, final AxTask task) { final Collection pars = task.getTaskParameters().values(); final List ret = new ArrayList<>(pars.size()); for (final AxTaskParameter p : pars) { @@ -271,7 +271,7 @@ public class Model2Cli { * @param task the task * @return the logic for task */ - private ST getLogicForTask(final CGCliEditor cg, final AxTask task) { + private ST getLogicForTask(final CodeGeneratorCliEditor cg, final AxTask task) { final AxArtifactKey tkey = task.getKey(); final AxTaskLogic tl = task.getTaskLogic(); @@ -288,7 +288,7 @@ public class Model2Cli { * @param task the task * @return the output fields for task */ - private List getOutfieldsForTask(final CGCliEditor cg, final AxTask task) { + private List getOutfieldsForTask(final CodeGeneratorCliEditor cg, final AxTask task) { final Collection fields = task.getOutputFields().values(); final List ret = new ArrayList<>(fields.size()); for (final AxField f : fields) { @@ -309,7 +309,7 @@ public class Model2Cli { * @param task the task * @return the input fields for task */ - private List getInfieldsForTask(final CGCliEditor cg, final AxTask task) { + private List getInfieldsForTask(final CodeGeneratorCliEditor cg, final AxTask task) { final Collection fields = task.getInputFields().values(); final List ret = new ArrayList<>(fields.size()); for (final AxField f : fields) { @@ -330,7 +330,7 @@ public class Model2Cli { * @param pol the policy * @return the states for policy */ - private List getStatesForPolicy(final CGCliEditor cg, final AxPolicy pol) { + private List getStatesForPolicy(final CodeGeneratorCliEditor cg, final AxPolicy pol) { final Collection states = pol.getStateMap().values(); final List ret = new ArrayList<>(states.size()); for (final AxState st : states) { @@ -357,7 +357,7 @@ public class Model2Cli { * @param st the state * @return the finalizers for state */ - private List getFinalizersForState(final CGCliEditor cg, final AxState st) { + private List getFinalizersForState(final CodeGeneratorCliEditor cg, final AxState st) { final Collection fins = st.getStateFinalizerLogicMap().values(); final List ret = new ArrayList<>(fins.size()); final AxReferenceKey skey = st.getKey(); @@ -379,7 +379,7 @@ public class Model2Cli { * @param st the state * @return the context references for state */ - private List getCtxtRefsForState(final CGCliEditor cg, final AxState st) { + private List getCtxtRefsForState(final CodeGeneratorCliEditor cg, final AxState st) { final Collection ctxs = st.getContextAlbumReferences(); final List ret = new ArrayList<>(ctxs.size()); final AxReferenceKey skey = st.getKey(); @@ -400,7 +400,7 @@ public class Model2Cli { * @param st the state * @return the TSL for state (if any) in a list */ - private List getTSLForState(final CGCliEditor cg, final AxState st) { + private List getTSLForState(final CodeGeneratorCliEditor cg, final AxState st) { final AxReferenceKey skey = st.getKey(); if (st.checkSetTaskSelectionLogic()) { final AxTaskSelectionLogic tsl = st.getTaskSelectionLogic(); @@ -419,7 +419,7 @@ public class Model2Cli { * @param st the state * @return the task references for state */ - private List getTaskRefsForState(final CGCliEditor cg, final AxState st) { + private List getTaskRefsForState(final CodeGeneratorCliEditor cg, final AxState st) { final Map taskrefs = st.getTaskReferences(); final List ret = new ArrayList<>(taskrefs.size()); final AxReferenceKey skey = st.getKey(); @@ -444,7 +444,7 @@ public class Model2Cli { * @param st the state * @return the state outputs for state */ - private List getStateOutputsForState(final CGCliEditor cg, final AxState st) { + private List getStateOutputsForState(final CodeGeneratorCliEditor cg, final AxState st) { final Collection outs = st.getStateOutputs().values(); final List ret = new ArrayList<>(outs.size()); final AxReferenceKey skey = st.getKey(); -- cgit 1.2.3-korg