fix sonarcloud bugs

openknowledge · Apr 26, 2018 · c39730f · c39730f
1 parent 71d29da
commit c39730f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...ing/src/main/java/de/openknowledge/jaxrs/versioning/conversion/InterversionConverter.java b/...ing/src/main/java/de/openknowledge/jaxrs/versioning/conversion/InterversionConverter.java
@@ -132,7 +132,7 @@ private boolean match(VersionProperty property, VersionProperty previousProperty
   }
 
   private boolean match(VersionType<?> versionType, VersionType<?> previousVersionType, Set<Pair<VersionType<?>, VersionType<?>>> visited) {
-    ImmutablePair<?, ?> pair = ImmutablePair.of(versionType, previousVersionType);
+    Pair<?, ?> pair = ImmutablePair.of(versionType, previousVersionType);
     if (visited.contains(pair)) {
       return true;
     }

diff --git a/...ning/src/main/java/de/openknowledge/jaxrs/versioning/conversion/MessageBodyConverter.java b/...ning/src/main/java/de/openknowledge/jaxrs/versioning/conversion/MessageBodyConverter.java
@@ -118,7 +118,7 @@ private Type getVersionType(Type type, String version) {
       Type sourceType = getVersionType(getTypeArgument(type), version);
       return new DefaultParameterizedType(((ParameterizedType)type).getOwnerType(), rawType, sourceType);
     }
-    SupportedVersion supportedVersion = toClass(type).getAnnotation(SupportedVersion.class);
+    SupportedVersion supportedVersion = extractSupportedVersion(type);
     if (supportedVersion == null) {
       throw new IllegalVersionException(version);
     }
@@ -129,6 +129,15 @@ private Type getVersionType(Type type, String version) {
     }
   }
 
+  private SupportedVersion extractSupportedVersion(Type type) {
+    Class<?> clz = toClass(type);
+    if (clz != null) {
+      return clz.getAnnotation(SupportedVersion.class);
+    }
+
+    return null;
+  }
+
   private Class<?> toClass(Type type) {
     if (type instanceof Class) {
       return (Class<?>)type;