Fixed coverage report error

springfox · Jun 23, 2020 · 7345f39 · 7345f39
1 parent db92d08
commit 7345f39
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 24 deletions.
diff --git a/codecov.yml b/codecov.yml
@@ -44,4 +44,6 @@ ignore:
   - "springfox-spring-config" # ignore project used for documentation
   - "swagger-contract-tests" # ignore contract tests as its purely for testing
   - "swagger-contract-tests-webflux" # ignore contract tests as its purely for testing
+  - "oas-contract-tests" # ignore contract tests as its purely for testing
+  - "springfox-boot-starter" # ignore contract tests as its purely for testing
 
diff --git a/springfox-oas/src/main/java/springfox/documentation/oas/mappers/SchemaMapper.java b/springfox-oas/src/main/java/springfox/documentation/oas/mappers/SchemaMapper.java
@@ -37,7 +37,7 @@
 import static java.util.stream.Collectors.*;
 import static springfox.documentation.builders.BuilderDefaults.*;
 
-@SuppressWarnings("rawtypes")
+@SuppressWarnings({"rawtypes",})
 @Mapper(componentModel = "spring")
 public abstract class SchemaMapper {
   @Named("ModelsMapping")

diff --git a/...1/src/main/java/springfox/documentation/swagger1/mappers/ServiceModelToSwaggerMapper.java b/...1/src/main/java/springfox/documentation/swagger1/mappers/ServiceModelToSwaggerMapper.java
@@ -42,6 +42,7 @@
     DataTypeMapper.class,
     AuthorizationTypesMapper.class
 })
+@SuppressWarnings("deprecation")
 public interface ServiceModelToSwaggerMapper {
   //Api related
   ApiDescription toSwaggerApiDescription(springfox.documentation.service.ApiDescription from);

diff --git a/...est/contract/swagger/SecuritySupport.java → ...ract/swagger/webflux/SecuritySupport.java b/...est/contract/swagger/SecuritySupport.java → ...ract/swagger/webflux/SecuritySupport.java
@@ -1,4 +1,4 @@
-package springfox.test.contract.swagger;
+package springfox.test.contract.swagger.webflux;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/...ntract/swagger/Swagger2WebFluxConfig.java → ...wagger/webflux/Swagger2WebFluxConfig.java b/...ntract/swagger/Swagger2WebFluxConfig.java → ...wagger/webflux/Swagger2WebFluxConfig.java
@@ -1,4 +1,4 @@
-package springfox.test.contract.swagger;
+package springfox.test.contract.swagger.webflux;
 
 import com.fasterxml.classmate.TypeResolver;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...ct/swagger/SwaggerWebfluxApplication.java → ...er/webflux/SwaggerWebfluxApplication.java b/...ct/swagger/SwaggerWebfluxApplication.java → ...er/webflux/SwaggerWebfluxApplication.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.test.contract.swagger;
+package springfox.test.contract.swagger.webflux;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/.../listeners/ObjectMapperEventListener.java → .../listeners/ObjectMapperEventListener.java b/.../listeners/ObjectMapperEventListener.java → .../listeners/ObjectMapperEventListener.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.test.contract.swagger.listeners;
+package springfox.test.contract.swagger.webflux.listeners;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...t/contract/swaggertests/FileAccess.groovy → ...ct/swaggertests/webflux/FileAccess.groovy b/...t/contract/swaggertests/FileAccess.groovy → ...ct/swaggertests/webflux/FileAccess.groovy
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.test.contract.swaggertests
+package springfox.test.contract.swaggertests.webflux
 
 import groovy.json.StringEscapeUtils
 import org.codehaus.groovy.runtime.ResourceGroovyMethods

diff --git a/.../swaggertests/FunctionContractSpec.groovy → ...tests/webflux/FunctionContractSpec.groovy b/.../swaggertests/FunctionContractSpec.groovy → ...tests/webflux/FunctionContractSpec.groovy
@@ -17,31 +17,21 @@
  *
  */
 
-package springfox.test.contract.swaggertests
+package springfox.test.contract.swaggertests.webflux
+
 
-import com.fasterxml.classmate.TypeResolver
 import groovy.json.JsonSlurper
 import org.skyscreamer.jsonassert.JSONAssert
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.ComponentScan
-import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Import
 import org.springframework.http.HttpStatus
 import org.springframework.http.MediaType
 import org.springframework.http.RequestEntity
-import org.springframework.test.web.reactive.server.WebTestClient
-import org.springframework.web.reactive.function.client.WebClient
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Unroll
-import springfox.documentation.schema.AlternateTypeRuleConvention
-import springfox.documentation.spring.web.plugins.JacksonSerializerConvention
-import springfox.test.contract.swagger.SecuritySupport
-import springfox.test.contract.swagger.SwaggerWebfluxApplication
+import springfox.test.contract.swagger.webflux.SwaggerWebfluxApplication
 
 import static org.skyscreamer.jsonassert.JSONCompareMode.*
 import static org.springframework.boot.test.context.SpringBootTest.*

diff --git a/...aggertests/ObjectMapperSanityCheck.groovy → ...ts/webflux/ObjectMapperSanityCheck.groovy b/...aggertests/ObjectMapperSanityCheck.groovy → ...ts/webflux/ObjectMapperSanityCheck.groovy
@@ -20,7 +20,7 @@
  *
  */
 
-package springfox.test.contract.swaggertests
+package springfox.test.contract.swaggertests.webflux
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.databind.ObjectMapper
@@ -40,8 +40,8 @@ import spock.lang.Specification
 import springfox.documentation.spi.DocumentationType
 import springfox.documentation.spring.web.plugins.Docket
 import springfox.documentation.swagger2.annotations.EnableSwagger2WebFlux
-import springfox.test.contract.swagger.SwaggerWebfluxApplication
-import springfox.test.contract.swagger.listeners.ObjectMapperEventListener
+import springfox.test.contract.swagger.webflux.SwaggerWebfluxApplication
+import springfox.test.contract.swagger.webflux.listeners.ObjectMapperEventListener
 
 import static org.springframework.boot.test.context.SpringBootTest.*
 

diff --git a/.../listeners/ObjectMapperEventListener.java → .../listeners/ObjectMapperEventListener.java b/.../listeners/ObjectMapperEventListener.java → .../listeners/ObjectMapperEventListener.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.test.contract.swagger.listeners;
+package springfox.test.contract.swagger.webflux.listeners;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...tests/src/test/groovy/springfox/test/contract/swaggertests/ObjectMapperSanityCheck.groovy b/...tests/src/test/groovy/springfox/test/contract/swaggertests/ObjectMapperSanityCheck.groovy
@@ -41,7 +41,7 @@ import springfox.documentation.spi.DocumentationType
 import springfox.documentation.spring.web.plugins.Docket
 import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc
 import springfox.test.contract.swagger.SwaggerApplication
-import springfox.test.contract.swagger.listeners.ObjectMapperEventListener
+import springfox.test.contract.swagger.webflux.listeners.ObjectMapperEventListener
 
 import static org.springframework.boot.test.context.SpringBootTest.*