From 5ce0ef187f67c46f11ec5e078cfa3a45ab6726c7 Mon Sep 17 00:00:00 2001 From: "kris.jinka" Date: Thu, 15 Nov 2018 11:26:38 +0900 Subject: Use param obj for contxt album decln Modify code generator cli editor to use param object for the sonar issue fix Issue-ID: POLICY-1251 Change-Id: I3efbdbe2ce7c16702508b9f1f36ecbb9b1e12856 Signed-off-by: kris.jinka --- .../apex/tools/model/generator/model2cli/Model2Cli.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'tools') 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 01434190b..57a3841c9 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,6 +31,7 @@ import java.util.Map.Entry; import java.util.Properties; import org.apache.commons.lang3.Validate; +import org.onap.policy.apex.auth.clicodegen.CodeGenCliEditorBuilder; 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; @@ -184,9 +185,16 @@ public class Model2Cli { for (final AxContextAlbum a : policyModel.getAlbums().getAlbumsMap().values()) { final AxArtifactKey key = a.getKey(); - codeGen.addContextAlbumDeclaration(kig.getName(key), kig.getVersion(key), kig.getUuid(key), - kig.getDesc(key), a.getScope(), a.isWritable(), kig.getName(a.getItemSchema()), - kig.getVersion(a.getItemSchema())); + codeGen.addContextAlbumDeclaration( + new CodeGenCliEditorBuilder() + .setName(kig.getName(key)) + .setVersion(kig.getVersion(key)) + .setUuid(kig.getUuid(key)) + .setDescription(kig.getDesc(key)) + .setScope(a.getScope()) + .setWritable(a.isWritable()) + .setSchemaName(kig.getName(a.getItemSchema())) + .setSchemaVersion(kig.getVersion(a.getItemSchema()))); } // 5: policies -- cgit 1.2.3-korg