Minor changes for new Eclipse checkstyle checks

The laest Eclipse checkstyle version 8.26.0 does more thorough checking
and identified a number of small issues in the apex-pdp codebase. This
review fixes those issues.

Issue-ID: POLICY-1913
Change-Id: I30ba25e3e425c6d54c77f925e8da3ab841a8357c
Signed-off-by: liamfallon <liam.fallon@est.tech>

2 files changed, 10 insertions, 6 deletions

diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java
index 14f84bb44..0a119cdc7 100644
--- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java
+++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java
@@ -47,7 +47,9 @@ public final class SchemaUtils {
     /**
      * Private constructor to avoid instantiation.
      */
-    private SchemaUtils() {}
+    private SchemaUtils() {
+        // Private constructor to block subclassing
+    }
 
     /**
      * Returns the schema for an event.
diff --git a/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/CliOptions.java b/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/CliOptions.java
index 122ec90a9..3590a764c 100644
--- a/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/CliOptions.java
+++ b/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/CliOptions.java
@@ -84,9 +84,9 @@ public final class CliOptions {
             .desc("set the input policy model file").build();
 
     /** A type option defining what type is used for events with "-t" and "--type". */
-    public static final Option TYPE = Option.builder("t").hasArg().argName("TYPE").longOpt("type").desc(
-            "set the event type for generation, one of: stimuli (trigger events), response (action events),"
-            + " internal (events between states)")
+    public static final Option TYPE = Option.builder("t").hasArg().argName("TYPE").longOpt("type")
+            .desc("set the event type for generation, one of: stimuli (trigger events), response (action events),"
+                    + " internal (events between states)")
             .build();
 
     /** A server option with "-s" and "--server". */
@@ -100,7 +100,9 @@ public final class CliOptions {
     /** A skip validation option with "-sv" and "--skip-validation". */
     public static final Option SKIPVALIDATION = Option.builder("sv").longOpt("skip-validation")
             .desc("switch of validation of the input file").required(false).type(boolean.class).build();
-    
+
     /** Private constructor to prevent instantiation. */
-    private CliOptions() {}
+    private CliOptions() {
+        // Private constructor to block subclassing
+    }
 }