From 275a9d6e8c8caa883a119339926fba475969b8d5 Mon Sep 17 00:00:00 2001 From: "waqas.ikram" Date: Mon, 11 Jun 2018 12:04:33 +0100 Subject: Fixing sonar bugs Change-Id: I05a81755ce132810c9535babb7bae5b9b9e0bd60 Issue-ID: POLICY-859 Signed-off-by: waqas.ikram --- .../policy/apex/auth/clicodegen/CGCliEditor.java | 293 ++++++++++++--------- .../apex/auth/clicodegen/CliEditorContants.java | 132 ++++++++++ 2 files changed, 306 insertions(+), 119 deletions(-) create mode 100644 auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CliEditorContants.java (limited to 'auth/cli-codegen/src') diff --git a/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CGCliEditor.java b/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CGCliEditor.java index ca41e5f5f..30e883aae 100644 --- a/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CGCliEditor.java +++ b/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CGCliEditor.java @@ -20,6 +20,60 @@ package org.onap.policy.apex.auth.clicodegen; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.ALBUM_NAME; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.ALBUM_VERSION; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.CONTEXT_REFS; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.CTX_REFS; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.DECLARATION; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.DEFAULT_TASK; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.DEFAULT_TASK_VERSION; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.DEFAULT_VALUE; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.DEFINITIONS; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.DESCRIPTION; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.EVENT_NAME; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.EVENT_VERSION; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.FIELDS; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.FIELD_NAME; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.FIELD_SCHEMA; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.FIELD_SCHEMA_VERSION; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.FINALIZER_LOGICS; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.FINALIZER_LOGIC_NAME; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.FIRST_STATE; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.FLAVOUR; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.INFIELDS; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.LOGIC; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.LOGIC_FLAVOUR; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.NAME; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.NAME_SPACE; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.NEXT_STATE; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.OPTIONAL; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.OUTFIELDS; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.OUTPUTS; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.OUTPUT_NAME; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.OUTPUT_TYPE; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.PARAMS; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.PAR_NAME; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.POLICY_NAME; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.SCHEMA; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.SCHEMA_NAME; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.SCHEMA_VERSION; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.SCOPE; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.SOURCE; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.STATES; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.STATE_NAME; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.TARGET; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.TASKS; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.TASK_LOCAL_NAME; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.TASK_NAME; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.TASK_VERSION; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.TEMPLATE; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.TRIGGER_NAME; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.TRIGGER_VERSION; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.TS_LOGIC; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.UUID; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.VERSION; +import static org.onap.policy.apex.auth.clicodegen.CliEditorContants.WRITABLE; + import java.util.List; import org.stringtemplate.v4.ST; @@ -31,6 +85,7 @@ import org.stringtemplate.v4.STGroupFile; * @author Sven van der Meer (sven.van.der.meer@ericsson.com) */ public class CGCliEditor { + // CHECKSTYLE:OFF: ParameterNumber /** The name of the STG file for the code generator. */ @@ -70,10 +125,10 @@ public class CGCliEditor { throw new IllegalArgumentException("model description should not be blank"); } - model.add("name", name); - model.add("version", version); - model.add("uuid", uuid); - model.add("description", description); + model.add(NAME, name); + model.add(VERSION, version); + model.add(UUID, uuid); + model.add(DESCRIPTION, description); } /** @@ -109,13 +164,13 @@ public class CGCliEditor { public void addSchemaDeclaration(final String name, final String version, final String uuid, final String description, final String flavour, final String schema) { final ST st = stg.getInstanceOf("schemaDecl"); - st.add("name", name); - st.add("version", version); - st.add("uuid", uuid); - st.add("description", description); - st.add("flavour", flavour); - st.add("schema", schema); - model.add("declarations", st); + st.add(NAME, name); + st.add(VERSION, version); + st.add(UUID, uuid); + st.add(DESCRIPTION, description); + st.add(FLAVOUR, flavour); + st.add(SCHEMA, schema); + model.add(DECLARATION, st); } /** @@ -134,15 +189,15 @@ public class CGCliEditor { final String description, final String scope, final boolean writable, final String schemaName, final String schemaVersion) { final ST st = stg.getInstanceOf("ctxAlbumDecl"); - st.add("name", name); - st.add("version", version); - st.add("uuid", uuid); - st.add("description", description); - st.add("scope", scope); - st.add("writable", writable); - st.add("schemaName", schemaName); - st.add("schemaVersion", schemaVersion); - model.add("declarations", st); + st.add(NAME, name); + st.add(VERSION, version); + st.add(UUID, uuid); + st.add(DESCRIPTION, description); + st.add(SCOPE, scope); + st.add(WRITABLE, writable); + st.add(SCHEMA_NAME, schemaName); + st.add(SCHEMA_VERSION, schemaVersion); + model.add(DECLARATION, st); } /** @@ -159,12 +214,12 @@ public class CGCliEditor { public ST createEventFieldDefinition(final String eventName, final String version, final String fieldName, final String fieldSchema, final String fieldSchemaVersion, final boolean optional) { final ST st = stg.getInstanceOf("eventDefField"); - st.add("eventName", eventName); - st.add("version", version); - st.add("fieldName", fieldName); - st.add("fieldSchema", fieldSchema); - st.add("fieldSchemaVersion", fieldSchemaVersion); - st.add("optional", optional); + st.add(EVENT_NAME, eventName); + st.add(VERSION, version); + st.add(FIELD_NAME, fieldName); + st.add(FIELD_SCHEMA, fieldSchema); + st.add(FIELD_SCHEMA_VERSION, fieldSchemaVersion); + st.add(OPTIONAL, optional); return st; } @@ -181,10 +236,10 @@ public class CGCliEditor { public ST createTaskDefLogic(final String taskName, final String version, final String flavour, final String logic) { final ST st = stg.getInstanceOf("taskDefLogic"); - st.add("taskName", taskName); - st.add("version", version); - st.add("flavour", flavour); - st.add("logic", logic); + st.add(TASK_NAME, taskName); + st.add(VERSION, version); + st.add(FLAVOUR, flavour); + st.add(LOGIC, logic); return st; } @@ -204,21 +259,21 @@ public class CGCliEditor { final String description, final String nameSpace, final String source, final String target, final List fields) { final ST st = stg.getInstanceOf("eventDecl"); - st.add("name", name); - st.add("version", version); - st.add("uuid", uuid); - st.add("description", description); - st.add("source", source); - st.add("target", target); - st.add("fields", fields); + st.add(NAME, name); + st.add(VERSION, version); + st.add(UUID, uuid); + st.add(DESCRIPTION, description); + st.add(SOURCE, source); + st.add(TARGET, target); + st.add(FIELDS, fields); if (nameSpace != null) { - st.add("nameSpace", nameSpace); + st.add(NAME_SPACE, nameSpace); } else if (defaultNamespace != null) { - st.add("nameSpace", defaultNamespace); + st.add(NAME_SPACE, defaultNamespace); } - model.add("declarations", st); + model.add(DECLARATION, st); } /** @@ -238,16 +293,16 @@ public class CGCliEditor { final List infields, final List outfields, final ST logic, final List parameters, final List contextRefs) { final ST st = stg.getInstanceOf("taskDecl"); - st.add("name", name); - st.add("version", version); - st.add("uuid", uuid); - st.add("description", description); - st.add("infields", infields); - st.add("outfields", outfields); - st.add("logic", logic); - st.add("parameters", parameters); - st.add("contextRefs", contextRefs); - model.add("declarations", st); + st.add(NAME, name); + st.add(VERSION, version); + st.add(UUID, uuid); + st.add(DESCRIPTION, description); + st.add(INFIELDS, infields); + st.add(OUTFIELDS, outfields); + st.add(LOGIC, logic); + st.add(PARAMS, parameters); + st.add(CONTEXT_REFS, contextRefs); + model.add(DECLARATION, st); } /** @@ -264,14 +319,14 @@ public class CGCliEditor { public void addPolicyDefinition(final String name, final String version, final String uuid, final String description, final String template, final String firstState, final List states) { final ST st = stg.getInstanceOf("policyDef"); - st.add("name", name); - st.add("version", version); - st.add("uuid", uuid); - st.add("description", description); - st.add("template", template); - st.add("firstState", firstState); - st.add("states", states); - model.add("definitions", st); + st.add(NAME, name); + st.add(VERSION, version); + st.add(UUID, uuid); + st.add(DESCRIPTION, description); + st.add(TEMPLATE, template); + st.add(FIRST_STATE, firstState); + st.add(STATES, states); + model.add(DEFINITIONS, st); } /** @@ -287,11 +342,11 @@ public class CGCliEditor { public ST createTaskDefinitionInfields(final String taskName, final String version, final String fieldName, final String fieldSchema, final String fieldSchemaVersion) { final ST st = stg.getInstanceOf("taskDefInputFields"); - st.add("taskName", taskName); - st.add("version", version); - st.add("fieldName", fieldName); - st.add("fieldSchema", fieldSchema); - st.add("fieldSchemaVersion", fieldSchemaVersion); + st.add(TASK_NAME, taskName); + st.add(VERSION, version); + st.add(FIELD_NAME, fieldName); + st.add(FIELD_SCHEMA, fieldSchema); + st.add(FIELD_SCHEMA_VERSION, fieldSchemaVersion); return st; } @@ -308,11 +363,11 @@ public class CGCliEditor { public ST createTaskDefinitionOutfields(final String taskName, final String version, final String fieldName, final String fieldSchema, final String fieldSchemaVersion) { final ST st = stg.getInstanceOf("taskDefOutputFields"); - st.add("taskName", taskName); - st.add("version", version); - st.add("fieldName", fieldName); - st.add("fieldSchema", fieldSchema); - st.add("fieldSchemaVersion", fieldSchemaVersion); + st.add(TASK_NAME, taskName); + st.add(VERSION, version); + st.add(FIELD_NAME, fieldName); + st.add(FIELD_SCHEMA, fieldSchema); + st.add(FIELD_SCHEMA_VERSION, fieldSchemaVersion); return st; } @@ -328,10 +383,10 @@ public class CGCliEditor { public ST createTaskDefinitionParameters(final String name, final String version, final String parName, final String defaultValue) { final ST st = stg.getInstanceOf("taskDefParameter"); - st.add("name", name); - st.add("version", version); - st.add("parName", parName); - st.add("defaultValue", defaultValue); + st.add(NAME, name); + st.add(VERSION, version); + st.add(PAR_NAME, parName); + st.add(DEFAULT_VALUE, defaultValue); return st; } @@ -347,10 +402,10 @@ public class CGCliEditor { public ST createTaskDefinitionContextRef(final String name, final String version, final String albumName, final String albumVersion) { final ST st = stg.getInstanceOf("taskDefCtxRef"); - st.add("name", name); - st.add("version", version); - st.add("albumName", albumName); - st.add("albumVersion", albumVersion); + st.add(NAME, name); + st.add(VERSION, version); + st.add(ALBUM_NAME, albumName); + st.add(ALBUM_VERSION, albumVersion); return st; } @@ -372,14 +427,14 @@ public class CGCliEditor { final String taskLocalName, final String taskName, final String taskVersion, final String outputType, final String outputName) { final ST st = stg.getInstanceOf("policyStateTask"); - st.add("policyName", policyName); - st.add("version", version); - st.add("stateName", stateName); - st.add("taskLocalName", taskLocalName); - st.add("taskName", taskName); - st.add("taskVersion", taskVersion); - st.add("outputType", outputType); - st.add("outputName", outputName); + st.add(POLICY_NAME, policyName); + st.add(VERSION, version); + st.add(STATE_NAME, stateName); + st.add(TASK_LOCAL_NAME, taskLocalName); + st.add(TASK_NAME, taskName); + st.add(TASK_VERSION, taskVersion); + st.add(OUTPUT_TYPE, outputType); + st.add(OUTPUT_NAME, outputName); return st; } @@ -398,13 +453,13 @@ public class CGCliEditor { public ST createPolicyStateOutput(final String policyName, final String version, final String stateName, final String outputName, final String eventName, final String eventVersion, final String nextState) { final ST st = stg.getInstanceOf("policyStateOutput"); - st.add("policyName", policyName); - st.add("version", version); - st.add("stateName", stateName); - st.add("outputName", outputName); - st.add("eventName", eventName); - st.add("eventVersion", eventVersion); - st.add("nextState", nextState); + st.add(POLICY_NAME, policyName); + st.add(VERSION, version); + st.add(STATE_NAME, stateName); + st.add(OUTPUT_NAME, outputName); + st.add(EVENT_NAME, eventName); + st.add(EVENT_VERSION, eventVersion); + st.add(NEXT_STATE, nextState); return st; } @@ -430,18 +485,18 @@ public class CGCliEditor { final String defaultTaskVersion, final List outputs, final List tasks, final List tsLogic, final List finalizerLogics, final List ctxRefs) { final ST st = stg.getInstanceOf("policyStateDef"); - st.add("policyName", policyName); - st.add("version", version); - st.add("stateName", stateName); - st.add("triggerName", triggerName); - st.add("triggerVersion", triggerVersion); - st.add("defaultTask", defaultTask); - st.add("defaultTaskVersion", defaultTaskVersion); - st.add("outputs", outputs); - st.add("tasks", tasks); - st.add("tsLogic", tsLogic); - st.add("finalizerLogics", finalizerLogics); - st.add("ctxRefs", ctxRefs); + st.add(POLICY_NAME, policyName); + st.add(VERSION, version); + st.add(STATE_NAME, stateName); + st.add(TRIGGER_NAME, triggerName); + st.add(TRIGGER_VERSION, triggerVersion); + st.add(DEFAULT_TASK, defaultTask); + st.add(DEFAULT_TASK_VERSION, defaultTaskVersion); + st.add(OUTPUTS, outputs); + st.add(TASKS, tasks); + st.add(TS_LOGIC, tsLogic); + st.add(FINALIZER_LOGICS, finalizerLogics); + st.add(CTX_REFS, ctxRefs); return st; } @@ -459,11 +514,11 @@ public class CGCliEditor { public ST createPolicyStateDefTaskSelLogic(final String name, final String version, final String stateName, final String logicFlavour, final String logic) { final ST st = stg.getInstanceOf("policyStateTaskSelectionLogic"); - st.add("name", name); - st.add("version", version); - st.add("stateName", stateName); - st.add("logicFlavour", logicFlavour); - st.add("logic", logic); + st.add(NAME, name); + st.add(VERSION, version); + st.add(STATE_NAME, stateName); + st.add(LOGIC_FLAVOUR, logicFlavour); + st.add(LOGIC, logic); return st; } @@ -482,12 +537,12 @@ public class CGCliEditor { public ST createPolicyStateDefFinalizerLogic(final String name, final String version, final String stateName, final String finalizerLogicName, final String logicFlavour, final String logic) { final ST st = stg.getInstanceOf("policyStateFinalizerLogic"); - st.add("name", name); - st.add("version", version); - st.add("stateName", stateName); - st.add("finalizerLogicName", finalizerLogicName); - st.add("logicFlavour", logicFlavour); - st.add("logic", logic); + st.add(NAME, name); + st.add(VERSION, version); + st.add(STATE_NAME, stateName); + st.add(FINALIZER_LOGIC_NAME, finalizerLogicName); + st.add(LOGIC_FLAVOUR, logicFlavour); + st.add(LOGIC, logic); return st; } @@ -504,11 +559,11 @@ public class CGCliEditor { public ST createPolicyStateDefContextRef(final String name, final String version, final String stateName, final String albumName, final String albumVersion) { final ST st = stg.getInstanceOf("policyStateContextRef"); - st.add("name", name); - st.add("version", version); - st.add("stateName", stateName); - st.add("albumName", albumName); - st.add("albumVersion", albumVersion); + st.add(NAME, name); + st.add(VERSION, version); + st.add(STATE_NAME, stateName); + st.add(ALBUM_NAME, albumName); + st.add(ALBUM_VERSION, albumVersion); return st; } diff --git a/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CliEditorContants.java b/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CliEditorContants.java new file mode 100644 index 000000000..3a82af796 --- /dev/null +++ b/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CliEditorContants.java @@ -0,0 +1,132 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.apex.auth.clicodegen; + +public class CliEditorContants { + + public static final String FINALIZER_LOGIC_NAME = "finalizerLogicName"; + + public static final String LOGIC_FLAVOUR = "logicFlavour"; + + public static final String CTX_REFS = "ctxRefs"; + + public static final String FINALIZER_LOGICS = "finalizerLogics"; + + public static final String TS_LOGIC = "tsLogic"; + + public static final String TASKS = "tasks"; + + public static final String OUTPUTS = "outputs"; + + public static final String DEFAULT_TASK_VERSION = "defaultTaskVersion"; + + public static final String DEFAULT_TASK = "defaultTask"; + + public static final String TRIGGER_VERSION = "triggerVersion"; + + public static final String TRIGGER_NAME = "triggerName"; + + public static final String NEXT_STATE = "nextState"; + + public static final String EVENT_VERSION = "eventVersion"; + + public static final String OUTPUT_NAME = "outputName"; + + public static final String OUTPUT_TYPE = "outputType"; + + public static final String TASK_VERSION = "taskVersion"; + + public static final String TASK_LOCAL_NAME = "taskLocalName"; + + public static final String STATE_NAME = "stateName"; + + public static final String POLICY_NAME = "policyName"; + + public static final String ALBUM_VERSION = "albumVersion"; + + public static final String ALBUM_NAME = "albumName"; + + public static final String DEFAULT_VALUE = "defaultValue"; + + public static final String PAR_NAME = "parName"; + + public static final String CONTEXT_REFS = "contextRefs"; + + public static final String PARAMS = "parameters"; + + public static final String OUTFIELDS = "outfields"; + + public static final String INFIELDS = "infields"; + + public static final String NAME_SPACE = "nameSpace"; + + public static final String FIELDS = "fields"; + + public static final String TARGET = "target"; + + public static final String SOURCE = "source"; + + public static final String LOGIC = "logic"; + + public static final String TASK_NAME = "taskName"; + + public static final String OPTIONAL = "optional"; + + public static final String FIELD_SCHEMA_VERSION = "fieldSchemaVersion"; + + public static final String FIELD_SCHEMA = "fieldSchema"; + + public static final String FIELD_NAME = "fieldName"; + + public static final String EVENT_NAME = "eventName"; + + public static final String DECLARATION = "declarations"; + + public static final String SCHEMA = "schema"; + + public static final String FLAVOUR = "flavour"; + + public static final String DESCRIPTION = "description"; + + public static final String UUID = "uuid"; + + public static final String VERSION = "version"; + + public static final String NAME = "name"; + + public static final String SCHEMA_VERSION = "schemaVersion"; + + public static final String SCHEMA_NAME = "schemaName"; + + public static final String WRITABLE = "writable"; + + public static final String STATES = "states"; + + public static final String FIRST_STATE = "firstState"; + + public static final String TEMPLATE = "template"; + + public static final String SCOPE = "scope"; + + public static final String DEFINITIONS = "definitions"; + + private CliEditorContants() {} +} -- cgit 1.2.3-korg