ref #3074 - update shouldIgnoreClass

Author: frantuma

modules/swagger-jaxrs2/src/main/java/io/swagger/v3/jaxrs2/Reader.java

@@ -417,7 +417,7 @@ public OpenAPI read(Class<?> cls,
                         returnType = annotatedMethod.getType();
                     }
 
-                    if (shouldIgnoreClass(returnType.getTypeName()) && !returnType.equals(subResource)) {
+                    if (shouldIgnoreClass(returnType.getTypeName()) && !method.getGenericReturnType().equals(subResource)) {
                         continue;
                     }
                 }
@@ -1013,7 +1013,7 @@ private Operation parseMethod(
         }
 
         final Class<?> subResource = getSubResourceWithJaxRsSubresourceLocatorSpecs(method);
-        if (!shouldIgnoreClass(returnType.getTypeName()) && !returnType.equals(subResource)) {
+        if (!shouldIgnoreClass(returnType.getTypeName()) && !method.getGenericReturnType().equals(subResource)) {
             ResolvedSchema resolvedSchema = ModelConverters.getInstance().resolveAsResolvedSchema(new AnnotatedType(returnType).resolveAsRef(true).jsonViewAnnotation(jsonViewAnnotation));
             if (resolvedSchema.schema != null) {
                 Schema returnTypeSchema = resolvedSchema.schema;

modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/ReaderTest.java

@@ -1974,7 +1974,6 @@ public void testTicket3029() {
         SerializationMatchers.assertEqualsToYaml(openAPI, yaml);
     }
 
-<<<<<<< HEAD
     @Test(description = "response generic subclass")
     public void testTicket3082() {
         Reader reader = new Reader(new OpenAPI());

modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/resources/RefParameter3029Resource.java

@@ -2,15 +2,9 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import org.mockito.internal.matchers.Not;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
 
 public class RefParameter3029Resource {