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 <liam.fallon@ericsson.com>

2 files changed, 8 insertions, 8 deletions

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/CodeGeneratorCliEditor.java
index 30e883aae..75ac1fe03 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/CodeGeneratorCliEditor.java
@@ -84,7 +84,7 @@ import org.stringtemplate.v4.STGroupFile;
  *
  * @author Sven van der Meer (sven.van.der.meer@ericsson.com)
  */
-public class CGCliEditor {
+public class CodeGeneratorCliEditor {
 
     // CHECKSTYLE:OFF: ParameterNumber
 
@@ -103,7 +103,7 @@ public class CGCliEditor {
     /**
      * Creates a new code generator.
      */
-    public CGCliEditor() {
+    public CodeGeneratorCliEditor() {
         stg = new STGroupFile(STG_FILE);
         stg.registerRenderer(String.class, new CgStringRenderer(), true);
         model = stg.getInstanceOf("policyModel");
diff --git a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/TestSTG.java b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/TestGeneration.java
index 1fbc78de9..851c06631 100644
--- a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/TestSTG.java
+++ b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/TestGeneration.java
@@ -30,7 +30,7 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.junit.Test;
-import org.onap.policy.apex.auth.clicodegen.CGCliEditor;
+import org.onap.policy.apex.auth.clicodegen.CodeGeneratorCliEditor;
 import org.stringtemplate.v4.STGroup;
 import org.stringtemplate.v4.STGroupFile;
 
@@ -39,7 +39,7 @@ import org.stringtemplate.v4.STGroupFile;
  *
  * @author Sven van der Meer (sven.van.der.meer@ericsson.com)
  */
-public class TestSTG {
+public class TestGeneration {
 
     /**
      * Get the chunks for the codegen.
@@ -89,9 +89,9 @@ public class TestSTG {
 
     /** Test STG load. */
     @Test
-    public void testSTGLoad() {
+    public void testGenerationLoad() {
         final StErrorListener errListener = new StErrorListener();
-        final STGroupFile stg = new STGroupFile(CGCliEditor.STG_FILE);
+        final STGroupFile stg = new STGroupFile(CodeGeneratorCliEditor.STG_FILE);
         stg.setListener(errListener);
 
         stg.getTemplateNames(); // dummy to compile group and get errors
@@ -100,9 +100,9 @@ public class TestSTG {
 
     /** Test STG chunks. */
     @Test
-    public void testSTGChunks() {
+    public void testGenerationChunks() {
         final StErrorListener errListener = new StErrorListener();
-        final STGroupFile stg = new STGroupFile(CGCliEditor.STG_FILE);
+        final STGroupFile stg = new STGroupFile(CodeGeneratorCliEditor.STG_FILE);
         stg.setListener(errListener);
 
         stg.getTemplateNames(); // dummy to compile group and get errors