Fix sonar issues in gson superclasses

Fixing some of the issues necessitated the use of generic/raw types.
Removed version from assertj in pom.
Removed trailing spaces.

Change-Id: I76e0a05ca06c103ccc876675be04a4ab5e4de5ea
Issue-ID: POLICY-1428
Signed-off-by: Jim Hahn <jrh3@att.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/gson/src/main/java/org/onap/policy/common/gson/GsonMessageBodyHandler.java b/gson/src/main/java/org/onap/policy/common/gson/GsonMessageBodyHandler.java
index 2112c97c..66475e3e 100644
--- a/gson/src/main/java/org/onap/policy/common/gson/GsonMessageBodyHandler.java
+++ b/gson/src/main/java/org/onap/policy/common/gson/GsonMessageBodyHandler.java
@@ -80,7 +80,7 @@ public class GsonMessageBodyHandler implements MessageBodyReader<Object>, Messag
     @Override
     public void writeTo(Object object, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
                     MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
-                    throws IOException, WebApplicationException {
+                    throws IOException {
 
         try (OutputStreamWriter writer = new OutputStreamWriter(entityStream, StandardCharsets.UTF_8)) {
             Type jsonType = (type.equals(genericType) ? type : genericType);
@@ -107,8 +107,11 @@ public class GsonMessageBodyHandler implements MessageBodyReader<Object>, Messag
 
         String subtype = mediaType.getSubtype();
 
-        return "json".equalsIgnoreCase(subtype) || subtype.endsWith("+json") || "javascript".equals(subtype)
-                        || "x-javascript".equals(subtype) || "x-json".equals(subtype);
+        if ("json".equalsIgnoreCase(subtype) || "javascript".equals(subtype)) {
+            return true;
+        }
+
+        return subtype.endsWith("+json") || "x-json".equals(subtype) || "x-javascript".equals(subtype);
     }
 
     @Override