Remove usage of generic wildcard type

dilipkrish · dilipkrish · commit 0af17999fa5d · 2020-06-25T12:01:46.000-05:00
diff --git a/springfox-bean-validators/src/main/java/springfox/bean/validators/plugins/Validators.java b/springfox-bean-validators/src/main/java/springfox/bean/validators/plugins/Validators.java
@@ -59,7 +59,8 @@ public static <T extends Annotation> Optional<T> annotationFromBean(
     if (propertyDefinition.isPresent()) {
       Optional<Method> getter = extractGetterFromPropertyDefinition(propertyDefinition.get());
       Optional<Field> field = extractFieldFromPropertyDefinition(propertyDefinition.get());
-      notNull = findAnnotation(getter, annotationType).map(Optional::of).orElse(findAnnotation(field, annotationType));
+      notNull = findAnnotation(getter, annotationType)
+          .or(() -> findAnnotation(field, annotationType));
     }
 
     return notNull;
diff --git a/springfox-core/src/main/java/springfox/documentation/RequestHandler.java b/springfox-core/src/main/java/springfox/documentation/RequestHandler.java
@@ -59,9 +59,9 @@ public interface RequestHandler extends Comparable<RequestHandler> {
 
   Set<RequestMethod> supportedMethods();
 
-  Set<? extends MediaType> produces();
+  Set<MediaType> produces();
 
-  Set<? extends MediaType> consumes();
+  Set<MediaType> consumes();
 
   Set<NameValueExpression<String>> headers();
 
@@ -82,7 +82,7 @@ public interface RequestHandler extends Comparable<RequestHandler> {
    * @deprecated This is introduced to preserve backwards compat
    */
   @Deprecated
-  RequestMappingInfo getRequestMapping();
+  RequestMappingInfo<?> getRequestMapping();
 
   /**
    * @return handler method
diff --git a/springfox-core/src/main/java/springfox/documentation/RequestHandlerKey.java b/springfox-core/src/main/java/springfox/documentation/RequestHandlerKey.java
@@ -29,14 +29,14 @@ public class RequestHandlerKey {
 
   private final Set<String> pathMappings;
   private final Set<RequestMethod> supportedMethods;
-  private final Set<? extends MediaType> supportedMediaTypes;
-  private final Set<? extends MediaType> producibleMediaTypes;
+  private final Set<MediaType> supportedMediaTypes;
+  private final Set<MediaType> producibleMediaTypes;
 
   public RequestHandlerKey(
       Set<String> pathMappings,
       Set<RequestMethod> supportedMethods,
-      Set<? extends MediaType> supportedMediaTypes,
-      Set<? extends MediaType> producibleMediaTypes) {
+      Set<MediaType> supportedMediaTypes,
+      Set<MediaType> producibleMediaTypes) {
 
     this.pathMappings = pathMappings;
     this.supportedMethods = supportedMethods;
@@ -52,11 +52,11 @@ public Set<RequestMethod> getSupportedMethods() {
     return supportedMethods;
   }
 
-  public Set<? extends MediaType> getSupportedMediaTypes() {
+  public Set<MediaType> getSupportedMediaTypes() {
     return supportedMediaTypes;
   }
 
-  public Set<? extends MediaType> getProducibleMediaTypes() {
+  public Set<MediaType> getProducibleMediaTypes() {
     return producibleMediaTypes;
   }
 
diff --git a/springfox-core/src/main/java/springfox/documentation/builders/ElementFacets.java b/springfox-core/src/main/java/springfox/documentation/builders/ElementFacets.java
@@ -17,7 +17,7 @@ public static <T extends ElementFacetBuilder> Function<Class<?>, ElementFacetBui
       Class<T> clazz) {
     return t -> {
       try {
-        return clazz.newInstance();
+        return clazz.getDeclaredConstructor().newInstance();
       } catch (Exception e) {
         LOGGER.error("Unable to create builder of type {}", clazz);
         throw new RuntimeException(String.format("Unable to create builder of type %s", clazz), e);
diff --git a/springfox-core/src/main/java/springfox/documentation/builders/RequestHandlerSelectors.java b/springfox-core/src/main/java/springfox/documentation/builders/RequestHandlerSelectors.java
@@ -88,11 +88,11 @@ private static Function<Class<?>, Boolean> handlerPackage(final String basePacka
    * @param basePackage - base package of the classes
    * @return this
    */
-  public static Predicate<RequestHandler> basePackage(final String basePackage) {
+  public static Predicate<RequestHandler> basePackage(String basePackage) {
     return input -> declaringClass(input).map(handlerPackage(basePackage)).orElse(true);
   }
 
-  private static Optional<? extends Class<?>> declaringClass(RequestHandler input) {
+  private static Optional<Class<?>> declaringClass(RequestHandler input) {
     return ofNullable(input.declaringClass());
   }
 
diff --git a/springfox-core/src/main/java/springfox/documentation/builders/RequestParameterBuilder.java b/springfox-core/src/main/java/springfox/documentation/builders/RequestParameterBuilder.java
@@ -133,7 +133,7 @@ public RequestParameterBuilder parameterSpecificationProvider(ParameterSpecifica
     return this;
   }
 
-  public RequestParameterBuilder accepts(Collection<? extends MediaType> accepts) {
+  public RequestParameterBuilder accepts(Collection<MediaType> accepts) {
     this.accepts.addAll(accepts);
     return this;
   }
diff --git a/springfox-core/src/main/java/springfox/documentation/builders/ResourceListingBuilder.java b/springfox-core/src/main/java/springfox/documentation/builders/ResourceListingBuilder.java
@@ -66,7 +66,7 @@ public ResourceListingBuilder apis(List<ApiListingReference> apis) {
    * @param authorizations - security definitions
    * @return this
    */
-  public ResourceListingBuilder securitySchemes(List<? extends SecurityScheme> authorizations) {
+  public ResourceListingBuilder securitySchemes(List<SecurityScheme> authorizations) {
     this.securitySchemes.addAll(nullToEmptyList(authorizations));
     return this;
   }
diff --git a/springfox-core/src/main/java/springfox/documentation/schema/ModelProperty.java b/springfox-core/src/main/java/springfox/documentation/schema/ModelProperty.java
@@ -130,7 +130,7 @@ public boolean isHidden() {
     return isHidden;
   }
 
-  public ModelProperty updateModelRef(Function<ResolvedType, ? extends ModelReference> modelRefFactory) {
+  public ModelProperty updateModelRef(Function<ResolvedType, ModelReference> modelRefFactory) {
     modelRef = modelRefFactory.apply(type);
     return this;
   }
diff --git a/springfox-core/src/test/groovy/springfox/documentation/builders/MockRequestHandler.java b/springfox-core/src/test/groovy/springfox/documentation/builders/MockRequestHandler.java
@@ -87,12 +87,12 @@ public Set<RequestMethod> supportedMethods() {
   }
 
   @Override
-  public Set<? extends MediaType> produces() {
+  public Set<MediaType> produces() {
     return null;
   }
 
   @Override
-  public Set<? extends MediaType> consumes() {
+  public Set<MediaType> consumes() {
     return null;
   }
 
@@ -132,7 +132,7 @@ public <T extends Annotation> Optional<T> findControllerAnnotation(Class<T> anno
   }
 
   @Override
-  public springfox.documentation.spring.wrapper.RequestMappingInfo getRequestMapping() {
+  public springfox.documentation.spring.wrapper.RequestMappingInfo<?> getRequestMapping() {
     return null;
   }
 }
diff --git a/springfox-data-rest/src/main/java/springfox/documentation/spring/data/rest/SpringDataRestRequestHandler.java b/springfox-data-rest/src/main/java/springfox/documentation/spring/data/rest/SpringDataRestRequestHandler.java
@@ -93,12 +93,12 @@ public Set<RequestMethod> supportedMethods() {
   }
 
   @Override
-  public Set<? extends MediaType> produces() {
+  public Set<MediaType> produces() {
     return actionSpecification.getProduces();
   }
 
   @Override
-  public Set<? extends MediaType> consumes() {
+  public Set<MediaType> consumes() {
     return actionSpecification.getConsumes();
   }
 
@@ -154,7 +154,7 @@ public HandlerMethod getHandlerMethod() {
   }
 
   @Override
-  public RequestMappingInfo getRequestMapping() {
+  public RequestMappingInfo<?> getRequestMapping() {
     throw new UnsupportedOperationException();
   }
 
diff --git a/springfox-schema/src/main/java/springfox/documentation/schema/DefaultModelDependencyProvider.java b/springfox-schema/src/main/java/springfox/documentation/schema/DefaultModelDependencyProvider.java
@@ -112,7 +112,7 @@ private Set<ResolvedType> resolvedDependencies(ModelContext modelContext) {
     return dependencies;
   }
 
-  private Collection<? extends ResolvedType> resolvedSubclasses(ModelContext modelContext, ResolvedType resolvedType) {
+  private Collection<ResolvedType> resolvedSubclasses(ModelContext modelContext, ResolvedType resolvedType) {
     JsonSubTypes subTypes = AnnotationUtils.findAnnotation(
         resolvedType.getErasedType(),
         JsonSubTypes.class);
@@ -128,15 +128,15 @@ private Collection<? extends ResolvedType> resolvedSubclasses(ModelContext model
     return subclasses;
   }
 
-  private Collection<? extends ResolvedType> resolvedMapType(ModelContext modelContext, ResolvedType resolvedType) {
+  private Collection<ResolvedType> resolvedMapType(ModelContext modelContext, ResolvedType resolvedType) {
     ResolvedType mapType = resolvedType.findSupertype(Map.class);
     if (mapType == null) {
       return new ArrayList<>();
     }
     return resolvedTypeParameters(modelContext, mapType);
   }
 
-  private List<? extends ResolvedType> resolvedArrayElementType(ModelContext modelContext, ResolvedType resolvedType) {
+  private List<ResolvedType> resolvedArrayElementType(ModelContext modelContext, ResolvedType resolvedType) {
     List<ResolvedType> parameters = new ArrayList<>();
     if (resolvedType.isArray()) {
       ResolvedType elementType = resolvedType.getArrayElementType();
@@ -148,7 +148,7 @@ private List<? extends ResolvedType> resolvedArrayElementType(ModelContext model
     return parameters;
   }
 
-  private Set<? extends ResolvedType> resolvedTypeParameters(ModelContext modelContext, ResolvedType resolvedType) {
+  private Set<ResolvedType> resolvedTypeParameters(ModelContext modelContext, ResolvedType resolvedType) {
     Set<ResolvedType> parameters = new HashSet<>();
     for (ResolvedType parameter : resolvedType.getTypeParameters()) {
       LOG.debug("Adding type for parameter {}", parameter.getSignature());
diff --git a/springfox-schema/src/main/java/springfox/documentation/schema/property/FactoryMethodProvider.java b/springfox-schema/src/main/java/springfox/documentation/schema/property/FactoryMethodProvider.java
@@ -47,17 +47,17 @@ public FactoryMethodProvider(TypeResolver resolver) {
     memberResolver = new MemberResolver(resolver);
   }
 
-  public Optional<? extends ResolvedParameterizedMember> in(
+  public Optional<? extends ResolvedParameterizedMember<?>> in(
       ResolvedType resolvedType,
-      Predicate<ResolvedParameterizedMember> predicate) {
+      Predicate<ResolvedParameterizedMember<?>> predicate) {
     return Stream.concat(
         constructors(resolvedType).stream(),
         delegatedFactoryMethods(resolvedType).stream())
         .filter(predicate)
         .findFirst();
   }
 
-  static Predicate<ResolvedParameterizedMember> factoryMethodOf(final AnnotatedParameter parameter) {
+  static Predicate<ResolvedParameterizedMember<?>> factoryMethodOf(final AnnotatedParameter parameter) {
     return input -> input.getRawMember().equals(parameter.getOwner().getMember());
   }
 
diff --git a/springfox-spi/src/main/java/springfox/documentation/spi/service/contexts/DocumentationContext.java b/springfox-spi/src/main/java/springfox/documentation/spi/service/contexts/DocumentationContext.java
@@ -50,7 +50,7 @@ public class DocumentationContext {
   private final List<RequestParameter> globalParameters = new ArrayList<>();
   private final PathProvider pathProvider;
   private final List<SecurityContext> securityContexts;
-  private final List<? extends SecurityScheme> securitySchemes;
+  private final List<SecurityScheme> securitySchemes;
   private final Comparator<ApiListingReference> listingReferenceOrdering;
   private final Comparator<ApiDescription> apiDescriptionOrdering;
   private final Comparator<Operation> operationOrdering;
@@ -79,7 +79,7 @@ public DocumentationContext(
       Map<HttpMethod, List<Response>> globalResponses,
       PathProvider pathProvider,
       List<SecurityContext> securityContexts,
-      List<? extends SecurityScheme> securitySchemes,
+      List<SecurityScheme> securitySchemes,
       List<AlternateTypeRule> alternateTypeRules,
       Comparator<ApiListingReference> listingReferenceOrdering,
       Comparator<ApiDescription> apiDescriptionOrdering,
@@ -172,7 +172,7 @@ public List<SecurityContext> getSecurityContexts() {
     return securityContexts;
   }
 
-  public List<? extends SecurityScheme> getSecuritySchemes() {
+  public List<SecurityScheme> getSecuritySchemes() {
     return securitySchemes.stream()
                           .filter(Objects::nonNull)
                           .collect(Collectors.toList());
diff --git a/springfox-spi/src/main/java/springfox/documentation/spi/service/contexts/DocumentationContextBuilder.java b/springfox-spi/src/main/java/springfox/documentation/spi/service/contexts/DocumentationContextBuilder.java
@@ -148,7 +148,7 @@ public DocumentationContextBuilder securityContexts(List<SecurityContext> securi
     return this;
   }
 
-  public DocumentationContextBuilder securitySchemes(List<? extends SecurityScheme> securitySchemes) {
+  public DocumentationContextBuilder securitySchemes(List<SecurityScheme> securitySchemes) {
     this.securitySchemes.addAll(nullToEmptyList(securitySchemes));
     return this;
   }
diff --git a/springfox-spi/src/main/java/springfox/documentation/spi/service/contexts/OperationContext.java b/springfox-spi/src/main/java/springfox/documentation/spi/service/contexts/OperationContext.java
@@ -138,11 +138,11 @@ public ResolvedType alternateFor(ResolvedType resolved) {
     return getAlternateTypeProvider().alternateFor(resolved);
   }
 
-  public Set<? extends MediaType> produces() {
+  public Set<MediaType> produces() {
     return requestContext.produces();
   }
 
-  public Set<? extends MediaType> consumes() {
+  public Set<MediaType> consumes() {
     return requestContext.consumes();
   }
 
diff --git a/springfox-spi/src/main/java/springfox/documentation/spi/service/contexts/RequestMappingContext.java b/springfox-spi/src/main/java/springfox/documentation/spi/service/contexts/RequestMappingContext.java
@@ -171,11 +171,11 @@ public Set<RequestMethod> getMethodsCondition() {
     return handler.supportedMethods();
   }
 
-  public Set<? extends MediaType> produces() {
+  public Set<MediaType> produces() {
     return handler.produces();
   }
 
-  public Set<? extends MediaType> consumes() {
+  public Set<MediaType> consumes() {
     return handler.consumes();
   }
 
diff --git a/springfox-spring-web/src/main/java/springfox/documentation/spring/web/plugins/AbstractDocumentationPluginsBootstrapper.java b/springfox-spring-web/src/main/java/springfox/documentation/spring/web/plugins/AbstractDocumentationPluginsBootstrapper.java
@@ -120,7 +120,7 @@ private RequestHandlerCombiner combiner() {
     return ofNullable(combiner).orElse(new DefaultRequestHandlerCombiner());
   }
 
-  private Function<RequestHandlerProvider, ? extends Iterable<RequestHandler>> handlers() {
+  private Function<RequestHandlerProvider, Iterable<RequestHandler>> handlers() {
     return (Function<RequestHandlerProvider, Iterable<RequestHandler>>) RequestHandlerProvider::requestHandlers;
   }
 
diff --git a/springfox-spring-web/src/main/java/springfox/documentation/spring/web/plugins/CombinedRequestHandler.java b/springfox-spring-web/src/main/java/springfox/documentation/spring/web/plugins/CombinedRequestHandler.java
@@ -59,7 +59,7 @@ public boolean isAnnotatedWith(Class<? extends Annotation> annotation) {
     return first.isAnnotatedWith(annotation) || second.isAnnotatedWith(annotation);
   }
 
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"rawtypes", "unchecked"})
   @Override
   public PatternsRequestCondition getPatternsCondition() {
     return first.getPatternsCondition().combine(second.getPatternsCondition());
@@ -84,15 +84,15 @@ public Set<RequestMethod> supportedMethods() {
   }
 
   @Override
-  public Set<? extends MediaType> produces() {
+  public Set<MediaType> produces() {
     return Stream.concat(
         ofNullable(first.produces()).orElse(emptySet()).stream(),
         ofNullable(second.produces()).orElse(emptySet()).stream())
         .collect(toSet());
   }
 
   @Override
-  public Set<? extends MediaType> consumes() {
+  public Set<MediaType> consumes() {
     return Stream.concat(
         ofNullable(first.consumes()).orElse(emptySet()).stream(),
         ofNullable(second.consumes()).orElse(emptySet()).stream())
@@ -147,7 +147,7 @@ public <T extends Annotation> Optional<T> findControllerAnnotation(Class<T> anno
   }
 
   @Override
-  public RequestMappingInfo getRequestMapping() {
+  public RequestMappingInfo<?> getRequestMapping() {
     return first.getRequestMapping();
   }
 
diff --git a/springfox-spring-web/src/main/java/springfox/documentation/spring/web/plugins/DefaultRequestHandlerCombiner.java b/springfox-spring-web/src/main/java/springfox/documentation/spring/web/plugins/DefaultRequestHandlerCombiner.java
@@ -62,7 +62,7 @@ public List<RequestHandler> combine(List<RequestHandler> source) {
         .collect(toList());
   }
 
-  private Collection<? extends RequestHandler> combined(Collection<RequestHandler> requestHandlers) {
+  private Collection<RequestHandler> combined(Collection<RequestHandler> requestHandlers) {
     List<RequestHandler> source = new ArrayList<>(requestHandlers);
     if (source.size() == 0 || source.size() == 1) {
       return requestHandlers;
diff --git a/springfox-spring-web/src/main/java/springfox/documentation/spring/web/plugins/Docket.java b/springfox-spring-web/src/main/java/springfox/documentation/spring/web/plugins/Docket.java
@@ -90,7 +90,7 @@ public class Docket implements DocumentationPlugin {
   private final List<Server> servers = new ArrayList<>();
 
   private PathProvider pathProvider;
-  private List<? extends SecurityScheme> securitySchemes;
+  private List<SecurityScheme> securitySchemes;
   private Comparator<ApiListingReference> apiListingReferenceOrdering;
   private Comparator<ApiDescription> apiDescriptionOrdering;
   private Comparator<Operation> operationOrdering;
@@ -143,7 +143,7 @@ public Docket apiInfo(ApiInfo apiInfo) {
    * @param securitySchemes a list of security schemes
    * @return this Docket
    */
-  public Docket securitySchemes(List<? extends SecurityScheme> securitySchemes) {
+  public Docket securitySchemes(List<SecurityScheme> securitySchemes) {
     this.securitySchemes = securitySchemes;
     return this;
   }
diff --git a/springfox-spring-web/src/main/java/springfox/documentation/spring/web/readers/operation/HandlerMethodResolver.java b/springfox-spring-web/src/main/java/springfox/documentation/spring/web/readers/operation/HandlerMethodResolver.java
@@ -249,7 +249,9 @@ private Optional<String> discoveredName(MethodParameter methodParameter) {
   private ParameterNameDiscoverer parameterNameDiscoverer() {
     ParameterNameDiscoverer discoverer;
     try {
-      discoverer = (ParameterNameDiscoverer) Class.forName(SPRING4_DISCOVERER).newInstance();
+      discoverer = (ParameterNameDiscoverer) Class.forName(SPRING4_DISCOVERER)
+          .getDeclaredConstructor()
+          .newInstance();
     } catch (Exception e) {
       discoverer = new LocalVariableTableParameterNameDiscoverer();
     }
diff --git a/springfox-spring-web/src/main/java/springfox/documentation/spring/web/readers/parameter/ParameterTypeDeterminer.java b/springfox-spring-web/src/main/java/springfox/documentation/spring/web/readers/parameter/ParameterTypeDeterminer.java
@@ -28,7 +28,7 @@ private ParameterTypeDeterminer() {
     throw new UnsupportedOperationException();
   }
 
-  public static String determineScalarParameterType(Set<? extends MediaType> consumes, HttpMethod method) {
+  public static String determineScalarParameterType(Set<MediaType> consumes, HttpMethod method) {
     String parameterType = "query";
 
     if (consumes.contains(MediaType.APPLICATION_FORM_URLENCODED)
diff --git a/springfox-spring-web/src/main/java/springfox/documentation/spring/web/scanners/ApiDocumentationScanner.java b/springfox-spring-web/src/main/java/springfox/documentation/spring/web/scanners/ApiDocumentationScanner.java
@@ -92,7 +92,7 @@ public Documentation scan(DocumentationContext context) {
     return group.build();
   }
 
-  private Collection<? extends ApiListingReference> apiListingReferences(
+  private Collection<ApiListingReference> apiListingReferences(
       Map<String, List<ApiListing>> apiListings,
       DocumentationContext context) {
     return apiListings.entrySet().stream().map(toApiListingReference(context)).collect(toSet());
diff --git a/springfox-spring-web/src/main/java/springfox/documentation/spring/web/scanners/MediaTypeReader.java b/springfox-spring-web/src/main/java/springfox/documentation/spring/web/scanners/MediaTypeReader.java
@@ -98,7 +98,7 @@ private boolean handlerMethodHasFileParameter(OperationContext context) {
     return false;
   }
 
-  private Set<String> toSet(Set<? extends MediaType> mediaTypeSet) {
+  private Set<String> toSet(Set<MediaType> mediaTypeSet) {
     Set<String> mediaTypes = new HashSet<>();
     for (MediaType mediaType : mediaTypeSet) {
       mediaTypes.add(mediaType.toString());
diff --git a/springfox-spring-web/src/test/groovy/springfox/documentation/spi/service/contexts/OrderingsSpec.groovy b/springfox-spring-web/src/test/groovy/springfox/documentation/spi/service/contexts/OrderingsSpec.groovy
diff --git a/springfox-spring-webflux/src/main/java/springfox/documentation/spring/web/WebFluxRequestHandler.java b/springfox-spring-webflux/src/main/java/springfox/documentation/spring/web/WebFluxRequestHandler.java
diff --git a/springfox-spring-webmvc/src/main/java/springfox/documentation/spring/web/WebMvcRequestHandler.java b/springfox-spring-webmvc/src/main/java/springfox/documentation/spring/web/WebMvcRequestHandler.java
diff --git a/springfox-spring-webmvc/src/test/groovy/springfox/documentation/spring/web/OperationCachingEquivalenceSpec.groovy b/springfox-spring-webmvc/src/test/groovy/springfox/documentation/spring/web/OperationCachingEquivalenceSpec.groovy
diff --git a/springfox-swagger-common/src/main/java/springfox/documentation/swagger/web/SwaggerApiListingReader.java b/springfox-swagger-common/src/main/java/springfox/documentation/swagger/web/SwaggerApiListingReader.java
diff --git a/springfox-swagger2/src/main/java/springfox/documentation/swagger2/mappers/Properties.java b/springfox-swagger2/src/main/java/springfox/documentation/swagger2/mappers/Properties.java

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ public static <T extends Annotation> Optional<T> annotationFromBean(`
`59`	`59`	`if (propertyDefinition.isPresent()) {`
`60`	`60`	`Optional<Method> getter = extractGetterFromPropertyDefinition(propertyDefinition.get());`
`61`	`61`	`Optional<Field> field = extractFieldFromPropertyDefinition(propertyDefinition.get());`
`62`		`- notNull = findAnnotation(getter, annotationType).map(Optional::of).orElse(findAnnotation(field, annotationType));`
	`62`	`+ notNull = findAnnotation(getter, annotationType)`
	`63`	`+ .or(() -> findAnnotation(field, annotationType));`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`return notNull;`
Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,11 @@ private static Function<Class<?>, Boolean> handlerPackage(final String basePacka`
`88`	`88`	`* @param basePackage - base package of the classes`
`89`	`89`	`* @return this`
`90`	`90`	`*/`
`91`		`- public static Predicate<RequestHandler> basePackage(final String basePackage) {`
	`91`	`+ public static Predicate<RequestHandler> basePackage(String basePackage) {`
`92`	`92`	`return input -> declaringClass(input).map(handlerPackage(basePackage)).orElse(true);`
`93`	`93`	`}`
`94`	`94`
`95`		`- private static Optional<? extends Class<?>> declaringClass(RequestHandler input) {`
	`95`	`+ private static Optional<Class<?>> declaringClass(RequestHandler input) {`
`96`	`96`	`return ofNullable(input.declaringClass());`
`97`	`97`	`}`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public RequestParameterBuilder parameterSpecificationProvider(ParameterSpecifica`
`133`	`133`	`return this;`
`134`	`134`	`}`
`135`	`135`
`136`		`- public RequestParameterBuilder accepts(Collection<? extends MediaType> accepts) {`
	`136`	`+ public RequestParameterBuilder accepts(Collection<MediaType> accepts) {`
`137`	`137`	`this.accepts.addAll(accepts);`
`138`	`138`	`return this;`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public ResourceListingBuilder apis(List<ApiListingReference> apis) {`
`66`	`66`	`* @param authorizations - security definitions`
`67`	`67`	`* @return this`
`68`	`68`	`*/`
`69`		`- public ResourceListingBuilder securitySchemes(List<? extends SecurityScheme> authorizations) {`
	`69`	`+ public ResourceListingBuilder securitySchemes(List<SecurityScheme> authorizations) {`
`70`	`70`	`this.securitySchemes.addAll(nullToEmptyList(authorizations));`
`71`	`71`	`return this;`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public boolean isHidden() {`
`130`	`130`	`return isHidden;`
`131`	`131`	`}`
`132`	`132`
`133`		`- public ModelProperty updateModelRef(Function<ResolvedType, ? extends ModelReference> modelRefFactory) {`
	`133`	`+ public ModelProperty updateModelRef(Function<ResolvedType, ModelReference> modelRefFactory) {`
`134`	`134`	`modelRef = modelRefFactory.apply(type);`
`135`	`135`	`return this;`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,12 +87,12 @@ public Set<RequestMethod> supportedMethods() {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`@Override`
`90`		`- public Set<? extends MediaType> produces() {`
	`90`	`+ public Set<MediaType> produces() {`
`91`	`91`	`return null;`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Override`
`95`		`- public Set<? extends MediaType> consumes() {`
	`95`	`+ public Set<MediaType> consumes() {`
`96`	`96`	`return null;`
`97`	`97`	`}`
`98`	`98`
`@@ -132,7 +132,7 @@ public <T extends Annotation> Optional<T> findControllerAnnotation(Class<T> anno`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`@Override`
`135`		`- public springfox.documentation.spring.wrapper.RequestMappingInfo getRequestMapping() {`
	`135`	`+ public springfox.documentation.spring.wrapper.RequestMappingInfo<?> getRequestMapping() {`
`136`	`136`	`return null;`
`137`	`137`	`}`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,12 +93,12 @@ public Set<RequestMethod> supportedMethods() {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`@Override`
`96`		`- public Set<? extends MediaType> produces() {`
	`96`	`+ public Set<MediaType> produces() {`
`97`	`97`	`return actionSpecification.getProduces();`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`
`101`		`- public Set<? extends MediaType> consumes() {`
	`101`	`+ public Set<MediaType> consumes() {`
`102`	`102`	`return actionSpecification.getConsumes();`
`103`	`103`	`}`
`104`	`104`
`@@ -154,7 +154,7 @@ public HandlerMethod getHandlerMethod() {`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`@Override`
`157`		`- public RequestMappingInfo getRequestMapping() {`
	`157`	`+ public RequestMappingInfo<?> getRequestMapping() {`
`158`	`158`	`throw new UnsupportedOperationException();`
`159`	`159`	`}`
`160`	`160`