Fix checkstyle/sonar issues

Remove unused imports
Add @FunctionalInterface annotation
Reduce the complexity of some methods

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

1 files changed, 2 insertions, 4 deletions

diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java
index 86a826bd1..9041a8067 100644
--- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java
+++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java
@@ -150,13 +150,11 @@ public class Model2JsonEventSchema {
             case FLOAT:
             case INT:
             case LONG:
-            case STRING: {
+            case STRING:
                 return true;
-            }
             
-            default: {
+            default:
                 return false;
-            }
         }
     }