diff --git a/.gitignore b/.gitignore index 7161fe28e4..8150f84daf 100644 --- a/.gitignore +++ b/.gitignore @@ -159,3 +159,4 @@ client-java/sql-dto/target client-java/distance-heuristics/target client-java/test-old-libraries/target core-tests/e2e-tests/spring/spring-rest-mysql/target +/core-tests/jdk-8/spring-rest-openapi-v2/target/ diff --git a/client-java/pom.xml b/client-java/pom.xml index b7639bfe12..c5abba9dda 100644 --- a/client-java/pom.xml +++ b/client-java/pom.xml @@ -119,4 +119,4 @@ - \ No newline at end of file + diff --git a/core-parent/pom.xml b/core-parent/pom.xml index 5adb950799..a8aff2914d 100644 --- a/core-parent/pom.xml +++ b/core-parent/pom.xml @@ -69,4 +69,4 @@ - \ No newline at end of file + diff --git a/core-tests/e2e-tests/spring/pom.xml b/core-tests/e2e-tests/spring/pom.xml index 52e4d07ef3..8888cf5eb8 100644 --- a/core-tests/e2e-tests/spring/pom.xml +++ b/core-tests/e2e-tests/spring/pom.xml @@ -15,7 +15,6 @@ emb-json spring-rest-postgres - spring-rest-openapi-v2 spring-rest-openapi-v3 spring-graphql spring-rest-mysql diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/pom.xml b/core-tests/e2e-tests/spring/spring-rest-openapi-v2/pom.xml deleted file mode 100644 index 874608c7f9..0000000000 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/pom.xml +++ /dev/null @@ -1,203 +0,0 @@ - - 4.0.0 - - - org.evomaster - evomaster-e2e-tests-spring - 4.0.1-SNAPSHOT - - - evomaster-e2e-tests-spring-rest-openapi-v2 - jar - - - - - - - javax.validation - validation-api - 2.0.1.Final - - - - - javax.ws.rs - javax.ws.rs-api - - - org.evomaster - evomaster-e2e-tests-utils - test-jar - - - org.evomaster - evomaster-client-java-controller - - - org.evomaster - evomaster-core - test - - - org.evomaster - evomaster-client-java-instrumentation - test-jar - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-security - - - com.h2database - h2 - - - org.springframework.boot - spring-boot-starter-test - - - - - com.google.code.gson - gson - - - - io.springfox - springfox-swagger2 - - - io.swagger - * - - - - - io.springfox - springfox-spring-web - - - io.swagger - swagger-parser - - - - - org.jetbrains.kotlin - kotlin-stdlib - - - - io.rest-assured - rest-assured - - - org.hamcrest - hamcrest-all - - - org.junit.jupiter - junit-jupiter-engine - - - org.junit.platform - junit-platform-launcher - - - org.junit.jupiter - junit-jupiter-params - - - - - javax.xml.bind - jaxb-api - - - org.glassfish.jaxb - jaxb-runtime - - - - - edu.stanford.nlp - stanford-corenlp - ${nlp.version} - test - - - edu.stanford.nlp - stanford-corenlp - ${nlp.version} - models - test - - - - - com.github.tomakehurst - wiremock-jre8-standalone - test - - - com.alibaba - dns-cache-manipulator - - - org.apache.httpcomponents - httpclient - - - com.squareup.okhttp3 - okhttp - - - - - org.locationtech.jts - jts-core - ${org.locationtech.jts.version} - - - - - - - - kotlin-maven-plugin - org.jetbrains.kotlin - - - org.apache.maven.plugins - maven-compiler-plugin - - - - - - - skipE2E_V2 - - true - - - - - \ No newline at end of file diff --git a/core-tests/jdk-8/pom.xml b/core-tests/jdk-8/pom.xml new file mode 100644 index 0000000000..87a6e6ca4a --- /dev/null +++ b/core-tests/jdk-8/pom.xml @@ -0,0 +1,49 @@ + + 4.0.0 + + + org.evomaster + evomaster-core-tests + 4.0.1-SNAPSHOT + + + evomaster-core-tests-jdk-8 + pom + + + + spring-rest-openapi-v2 + + + + + + org.evomaster + evomaster-e2e-tests-utils + ${project.version} + test + test-jar + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + + + + + + + diff --git a/core-tests/jdk-8/spring-rest-openapi-v2/pom.xml b/core-tests/jdk-8/spring-rest-openapi-v2/pom.xml new file mode 100644 index 0000000000..b008a38b47 --- /dev/null +++ b/core-tests/jdk-8/spring-rest-openapi-v2/pom.xml @@ -0,0 +1,231 @@ + + 4.0.0 + + + org.evomaster + evomaster-core-tests-jdk-8 + 4.0.1-SNAPSHOT + + + evomaster-e2e-tests-spring-rest-openapi-v2 + jar + + + + 2.5.4 + 3.0.0 + 5.7.2 + 1.7.2 + + + + + + + org.evomaster + evomaster-e2e-tests-utils + ${project.version} + test-jar + + + org.evomaster + evomaster-client-java-dependencies + ${project.version} + pom + test + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + 2.14.3 + + + + + + + + + + + + + org.evomaster + evomaster-client-java-instrumentation + test-jar + + + + + + javax.validation + validation-api + 2.0.1.Final + + + + + + + + + + + org.springframework.boot + spring-boot-starter-web + ${springboot.version} + + + org.springframework.boot + spring-boot-starter-validation + ${springboot.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + ${springboot.version} + + + org.springframework.boot + spring-boot-starter-security + ${springboot.version} + + + org.springframework.boot + spring-boot-starter-test + ${springboot.version} + + + + + com.h2database + h2 + + + + + com.google.code.gson + gson + 2.8.8 + + + commons-io + commons-io + 2.11.0 + + + + io.springfox + springfox-swagger2 + ${springfox.version} + + + + io.swagger + * + + + + + io.springfox + springfox-spring-web + ${springfox.version} + + + io.swagger + swagger-parser + 1.0.61 + + + + + + + + + + + + + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} + test + + + + + + + org.junit.jupiter + junit-jupiter-params + ${junit.jupiter.version} + test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/SwaggerConfiguration.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/SwaggerConfiguration.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/SwaggerConfiguration.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/SwaggerConfiguration.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/AWHResApp.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/AWHResApp.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/AWHResApp.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/AWHResApp.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/dto/Bar.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/dto/Bar.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/dto/Bar.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/dto/Bar.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/dto/Foo.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/dto/Foo.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/dto/Foo.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/dto/Foo.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/dto/Info.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/dto/Info.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/dto/Info.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/dto/Info.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/BarEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/BarEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/BarEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/BarEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/BarRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/BarRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/BarRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/BarRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/FooEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/FooEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/FooEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/FooEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/FooRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/FooRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/FooRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/entity/FooRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/service/BarRestAPI.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/service/BarRestAPI.java similarity index 90% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/service/BarRestAPI.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/service/BarRestAPI.java index e2645d4ca7..b3ee58cb0f 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/service/BarRestAPI.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/service/BarRestAPI.java @@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.util.*; /** automatically created on 2020-10-22 */ @RestController @@ -16,7 +16,7 @@ public class BarRestAPI { @RequestMapping( value = "/bars/{a}", method = RequestMethod.POST, - consumes = MediaType.APPLICATION_JSON) + consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity createBar(@PathVariable(name = "a") Integer a, @RequestParam(name = "b", required = true) String b, @RequestParam(name = "c") Integer c) { // an entity with id bar.id should not exist if (barRepository.findById(a).isPresent()) return ResponseEntity.status(400).build(); @@ -33,14 +33,14 @@ public ResponseEntity createBar(@PathVariable(name = "a") Integer a, @RequestPar @RequestMapping( value = "/bars/{a}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON) + produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getBarById(@PathVariable(name = "a") Integer a) { if (!barRepository.findById(a).isPresent()) return ResponseEntity.status(404).build(); Bar dto = barRepository.findById(a).get().getDto(); return ResponseEntity.ok(dto); } - @RequestMapping(value = "/bars", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON) + @RequestMapping(value = "/bars", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getAllBar() { List allDtos = new ArrayList<>(); for (BarEntity e : barRepository.findAll()) { @@ -54,7 +54,7 @@ public ResponseEntity> getAllBar() { @RequestMapping( value = "/bars/{a}", method = RequestMethod.DELETE, - produces = MediaType.APPLICATION_JSON) + produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity deleteBar(@PathVariable(name = "a") Integer a) { // an entity with id a should exist if (!barRepository.findById(a).isPresent()) return ResponseEntity.status(404).build(); diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/service/FooRestAPI.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/service/FooRestAPI.java similarity index 91% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/service/FooRestAPI.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/service/FooRestAPI.java index e3b316ca71..3d3fbbbcdc 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/service/FooRestAPI.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/adaptivehypermutation/service/FooRestAPI.java @@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.time.LocalDate; import java.util.*; /** automatically created on 2020-10-22 */ @@ -19,7 +19,7 @@ public class FooRestAPI { @RequestMapping( value = "/foos/{x}", method = RequestMethod.POST, - consumes = MediaType.APPLICATION_JSON) + consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity createFoo( @PathVariable(name = "x") Integer x, @RequestParam String y, @Valid @RequestBody Info z) { if (fooRepository.count() < 3) @@ -53,7 +53,7 @@ else if (z.c == 300) @RequestMapping( value = "/foos/{x}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON) + produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getFooById(@PathVariable(name = "x") Integer x) { if (!fooRepository.findById(x).isPresent()) return ResponseEntity.status(404).build(); Foo dto = fooRepository.findById(x).get().getDto(); @@ -63,7 +63,7 @@ public ResponseEntity getFooById(@PathVariable(name = "x") Integer x) { @RequestMapping( value = "/foos", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON) + produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getAllFoo() { List allDtos = new ArrayList<>(); for (FooEntity e : fooRepository.findAll()) { @@ -75,7 +75,7 @@ public ResponseEntity> getAllFoo() { @RequestMapping( value = "/foos/{x}", method = RequestMethod.DELETE, - produces = MediaType.APPLICATION_JSON) + produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity deleteFoo(@PathVariable(name = "x") Integer x) { // an entity with id x should exist if (!fooRepository.findById(x).isPresent()) return ResponseEntity.status(404).build(); diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerAccessApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerAccessApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerAccessApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerAccessApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerAccessRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerAccessRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerAccessRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerAccessRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerApplicationWebSecurityConfig.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerApplicationWebSecurityConfig.java similarity index 97% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerApplicationWebSecurityConfig.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerApplicationWebSecurityConfig.java index 5347258408..fc90e808f8 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerApplicationWebSecurityConfig.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerApplicationWebSecurityConfig.java @@ -1,6 +1,5 @@ package com.foo.rest.examples.spring.authenticatedswaggeraccess; -import org.evomaster.client.java.controller.AuthUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerAccessNoAuthApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerAccessNoAuthApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerAccessNoAuthApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerAccessNoAuthApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerAccessNoAuthRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerAccessNoAuthRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerAccessNoAuthRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerAccessNoAuthRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerApplicationNoAuthWebSecurityConfig.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerApplicationNoAuthWebSecurityConfig.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerApplicationNoAuthWebSecurityConfig.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerApplicationNoAuthWebSecurityConfig.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerAccessWithoutAuthenticationApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerAccessWithoutAuthenticationApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerAccessWithoutAuthenticationApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerAccessWithoutAuthenticationApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerAccessWithoutAuthenticationRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerAccessWithoutAuthenticationRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerAccessWithoutAuthenticationRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerAccessWithoutAuthenticationRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerApplicationWithoutAuthenticationWebSecurityConfig.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerApplicationWithoutAuthenticationWebSecurityConfig.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerApplicationWithoutAuthenticationWebSecurityConfig.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerApplicationWithoutAuthenticationWebSecurityConfig.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/base64/Base64DecodeApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/base64/Base64DecodeApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/base64/Base64DecodeApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/base64/Base64DecodeApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodyissue/BodyIssueApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodyissue/BodyIssueApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodyissue/BodyIssueApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodyissue/BodyIssueApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodyissue/BodyIssueRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodyissue/BodyIssueRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodyissue/BodyIssueRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodyissue/BodyIssueRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodytypes/BodyTypesApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodytypes/BodyTypesApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodytypes/BodyTypesApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodytypes/BodyTypesApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodytypes/BodyTypesDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodytypes/BodyTypesDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodytypes/BodyTypesDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodytypes/BodyTypesDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodytypes/BodyTypesRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodytypes/BodyTypesRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodytypes/BodyTypesRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/bodytypes/BodyTypesRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesPostDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesPostDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesPostDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesPostDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesResponseDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesResponseDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesResponseDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesResponseDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesRest.java similarity index 83% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesRest.java index b4b3ec3f57..028f6b3e5c 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/branches/BranchesRest.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; @RestController @RequestMapping(path = "/api/branches") @@ -20,8 +20,8 @@ public class BranchesRest { @RequestMapping( value = "/pos", method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON, - consumes = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE, + consumes = MediaType.APPLICATION_JSON_VALUE ) public BranchesResponseDto pos(@ApiParam("x and y inputs") @RequestBody BranchesPostDto dto){ @@ -38,8 +38,8 @@ public BranchesResponseDto pos(@ApiParam("x and y inputs") @RequestMapping( value = "/neg", method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON, - consumes = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE, + consumes = MediaType.APPLICATION_JSON_VALUE ) public BranchesResponseDto neg(@ApiParam("x and y inputs") @RequestBody BranchesPostDto dto){ @@ -55,8 +55,8 @@ public BranchesResponseDto neg(@ApiParam("x and y inputs") @RequestMapping( value = "/eq", method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON, - consumes = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE, + consumes = MediaType.APPLICATION_JSON_VALUE ) public BranchesResponseDto eq(@ApiParam("x and y inputs") @RequestBody BranchesPostDto dto){ diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLRest.java similarity index 96% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLRest.java index 3cc5392a96..7f532e32ac 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLRest.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.net.URI; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -24,7 +24,7 @@ public class CHLRest { @RequestMapping( path = "/x/{idx}/y/{idy}/z/{idz}/value", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity getZValue( @PathVariable("idx") int idx, diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainednolocation/CNLApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainednolocation/CNLApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainednolocation/CNLApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainednolocation/CNLApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainednolocation/CNLRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainednolocation/CNLRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainednolocation/CNLRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainednolocation/CNLRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainednolocation/CNL_X.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainednolocation/CNL_X.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainednolocation/CNL_X.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainednolocation/CNL_X.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedpostget/CPGApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedpostget/CPGApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedpostget/CPGApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedpostget/CPGApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedpostget/CPGRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedpostget/CPGRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedpostget/CPGRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedpostget/CPGRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedpostget/Y.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedpostget/Y.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedpostget/Y.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/chainedpostget/Y.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantResponseDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantResponseDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantResponseDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantResponseDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantRest.java similarity index 90% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantRest.java index 019684dc4a..d0ace99a7c 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/constant/ConstantRest.java @@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; @RestController @RequestMapping(path = "/api/constant") @@ -17,7 +17,7 @@ public class ConstantRest { @RequestMapping( value = "/{value}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ConstantResponseDto checkConstant( @ApiParam("Value to check") diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthApp.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthApp.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthApp.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthApp.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthProjectService.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthProjectService.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthProjectService.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthProjectService.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthUserService.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthUserService.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthUserService.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthUserService.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthWebSecurityConfig.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthWebSecurityConfig.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthWebSecurityConfig.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/AuthWebSecurityConfig.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/db/AuthProjectEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/db/AuthProjectEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/db/AuthProjectEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/db/AuthProjectEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/db/AuthUserEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/db/AuthUserEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/db/AuthUserEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/db/AuthUserEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/db/AuthUserRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/db/AuthUserRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/db/AuthUserRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/auth/db/AuthUserRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseRest.java similarity index 89% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseRest.java index 8d6d2c3cf4..ad2537aac8 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/base/DbBaseRest.java @@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.constraints.NotNull; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.net.URI; import java.util.List; import java.util.stream.Collectors; @@ -22,7 +22,7 @@ public class DbBaseRest { @RequestMapping( path = "/entities", method = RequestMethod.POST, - consumes = MediaType.APPLICATION_JSON + consumes = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity create(@NotNull @RequestBody DbBaseDto dto) { @@ -38,7 +38,7 @@ public ResponseEntity create(@NotNull @RequestBody DbBaseDto dto) { @RequestMapping( path = "/entities", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public List getAll() { @@ -50,7 +50,7 @@ public List getAll() { @RequestMapping( path = "/entities/{id}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity get(@PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public ResponseEntity get(@PathVariable("id") Long id) { @RequestMapping( path = "/entitiesByName/{name}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity> getByName(@PathVariable String name) { diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/CrossFkApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/CrossFkApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/CrossFkApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/CrossFkApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/BarRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/BarRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/BarRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/BarRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/BarTableEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/BarTableEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/BarTableEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/BarTableEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/FooRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/FooRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/FooRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/FooRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/FooTableEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/FooTableEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/FooTableEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/FooTableEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/RootRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/RootRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/RootRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/RootRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/RootTableEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/RootTableEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/RootTableEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/entities/RootTableEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/services/BarService.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/services/BarService.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/services/BarService.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/services/BarService.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/services/FooService.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/services/FooService.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/services/FooService.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/services/FooService.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/services/RootService.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/services/RootService.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/services/RootService.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/crossfks/services/RootService.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntRest.java similarity index 92% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntRest.java index 1ef7c5e895..29e6700a43 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/directint/DbDirectIntRest.java @@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.util.List; @RestController @@ -32,7 +32,7 @@ public void post() { @RequestMapping( path = "/{x}/{y}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity get(@PathVariable("x") int x, @PathVariable("y") int y) { diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityData.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityData.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityData.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityData.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityEnum.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityEnum.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityEnum.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityEnum.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityRest.java similarity index 94% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityRest.java index 0952e37ac3..4e3061f81b 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/entity/EntityRest.java @@ -7,8 +7,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.ws.rs.core.MediaType; -import java.util.List; @RestController @RequestMapping(path = "/api/db/entity") diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataApp.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataApp.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataApp.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataApp.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataEntityX.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataEntityX.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataEntityX.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataEntityX.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataEntityY.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataEntityY.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataEntityY.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataEntityY.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataRepositoryX.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataRepositoryX.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataRepositoryX.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataRepositoryX.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceRest.java similarity index 89% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceRest.java index b0e201846e..3170219913 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/insertcollection/RResourceRest.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; /** * created by manzhang on 2021/11/10 @@ -21,7 +21,7 @@ public class RResourceRest { @RequestMapping( path = "", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity getAll() { if (repository.count() > 20) diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesApp.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesApp.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesApp.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesApp.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesRest.java similarity index 88% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesRest.java index 1392de81c4..10911a1a55 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesRest.java @@ -7,9 +7,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.ws.rs.core.MediaType; -import java.util.Date; -import java.util.List; +import org.springframework.http.MediaType; + @RestController @RequestMapping(path = "/api/db/javatypes") @@ -30,7 +29,7 @@ public void post() { @RequestMapping( method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity get() { diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPAApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPAApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPAApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPAApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPAData.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPAData.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPAData.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPAData.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPARepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPARepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPARepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPARepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPARest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPARest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPARest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/jpa/EntityJPARest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/db/tree/DbTreeRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointexclude/EndpointExcludeApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointexclude/EndpointExcludeApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointexclude/EndpointExcludeApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointexclude/EndpointExcludeApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointexclude/EndpointExcludeRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointexclude/EndpointExcludeRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointexclude/EndpointExcludeRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointexclude/EndpointExcludeRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfilter/EndpointFilterApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfilter/EndpointFilterApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfilter/EndpointFilterApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfilter/EndpointFilterApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfilter/EndpointFilterRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfilter/EndpointFilterRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfilter/EndpointFilterRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfilter/EndpointFilterRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixRest.java similarity index 87% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixRest.java index 5c204092b8..c2ad12f033 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixRest.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.util.HtmlUtils; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.util.Arrays; import java.util.List; @@ -27,7 +27,7 @@ public class EndpointFocusAndPrefixRest { @RequestMapping( value = "/api/pet/{petId}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String getPetById( @ApiParam("Value to retrieve") @PathVariable("petId") @@ -39,7 +39,7 @@ public String getPetById( @ApiParam("Value to retrieve") @RequestMapping( value = "/api/pet/{petId}", method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String updatePetById( @ApiParam("Value to store") @PathVariable("petId") @@ -51,7 +51,7 @@ public String updatePetById( @ApiParam("Value to store") @RequestMapping( value = "/api/pet/{petId}", method = RequestMethod.DELETE, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String deletePetById( @ApiParam("Value to delete") @PathVariable("petId") @@ -63,7 +63,7 @@ public String deletePetById( @ApiParam("Value to delete") @RequestMapping( value = "/api/pet/{petId}/uploadImage", method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String uploadImageForPet( @ApiParam("Pet ID to upload") @PathVariable("petId") @@ -75,7 +75,7 @@ public String uploadImageForPet( @ApiParam("Pet ID to upload") @RequestMapping( value = "/api/pet", method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String addNewPet() { return "A new pet has been added"; @@ -85,7 +85,7 @@ public String addNewPet() { @RequestMapping( value = "/api/pet", method = RequestMethod.PUT, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String updatePet() { return "An existing pet has been updated"; @@ -95,7 +95,7 @@ public String updatePet() { @RequestMapping( value = "/api/pet/findByStatus", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public List findByStatus() { return Arrays.asList("pet1", "pet2", "pet3", "pet4"); @@ -105,7 +105,7 @@ public List findByStatus() { @RequestMapping( value = "/api/store/inventory", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public List getStoreInventory() { return Arrays.asList("item", "item2", "item3"); @@ -116,7 +116,7 @@ public List getStoreInventory() { @RequestMapping( value = "/api/store/order/{orderID}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String findStoreOrderById( @ApiParam("order ID to check") @PathVariable("orderID") @@ -128,7 +128,7 @@ public String findStoreOrderById( @ApiParam("order ID to check") @RequestMapping( value = "/api/store/order/{orderID}", method = RequestMethod.DELETE, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String deleteStoreOrderById( @ApiParam("order ID to check") @PathVariable("orderID") @@ -140,7 +140,7 @@ public String deleteStoreOrderById( @ApiParam("order ID to check") @RequestMapping( value = "/api/store/order", method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String placeOrder() { return "Order Placed"; @@ -150,7 +150,7 @@ public String placeOrder() { @RequestMapping( value = "/api/user/{username}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String getUserByName( @ApiParam("username to retrieve") @PathVariable("username") @@ -162,7 +162,7 @@ public String getUserByName( @ApiParam("username to retrieve") @RequestMapping( value = "/api/user/{username}", method = RequestMethod.PUT, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String updateUserInformation( @ApiParam("username to update") @@ -175,7 +175,7 @@ public String updateUserInformation( @RequestMapping( value = "/api/user/{username}", method = RequestMethod.DELETE, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String deleteUserInformation( @ApiParam("username to delete") @@ -188,7 +188,7 @@ public String deleteUserInformation( @RequestMapping( value = "/api/user", method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String createUser() { return "Created a new user"; @@ -198,7 +198,7 @@ public String createUser() { @RequestMapping( value = "/api/user/createWithList", method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String createUserWithList( @RequestBody List @@ -225,7 +225,7 @@ public String createUserWithList( @RequestMapping( value = "/api/user/login", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String userLogin() { @@ -236,10 +236,10 @@ public String userLogin() { @RequestMapping( value = "/api/user/logout", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String userLogout() { return "Logged out a user"; } -} \ No newline at end of file +} diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixRestDTO.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixRestDTO.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixRestDTO.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixRestDTO.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpoints/EndpointsApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpoints/EndpointsApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpoints/EndpointsApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpoints/EndpointsApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpoints/EndpointsRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpoints/EndpointsRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpoints/EndpointsRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpoints/EndpointsRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsRest.java similarity index 88% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsRest.java index 5a45a6655c..1f4ba7dd4e 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/EnumsRest.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; @RestController @RequestMapping(path = "/api/enums") @@ -15,7 +15,7 @@ public class EnumsRest { @RequestMapping( value = "/{target}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public EnumsDto get(@PathVariable("target") TargetEnums target) { diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/TargetEnums.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/TargetEnums.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/TargetEnums.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/enums/TargetEnums.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeResponseDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeResponseDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeResponseDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeResponseDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeRest.java similarity index 89% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeRest.java index 11b6ec8841..5b6e3cf27c 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/escapes/EscapeRest.java @@ -2,7 +2,7 @@ import org.springframework.web.bind.annotation.*; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.util.ArrayList; import java.util.HashMap; @@ -13,7 +13,7 @@ public class EscapeRest { @RequestMapping( value = "/containsDollar/{s}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public EscapeResponseDto containsDollar( @PathVariable("s") Boolean s @@ -33,7 +33,7 @@ public EscapeResponseDto containsDollar( @RequestMapping( value = "/containsQuote/{s}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public EscapeResponseDto containsQuote( @PathVariable("s") Boolean s @@ -72,7 +72,7 @@ public int jsonBody( @RequestBody EscapeResponseDto dto){ @RequestMapping( value = "/trickyJson/{s}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public HashMap trickyJson( @PathVariable("s") String s @@ -88,7 +88,7 @@ public HashMap trickyJson( @RequestMapping( value = "/containsSlash/{s}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public EscapeResponseDto containsSlash( @PathVariable("s") Boolean s @@ -107,7 +107,7 @@ public EscapeResponseDto containsSlash( @RequestMapping( value = "/escapesJson/{s}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ArrayList escapesJson( @PathVariable("s") Boolean s diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/expectations/ExpectationsSpringRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/expectations/ExpectationsSpringRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/expectations/ExpectationsSpringRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/expectations/ExpectationsSpringRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuenofault/FileCreationIssueNoFaultApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuenofault/FileCreationIssueNoFaultApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuenofault/FileCreationIssueNoFaultApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuenofault/FileCreationIssueNoFaultApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuenofault/FileCreationIssueNoFaultRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuenofault/FileCreationIssueNoFaultRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuenofault/FileCreationIssueNoFaultRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuenofault/FileCreationIssueNoFaultRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuewithfault/FileCreationIssueWithFaultApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuewithfault/FileCreationIssueWithFaultApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuewithfault/FileCreationIssueWithFaultApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuewithfault/FileCreationIssueWithFaultApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuewithfault/FileCreationIssueWithFaultRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuewithfault/FileCreationIssueWithFaultRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuewithfault/FileCreationIssueWithFaultRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/filecreationissuewithfault/FileCreationIssueWithFaultRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formlogin/FormLoginApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formlogin/FormLoginApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formlogin/FormLoginApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formlogin/FormLoginApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formlogin/FormLoginRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formlogin/FormLoginRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formlogin/FormLoginRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formlogin/FormLoginRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formlogin/FormLoginWebSecurityConfig.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formlogin/FormLoginWebSecurityConfig.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formlogin/FormLoginWebSecurityConfig.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formlogin/FormLoginWebSecurityConfig.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formparam/FormParamApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formparam/FormParamApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formparam/FormParamApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formparam/FormParamApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formparam/FormParamRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formparam/FormParamRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formparam/FormParamRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/formparam/FormParamRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationRest.java similarity index 90% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationRest.java index 9ff56b972b..61d9deba7d 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationRest.java @@ -4,7 +4,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.net.URI; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -18,7 +18,7 @@ public class HeaderLocationRest { @RequestMapping( method = RequestMethod.POST, - consumes = MediaType.APPLICATION_JSON + consumes = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity create(@RequestBody HeaderLocationDto dto) { @@ -31,7 +31,7 @@ public ResponseEntity create(@RequestBody HeaderLocationDto dto) { @RequestMapping( value = "/{id}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity get(@PathVariable("id") String id) { @@ -63,7 +63,7 @@ public ResponseEntity delete(@PathVariable("id") String id) { @RequestMapping( value = "/{id}", method = RequestMethod.PUT, - consumes = MediaType.APPLICATION_JSON + consumes = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity replace(@PathVariable("id") String id, @RequestBody HeaderLocationDto dto) { @@ -81,7 +81,7 @@ public ResponseEntity replace(@PathVariable("id") String id, @RequestMapping( value = "/{id}", method = RequestMethod.PATCH, - consumes = MediaType.APPLICATION_JSON + consumes = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity update(@PathVariable("id") String id, @RequestBody HeaderLocationDto dto) { diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/hypermutation/HighWeightApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/hypermutation/HighWeightApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/hypermutation/HighWeightApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/hypermutation/HighWeightApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/hypermutation/HighWeightDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/hypermutation/HighWeightDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/hypermutation/HighWeightDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/hypermutation/HighWeightDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/hypermutation/HighWeightRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/hypermutation/HighWeightRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/hypermutation/HighWeightRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/hypermutation/HighWeightRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/impactXYZ/ImpactXYZApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/impactXYZ/ImpactXYZApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/impactXYZ/ImpactXYZApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/impactXYZ/ImpactXYZApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/impactXYZ/ImpactXYZRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/impactXYZ/ImpactXYZRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/impactXYZ/ImpactXYZRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/impactXYZ/ImpactXYZRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/impactXYZ/XYZDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/impactXYZ/XYZDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/impactXYZ/XYZDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/impactXYZ/XYZDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/json/JsonApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/json/JsonApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/json/JsonApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/json/JsonApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/json/JsonRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/json/JsonRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/json/JsonRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/json/JsonRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceRest.java similarity index 90% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceRest.java index 9528a76e54..ace5187b33 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/namedresource/NamedResourceRest.java @@ -3,7 +3,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -21,7 +21,7 @@ public class NamedResourceRest { @RequestMapping( value = "/{id}", method = RequestMethod.POST, - consumes = MediaType.APPLICATION_JSON + consumes = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity create(@PathVariable("id") String id, @RequestBody NamedResourceDto dto) { @@ -35,7 +35,7 @@ public ResponseEntity create(@PathVariable("id") String id, @RequestMapping( value = "/{id}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity get(@PathVariable("id") String id) { @@ -67,7 +67,7 @@ public ResponseEntity delete(@PathVariable("id") String id) { @RequestMapping( value = "/{id}", method = RequestMethod.PUT, - consumes = MediaType.APPLICATION_JSON + consumes = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity replace(@PathVariable("id") String id, @RequestBody NamedResourceDto dto) { @@ -85,7 +85,7 @@ public ResponseEntity replace(@PathVariable("id") String id, @RequestMapping( value = "/{id}", method = RequestMethod.PATCH, - consumes = MediaType.APPLICATION_JSON + consumes = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity update(@PathVariable("id") String id, @RequestBody NamedResourceDto dto) { diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PIApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PIApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PIApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PIApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PositiveIntegerRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PositiveIntegerRest.java similarity index 84% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PositiveIntegerRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PositiveIntegerRest.java index 81cf8914e9..56bd99bc2f 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PositiveIntegerRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PositiveIntegerRest.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; @RestController @RequestMapping(path = "/api/pi") @@ -15,7 +15,7 @@ public class PositiveIntegerRest { @RequestMapping( value = "/{value}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseDto checkIfPositive( @ApiParam("The value to check") @@ -33,8 +33,8 @@ public ResponseDto checkIfPositive( @RequestMapping( value = "", method = RequestMethod.POST, - consumes = MediaType.APPLICATION_JSON, - produces = MediaType.APPLICATION_JSON + consumes = MediaType.APPLICATION_JSON_VALUE, + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseDto checkIfPositive(@RequestBody PostDto postDto){ diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PostDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PostDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PostDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/PostDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/ResponseDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/ResponseDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/ResponseDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/positiveinteger/ResponseDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/CreateDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/CreateDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/CreateDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/CreateDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/PostCollectionApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/PostCollectionApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/PostCollectionApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/PostCollectionApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/PostCollectionRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/PostCollectionRest.java similarity index 88% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/PostCollectionRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/PostCollectionRest.java index f21306af83..a60ba59d93 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/PostCollectionRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/PostCollectionRest.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -18,7 +18,7 @@ public class PostCollectionRest { @RequestMapping( method = RequestMethod.POST, - consumes = MediaType.APPLICATION_JSON + consumes = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity create(@RequestBody CreateDto dto) { @@ -32,7 +32,7 @@ public ResponseEntity create(@RequestBody CreateDto dto) { @RequestMapping( method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity get() { diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/ValuesDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/ValuesDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/ValuesDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/postcollection/ValuesDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/redirect/RedirectApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/redirect/RedirectApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/redirect/RedirectApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/redirect/RedirectApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/redirect/RedirectRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/redirect/RedirectRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/redirect/RedirectRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/redirect/RedirectRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/regex/RegexApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/regex/RegexApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/regex/RegexApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/regex/RegexApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/regexdate/RegexDateApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/regexdate/RegexDateApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/regexdate/RegexDateApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/regexdate/RegexDateApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/ResourceApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/ResourceApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/ResourceApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/ResourceApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/dto/RA.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/dto/RA.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/dto/RA.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/dto/RA.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/dto/Rd.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/dto/Rd.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/dto/Rd.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/dto/Rd.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/dto/RpR.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/dto/RpR.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/dto/RpR.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/dto/RpR.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RAEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RAEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RAEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RAEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RARepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RARepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RARepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RARepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RdEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RdEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RdEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RdEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RdRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RdRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RdRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RdRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RpREntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RpREntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RpREntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RpREntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RpRRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RpRRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RpRRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/entity/RpRRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RARestAPI.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RARestAPI.java similarity index 90% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RARestAPI.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RARestAPI.java index 8cae85c66d..d8ce79d0c4 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RARestAPI.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RARestAPI.java @@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; /** automatically created on 2019-08-29 */ @RestController @@ -15,7 +15,7 @@ public class RARestAPI { @Autowired private RARepository rARepository; - @RequestMapping(value = "", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON) + @RequestMapping(value = "", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity createRAEntity(@Valid @RequestBody RA rA) { if (rARepository.findById(rA.id).isPresent()) return ResponseEntity.status(400).build(); RAEntity node = new RAEntity(); @@ -29,7 +29,7 @@ public ResponseEntity createRAEntity(@Valid @RequestBody RA rA) { @RequestMapping( value = "/{rAId}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON) + produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getRAEntity(@PathVariable(name = "rAId") Long rAId) { if (!rARepository.findById(rAId).isPresent()) return ResponseEntity.status(400).build(); RA dto = rARepository.findById(rAId).get().getDto(); diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RdRestAPI.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RdRestAPI.java similarity index 90% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RdRestAPI.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RdRestAPI.java index e22e00786f..45111fcbad 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RdRestAPI.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RdRestAPI.java @@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; /** automatically created on 2019-08-29 */ @RestController @@ -13,7 +13,7 @@ public class RdRestAPI { @Autowired private RdRepository rdRepository; - @RequestMapping(value = "", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON) + @RequestMapping(value = "", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity createRdEntity(@RequestBody Rd rd) { if (rdRepository.findById(rd.id).isPresent()) return ResponseEntity.status(400).build(); RdEntity node = new RdEntity(); @@ -27,7 +27,7 @@ public ResponseEntity createRdEntity(@RequestBody Rd rd) { @RequestMapping( value = "/{rdId}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON) + produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getRdEntity(@PathVariable(name = "rdId") Long rdId) { if (!rdRepository.findById(rdId).isPresent()) return ResponseEntity.status(400).build(); Rd dto = rdRepository.findById(rdId).get().getDto(); diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RpRRestAPI.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RpRRestAPI.java similarity index 91% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RpRRestAPI.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RpRRestAPI.java index d7b05c6799..a40a34fcdc 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RpRRestAPI.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/resource/service/RpRRestAPI.java @@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; /** automatically created on 2019-08-29 */ @RestController @@ -14,7 +14,7 @@ public class RpRRestAPI { @Autowired private RpRRepository rpRRepository; @Autowired private RdRepository rdRepository; - @RequestMapping(value = "", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON) + @RequestMapping(value = "", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity createRpREntity(@RequestBody RpR rpR) { if (rpRRepository.findById(rpR.id).isPresent()) return ResponseEntity.status(400).build(); RpREntity node = new RpREntity(); @@ -31,7 +31,7 @@ public ResponseEntity createRpREntity(@RequestBody RpR rpR) { @RequestMapping( value = "/{rpRId}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON) + produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getRpREntity(@PathVariable(name = "rpRId") Long rpRId) { if (!rpRRepository.findById(rpRId).isPresent()) return ResponseEntity.status(400).build(); RpR dto = rpRRepository.findById(rpRId).get().getDto(); diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/scheduled/ScheduledApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/scheduled/ScheduledApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/scheduled/ScheduledApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/scheduled/ScheduledApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/scheduled/ScheduledRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/scheduled/ScheduledRest.java similarity index 86% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/scheduled/ScheduledRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/scheduled/ScheduledRest.java index cb028558e0..aafc1422ff 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/scheduled/ScheduledRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/scheduled/ScheduledRest.java @@ -1,11 +1,8 @@ package com.foo.rest.examples.spring.scheduled; -import com.foo.rest.examples.spring.strings.StringsResponseDto; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; -import javax.ws.rs.core.MediaType; - @RestController @RequestMapping(path = "/api/scheduled") diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutWebSecurityConfig.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutWebSecurityConfig.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutWebSecurityConfig.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutWebSecurityConfig.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableEntity.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableEntity.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableEntity.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableEntity.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableRepository.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableRepository.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableRepository.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableRepository.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableRest.java similarity index 89% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableRest.java index 1b4e2bf96a..6bf508cf02 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/sqloutput/DbTableRest.java @@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.constraints.NotNull; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.net.URI; import java.util.List; import java.util.stream.Collectors; @@ -22,7 +22,7 @@ public class DbTableRest { @RequestMapping( path = "", method = RequestMethod.POST, - consumes = MediaType.APPLICATION_JSON + consumes = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity create(@NotNull @RequestBody DbTableDto dto) { @@ -38,7 +38,7 @@ public ResponseEntity create(@NotNull @RequestBody DbTableDto dto) { @RequestMapping( path = "", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public List getAll() { @@ -50,7 +50,7 @@ public List getAll() { @RequestMapping( path = "/{id}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity get(@PathVariable("id") Long id) { @@ -71,7 +71,7 @@ public ResponseEntity get(@PathVariable("id") Long id) { @RequestMapping( path = "/{name}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity> getByName(@PathVariable String name) { diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/stringminlenght/StringMinLengthApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/stringminlenght/StringMinLengthApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/stringminlenght/StringMinLengthApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/stringminlenght/StringMinLengthApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/stringminlenght/StringMinLengthRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/stringminlenght/StringMinLengthRest.java similarity index 89% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/stringminlenght/StringMinLengthRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/stringminlenght/StringMinLengthRest.java index c7c2948383..d077020081 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/stringminlenght/StringMinLengthRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/stringminlenght/StringMinLengthRest.java @@ -10,7 +10,7 @@ import javax.validation.Valid; import javax.validation.constraints.Min; import javax.validation.constraints.Size; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; @Validated @RestController @@ -21,7 +21,7 @@ public class StringMinLengthRest { @RequestMapping( value = "/{s}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String min20( @PathVariable("s") @Valid @Size(min = 20) String s diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsResponseDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsResponseDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsResponseDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsResponseDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsRest.java similarity index 89% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsRest.java index f7d31dea41..493ed26e75 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/strings/StringsRest.java @@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; @RestController @RequestMapping(path = "/api/strings") @@ -15,7 +15,7 @@ public class StringsRest { @RequestMapping( value = "/equalsFoo/{s}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public StringsResponseDto equalsFoo( @PathVariable("s") String s @@ -33,7 +33,7 @@ public StringsResponseDto equalsFoo( @RequestMapping( value = "/startEnds/{s}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public StringsResponseDto startsEnd( @PathVariable("s") String s @@ -54,7 +54,7 @@ else if(s.length() == 4 && s.startsWith("X") && s.endsWith("Y")){ @RequestMapping( value = "/contains/{s}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public StringsResponseDto contains( @PathVariable("s") String s @@ -75,7 +75,7 @@ else if(s.length() == 3 && "123456789".contains(s)){ @RequestMapping( value = "/nope/{s}", method = RequestMethod.POST, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public StringsResponseDto nope( @PathVariable("s") String s diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/synthetic/SyntheticApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/synthetic/SyntheticApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/synthetic/SyntheticApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/synthetic/SyntheticApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/synthetic/SyntheticRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/synthetic/SyntheticRest.java similarity index 90% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/synthetic/SyntheticRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/synthetic/SyntheticRest.java index 79f60c20de..da2a154fb0 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/synthetic/SyntheticRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/synthetic/SyntheticRest.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -19,7 +19,7 @@ public class SyntheticRest { @RequestMapping( value = "/{s}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public String equalsFoo( @PathVariable("s") String s diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taint/TaintApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taint/TaintApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taint/TaintApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taint/TaintApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taint/TaintRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taint/TaintRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taint/TaintRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taint/TaintRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintInvalid/TaintInvalidApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintInvalid/TaintInvalidApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintInvalid/TaintInvalidApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintInvalid/TaintInvalidApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintInvalid/TaintInvalidRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintInvalid/TaintInvalidRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintInvalid/TaintInvalidRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintInvalid/TaintInvalidRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintMulti/TaintMultiApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintMulti/TaintMultiApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintMulti/TaintMultiApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintMulti/TaintMultiApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintMulti/TaintMultiRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintMulti/TaintMultiRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintMulti/TaintMultiRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintMulti/TaintMultiRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintcollection/TaintCollectionApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintcollection/TaintCollectionApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintcollection/TaintCollectionApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintcollection/TaintCollectionApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintcollection/TaintCollectionRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintcollection/TaintCollectionRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintcollection/TaintCollectionRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintcollection/TaintCollectionRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintenum/TaintEnumApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintenum/TaintEnumApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintenum/TaintEnumApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintenum/TaintEnumApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintenum/TaintEnumFoo.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintenum/TaintEnumFoo.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintenum/TaintEnumFoo.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintenum/TaintEnumFoo.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintenum/TaintEnumRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintenum/TaintEnumRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintenum/TaintEnumRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintenum/TaintEnumRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintignorecase/TaintIgnoreCaseApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintignorecase/TaintIgnoreCaseApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintignorecase/TaintIgnoreCaseApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintignorecase/TaintIgnoreCaseApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintignorecase/TaintIgnoreCaseRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintignorecase/TaintIgnoreCaseRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintignorecase/TaintIgnoreCaseRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintignorecase/TaintIgnoreCaseRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintnested/TaintNestedApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintnested/TaintNestedApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintnested/TaintNestedApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintnested/TaintNestedApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintnested/TaintNestedDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintnested/TaintNestedDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintnested/TaintNestedDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintnested/TaintNestedDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintnested/TaintNestedRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintnested/TaintNestedRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintnested/TaintNestedRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/taintnested/TaintNestedRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/tcpport/TcpPortApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/tcpport/TcpPortApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/tcpport/TcpPortApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/tcpport/TcpPortApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/testability/TestabilityApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/testability/TestabilityApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/testability/TestabilityApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/testability/TestabilityApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/testability/TestabilityRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/testability/TestabilityRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/testability/TestabilityRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/testability/TestabilityRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleResponseDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleResponseDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleResponseDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleResponseDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleRest.java similarity index 92% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleRest.java index 7cef715552..53cdaa9614 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/triangle/TriangleRest.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; @RestController @RequestMapping(path = "/api/triangle") @@ -20,7 +20,7 @@ public class TriangleRest { @RequestMapping( value = "/{a}/{b}/{c}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public TriangleResponseDto checkTriangle( @ApiParam("First edge") diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperBody.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperBody.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperBody.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperBody.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperNumeric.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperNumeric.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperNumeric.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperNumeric.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperParam.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperParam.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperParam.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperParam.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperSql.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperSql.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperSql.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/ttpaper/TTPaperSql.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccess/UnauthenticatedSwaggerAccessApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccess/UnauthenticatedSwaggerAccessApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccess/UnauthenticatedSwaggerAccessApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccess/UnauthenticatedSwaggerAccessApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccess/UnauthenticatedSwaggerAccessRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccess/UnauthenticatedSwaggerAccessRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccess/UnauthenticatedSwaggerAccessRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccess/UnauthenticatedSwaggerAccessRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccess/UnauthenticatedSwaggerApplicationWebSecurityConfig.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccess/UnauthenticatedSwaggerApplicationWebSecurityConfig.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccess/UnauthenticatedSwaggerApplicationWebSecurityConfig.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccess/UnauthenticatedSwaggerApplicationWebSecurityConfig.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/valid/ValidApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/valid/ValidApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/valid/ValidApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/valid/ValidApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/valid/ValidDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/valid/ValidDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/valid/ValidDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/valid/ValidDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/valid/ValidRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/valid/ValidRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/valid/ValidRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/valid/ValidRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/webrequest/WebRequestApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/webrequest/WebRequestApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/webrequest/WebRequestApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/webrequest/WebRequestApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/webrequest/WebRequestRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/webrequest/WebRequestRest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/webrequest/WebRequestRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/webrequest/WebRequestRest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/ResponseDto.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/ResponseDto.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/ResponseDto.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/ResponseDto.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/WireMockApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/WireMockApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/WireMockApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/WireMockApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/WireMockRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/WireMockRest.java similarity index 92% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/WireMockRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/WireMockRest.java index e2356cd2ea..1cdd939c93 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/WireMockRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/base/WireMockRest.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.util.Objects; @RestController @@ -18,7 +18,7 @@ public class WireMockRest { @RequestMapping( value = "/equalsFoo/{s}", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public boolean equalsFoo( @PathVariable("s") String s @@ -29,7 +29,7 @@ public boolean equalsFoo( @RequestMapping( value = "/external", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public boolean externalCall() { boolean responseDto = false; diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/MockApiResponse.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/MockApiResponse.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/MockApiResponse.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/MockApiResponse.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceApplication.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceApplication.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceApplication.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceApplication.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceApplicationStartup.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceApplicationStartup.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceApplicationStartup.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceApplicationStartup.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceRest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceRest.java similarity index 96% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceRest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceRest.java index 38980a9ba3..0e28625d89 100644 --- a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceRest.java +++ b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/wiremock/service/ServiceRest.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.ws.rs.core.MediaType; +import org.springframework.http.MediaType; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; @@ -20,7 +20,7 @@ public class ServiceRest { @RequestMapping( value = "/external", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity dummyExternalCall() { ResponseDto responseDto = new ResponseDto(); @@ -67,7 +67,7 @@ public ResponseEntity dummyExternalCall() { @RequestMapping( value = "/external/complex", method = RequestMethod.GET, - produces = MediaType.APPLICATION_JSON + produces = MediaType.APPLICATION_JSON_VALUE ) public ResponseEntity complexExternalCalls() { ResponseDto responseDto = new ResponseDto(); diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/net/thirdparty/taint/TaintCheckString.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/net/thirdparty/taint/TaintCheckString.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/java/net/thirdparty/taint/TaintCheckString.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/java/net/thirdparty/taint/TaintCheckString.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/application.yml b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/application.yml similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/application.yml rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/application.yml diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/resourceGraph.dot b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/resourceGraph.dot similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/resourceGraph.dot rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/resourceGraph.dot diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/sql/entity.sql b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/sql/entity.sql similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/sql/entity.sql rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/sql/entity.sql diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/sql/entityjpa.sql b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/sql/entityjpa.sql similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/sql/entityjpa.sql rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/sql/entityjpa.sql diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-bodyissue.json b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-bodyissue.json similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-bodyissue.json rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-bodyissue.json diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-endpoints.json b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-endpoints.json similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-endpoints.json rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-endpoints.json diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-expectation-test.json b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-expectation-test.json similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-expectation-test.json rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-expectation-test.json diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-formparam-issue.json b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-formparam-issue.json similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-formparam-issue.json rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-formparam-issue.json diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-minlength.json b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-minlength.json similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-minlength.json rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-minlength.json diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-regex.json b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-regex.json similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-regex.json rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-regex.json diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-regexdate.json b/core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-regexdate.json similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/main/resources/static/swagger-regexdate.json rename to core-tests/jdk-8/spring-rest-openapi-v2/src/main/resources/static/swagger-regexdate.json diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/SpringController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/SpringController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/SpringController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/SpringController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/adaptivehypermutation/AHypermutationRestController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/adaptivehypermutation/AHypermutationRestController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/adaptivehypermutation/AHypermutationRestController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/adaptivehypermutation/AHypermutationRestController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerAccessController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerAccessController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerAccessController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/authenticatedswaggeraccess/AuthenticatedSwaggerAccessController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerAccessNoAuthController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerAccessNoAuthController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerAccessNoAuthController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/authenticatedswaggeraccessnoauth/AuthenticatedSwaggerAccessNoAuthController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerAccessWithoutAuthenticationController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerAccessWithoutAuthenticationController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerAccessWithoutAuthenticationController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/authenticatedswaggeraccesswithoutauthentication/AuthenticatedSwaggerAccessWithoutAuthenticationController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/base64/Base64DecodeController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/base64/Base64DecodeController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/base64/Base64DecodeController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/base64/Base64DecodeController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/bodyissue/BodyIssueController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/bodyissue/BodyIssueController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/bodyissue/BodyIssueController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/bodyissue/BodyIssueController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/bodytypes/BodyTypesController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/bodytypes/BodyTypesController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/bodytypes/BodyTypesController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/bodytypes/BodyTypesController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/branches/BranchesController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/branches/BranchesController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/branches/BranchesController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/branches/BranchesController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/chainedheaderlocation/CHLController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/chainednolocation/CNLController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/chainednolocation/CNLController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/chainednolocation/CNLController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/chainednolocation/CNLController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/chainedpostget/CPGController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/chainedpostget/CPGController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/chainedpostget/CPGController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/chainedpostget/CPGController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/constant/ConstantController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/constant/ConstantController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/constant/ConstantController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/constant/ConstantController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/SpringWithDbController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/SpringWithDbController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/SpringWithDbController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/SpringWithDbController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/auth/DbAuthController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/auth/DbAuthController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/auth/DbAuthController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/auth/DbAuthController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/base/DbBaseController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/base/DbBaseController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/base/DbBaseController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/base/DbBaseController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/crossfks/CrossFkController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/crossfks/CrossFkController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/crossfks/CrossFkController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/crossfks/CrossFkController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/directint/DbDirectIntController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/directint/DbDirectIntController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/directint/DbDirectIntController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/directint/DbDirectIntController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/directintwithsql/DbDirectIntWithSqlController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/directintwithsql/DbDirectIntWithSqlController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/directintwithsql/DbDirectIntWithSqlController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/directintwithsql/DbDirectIntWithSqlController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/entity/EntityController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/entity/EntityController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/entity/EntityController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/entity/EntityController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataWithSqlScriptController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataWithSqlScriptController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataWithSqlScriptController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/existingdata/ExistingDataWithSqlScriptController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/insertcollection/RResourceController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/insertcollection/RResourceController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/insertcollection/RResourceController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/insertcollection/RResourceController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/javatypes/JavaTypesController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/jpa/EntityJPAController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/jpa/EntityJPAController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/jpa/EntityJPAController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/jpa/EntityJPAController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/tree/DbTreeController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/tree/DbTreeController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/tree/DbTreeController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/db/tree/DbTreeController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpointexclude/EndpointExcludeController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpointexclude/EndpointExcludeController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpointexclude/EndpointExcludeController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpointexclude/EndpointExcludeController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpointfilter/EndpointFilterController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpointfilter/EndpointFilterController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpointfilter/EndpointFilterController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpointfilter/EndpointFilterController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpoints/EndpointsController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpoints/EndpointsController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpoints/EndpointsController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/endpoints/EndpointsController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/enums/EnumsController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/enums/EnumsController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/enums/EnumsController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/enums/EnumsController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/escape/EscapeController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/escape/EscapeController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/escape/EscapeController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/escape/EscapeController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/expectations/ExpectationsController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/expectations/ExpectationsController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/expectations/ExpectationsController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/expectations/ExpectationsController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/filecreationissuenofault/FileCreationIssueNoFaultController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/filecreationissuenofault/FileCreationIssueNoFaultController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/filecreationissuenofault/FileCreationIssueNoFaultController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/filecreationissuenofault/FileCreationIssueNoFaultController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/filecreationissuewithfault/FileCreationIssueWithFaultController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/filecreationissuewithfault/FileCreationIssueWithFaultController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/filecreationissuewithfault/FileCreationIssueWithFaultController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/filecreationissuewithfault/FileCreationIssueWithFaultController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/formlogin/FormLoginController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/formlogin/FormLoginController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/formlogin/FormLoginController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/formlogin/FormLoginController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/formparam/FormParamController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/formparam/FormParamController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/formparam/FormParamController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/formparam/FormParamController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/formparam/FormParamIssueController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/formparam/FormParamIssueController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/formparam/FormParamIssueController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/formparam/FormParamIssueController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/headerlocation/HeaderLocationController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/hypermutation/HighWeightRestController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/hypermutation/HighWeightRestController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/hypermutation/HighWeightRestController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/hypermutation/HighWeightRestController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/impactXYZ/ImpactXYZRestController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/impactXYZ/ImpactXYZRestController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/impactXYZ/ImpactXYZRestController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/impactXYZ/ImpactXYZRestController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/json/JsonController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/json/JsonController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/json/JsonController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/json/JsonController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/namedresource/NamedResourceController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/namedresource/NamedResourceController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/namedresource/NamedResourceController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/namedresource/NamedResourceController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/positiveinteger/PIController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/positiveinteger/PIController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/positiveinteger/PIController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/positiveinteger/PIController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/postcollection/PostCollectionController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/postcollection/PostCollectionController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/postcollection/PostCollectionController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/postcollection/PostCollectionController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/redirect/RedirectController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/redirect/RedirectController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/redirect/RedirectController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/redirect/RedirectController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/regex/RegexController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/regex/RegexController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/regex/RegexController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/regex/RegexController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/regex/RegexTaintController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/regex/RegexTaintController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/regex/RegexTaintController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/regex/RegexTaintController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/regexdate/RegexDateController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/regexdate/RegexDateController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/regexdate/RegexDateController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/regexdate/RegexDateController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/resource/ResourceRestController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/resource/ResourceRestController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/resource/ResourceRestController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/resource/ResourceRestController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/scheduled/ScheduledController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/scheduled/ScheduledController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/scheduled/ScheduledController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/scheduled/ScheduledController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/security/accesscontrol/deleteput/ACDeletePutController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/sqloutput/DbTableController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/sqloutput/DbTableController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/sqloutput/DbTableController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/sqloutput/DbTableController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/stringminlength/StringMinLengthController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/stringminlength/StringMinLengthController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/stringminlength/StringMinLengthController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/stringminlength/StringMinLengthController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/strings/StringsController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/strings/StringsController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/strings/StringsController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/strings/StringsController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/synthetic/SyntheticController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/synthetic/SyntheticController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/synthetic/SyntheticController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/synthetic/SyntheticController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taint/TaintController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taint/TaintController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taint/TaintController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taint/TaintController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintInvalid/TaintInvalidController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintInvalid/TaintInvalidController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintInvalid/TaintInvalidController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintInvalid/TaintInvalidController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintMulti/TaintMultiController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintMulti/TaintMultiController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintMulti/TaintMultiController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintMulti/TaintMultiController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintcollection/TaintCollectionController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintcollection/TaintCollectionController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintcollection/TaintCollectionController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintcollection/TaintCollectionController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintenum/TaintEnumController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintenum/TaintEnumController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintenum/TaintEnumController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintenum/TaintEnumController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintignorecase/TaintIgnoreCaseController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintignorecase/TaintIgnoreCaseController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintignorecase/TaintIgnoreCaseController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintignorecase/TaintIgnoreCaseController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintnested/TaintNestedController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintnested/TaintNestedController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintnested/TaintNestedController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/taintnested/TaintNestedController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/tcpport/TcpPortController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/tcpport/TcpPortController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/tcpport/TcpPortController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/tcpport/TcpPortController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/testability/TestabilityController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/testability/TestabilityController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/testability/TestabilityController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/testability/TestabilityController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/triangle/TriangleController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/triangle/TriangleController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/triangle/TriangleController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/triangle/TriangleController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/ttpaper/TTPaperController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/ttpaper/TTPaperController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/ttpaper/TTPaperController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/ttpaper/TTPaperController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccesscontroller/UnauthenticatedSwaggerAccessController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccesscontroller/UnauthenticatedSwaggerAccessController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccesscontroller/UnauthenticatedSwaggerAccessController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/unauthenticatedswaggeraccesscontroller/UnauthenticatedSwaggerAccessController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/valid/ValidController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/valid/ValidController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/valid/ValidController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/valid/ValidController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/webrequest/WebRequestController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/webrequest/WebRequestController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/webrequest/WebRequestController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/webrequest/WebRequestController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/wiremock/base/WireMockController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/wiremock/base/WireMockController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/wiremock/base/WireMockController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/wiremock/base/WireMockController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/wiremock/service/ServiceController.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/wiremock/service/ServiceController.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/wiremock/service/ServiceController.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/com/foo/rest/examples/spring/wiremock/service/ServiceController.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/EMRunner.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/EMRunner.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/EMRunner.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/EMRunner.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/SpringTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/SpringTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/SpringTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/SpringTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/AHypermuationTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/AHypermuationTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/AHypermuationTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/AHypermuationTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/AHypermutationAWHTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/AHypermutationAWHTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/AHypermutationAWHTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/AHypermutationAWHTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/DeterminismTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/DeterminismTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/DeterminismTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/DeterminismTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/EvoMasterAWHSampleTest.kt b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/EvoMasterAWHSampleTest.kt similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/EvoMasterAWHSampleTest.kt rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/EvoMasterAWHSampleTest.kt diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/ManualRestTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/ManualRestTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/ManualRestTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/adaptivehypermutation/ManualRestTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessNoAuthManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessNoAuthManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessNoAuthManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessNoAuthManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessWithoutAuthenticationManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessWithoutAuthenticationManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessWithoutAuthenticationManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/AuthenticatedSwaggerAccessWithoutAuthenticationManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/UnauthenticatedSwaggerAccessEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/UnauthenticatedSwaggerAccessEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/UnauthenticatedSwaggerAccessEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/UnauthenticatedSwaggerAccessEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/UnauthenticatedSwaggerAccessManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/UnauthenticatedSwaggerAccessManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/UnauthenticatedSwaggerAccessManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/authenticatedswaggeraccesstest/UnauthenticatedSwaggerAccessManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/base64/Base64DecodeEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/base64/Base64DecodeEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/base64/Base64DecodeEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/base64/Base64DecodeEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/blackbox/BlackBoxConstantEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/blackbox/BlackBoxConstantEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/blackbox/BlackBoxConstantEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/blackbox/BlackBoxConstantEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/bodyissue/BodyIssueEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/bodyissue/BodyIssueEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/bodyissue/BodyIssueEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/bodyissue/BodyIssueEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/bodytypes/BodyTypesEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/bodytypes/BodyTypesEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/bodytypes/BodyTypesEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/bodytypes/BodyTypesEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/branches/BranchesEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/branches/BranchesEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/branches/BranchesEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/branches/BranchesEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/branches/BranchesManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/branches/BranchesManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/branches/BranchesManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/branches/BranchesManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/branches/BranchesProcessMonitorEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/branches/BranchesProcessMonitorEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/branches/BranchesProcessMonitorEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/branches/BranchesProcessMonitorEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedheaderlocation/CHLEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedheaderlocation/CHLEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedheaderlocation/CHLEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedheaderlocation/CHLEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedheaderlocation/CHLManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedheaderlocation/CHLManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedheaderlocation/CHLManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedheaderlocation/CHLManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedheaderlocation/CHLTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedheaderlocation/CHLTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedheaderlocation/CHLTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedheaderlocation/CHLTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainednolocation/CNLEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainednolocation/CNLEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainednolocation/CNLEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainednolocation/CNLEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainednolocation/CNLManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainednolocation/CNLManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainednolocation/CNLManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainednolocation/CNLManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainednolocation/CNLTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainednolocation/CNLTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainednolocation/CNLTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainednolocation/CNLTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedpostget/CPGEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedpostget/CPGEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedpostget/CPGEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedpostget/CPGEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedpostget/CPGManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedpostget/CPGManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedpostget/CPGManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedpostget/CPGManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedpostget/CPGTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedpostget/CPGTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedpostget/CPGTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/chainedpostget/CPGTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/constant/ConstantEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/constant/ConstantEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/constant/ConstantEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/constant/ConstantEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/auth/DbAuthEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/auth/DbAuthEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/auth/DbAuthEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/auth/DbAuthEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/auth/DbAuthManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/auth/DbAuthManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/auth/DbAuthManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/auth/DbAuthManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/auth/DbAuthTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/auth/DbAuthTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/auth/DbAuthTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/auth/DbAuthTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseTTIssueManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseTTIssueManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseTTIssueManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseTTIssueManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/base/DbBaseTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/crossfks/CrossFkEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/crossfks/CrossFkEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/crossfks/CrossFkEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/crossfks/CrossFkEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directint/DbDirectIntEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directint/DbDirectIntEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directint/DbDirectIntEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directint/DbDirectIntEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directint/DbDirectIntManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directint/DbDirectIntManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directint/DbDirectIntManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directint/DbDirectIntManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directint/DbDirectIntTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directint/DbDirectIntTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directint/DbDirectIntTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directint/DbDirectIntTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directintwithsql/DbDirectIntWithSqlEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directintwithsql/DbDirectIntWithSqlEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directintwithsql/DbDirectIntWithSqlEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directintwithsql/DbDirectIntWithSqlEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directintwithsql/DbDirectIntWithSqlManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directintwithsql/DbDirectIntWithSqlManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directintwithsql/DbDirectIntWithSqlManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directintwithsql/DbDirectIntWithSqlManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directintwithsql/DbDirectIntWithSqlTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directintwithsql/DbDirectIntWithSqlTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directintwithsql/DbDirectIntWithSqlTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/directintwithsql/DbDirectIntWithSqlTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/entity/EntityEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/entity/EntityEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/entity/EntityEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/entity/EntityEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/existingdata/ExistingDataEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/existingdata/ExistingDataEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/existingdata/ExistingDataEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/existingdata/ExistingDataEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/existingdata/ExistingDataWithSqlScriptControllerEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/existingdata/ExistingDataWithSqlScriptControllerEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/existingdata/ExistingDataWithSqlScriptControllerEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/existingdata/ExistingDataWithSqlScriptControllerEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/javatypes/JavaTypesEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/javatypes/JavaTypesEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/javatypes/JavaTypesEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/javatypes/JavaTypesEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/javatypes/JavaTypesTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/javatypes/JavaTypesTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/javatypes/JavaTypesTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/javatypes/JavaTypesTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/jpa/EntityJPAEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/jpa/EntityJPAEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/jpa/EntityJPAEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/jpa/EntityJPAEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/tree/DbTreeEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/tree/DbTreeEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/tree/DbTreeEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/db/tree/DbTreeEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/displayissue/DisplayIssueEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/displayissue/DisplayIssueEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/displayissue/DisplayIssueEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/displayissue/DisplayIssueEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpointexclude/EndpointExcludeEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpointexclude/EndpointExcludeEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpointexclude/EndpointExcludeEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpointexclude/EndpointExcludeEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpointfilter/EndpointFilterEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpointfilter/EndpointFilterEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpointfilter/EndpointFilterEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpointfilter/EndpointFilterEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpointfocusandprefix/EndpointFocusAndPrefixTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpointfocusandprefix/EndpointFocusAndPrefixTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpointfocusandprefix/EndpointFocusAndPrefixTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpointfocusandprefix/EndpointFocusAndPrefixTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpoints/EndpointsEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpoints/EndpointsEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpoints/EndpointsEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpoints/EndpointsEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/enums/EnumsEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/enums/EnumsEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/enums/EnumsEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/enums/EnumsEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/escape/EscapeEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/escape/EscapeEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/escape/EscapeEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/escape/EscapeEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/escape/EscapeManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/escape/EscapeManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/escape/EscapeManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/escape/EscapeManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/escape/EscapeTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/escape/EscapeTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/escape/EscapeTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/escape/EscapeTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/expectations/ExpectationsEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/expectations/ExpectationsEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/expectations/ExpectationsEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/expectations/ExpectationsEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/expectations/ExpectationsManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/expectations/ExpectationsManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/expectations/ExpectationsManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/expectations/ExpectationsManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/filecreationissue/FileCreationIssueFaultEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/filecreationissue/FileCreationIssueFaultEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/filecreationissue/FileCreationIssueFaultEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/filecreationissue/FileCreationIssueFaultEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/filecreationissue/FileCreationIssueNoFaultEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/filecreationissue/FileCreationIssueNoFaultEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/filecreationissue/FileCreationIssueNoFaultEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/filecreationissue/FileCreationIssueNoFaultEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/filecreationissue/FileCreationIssueTestHelper.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/filecreationissue/FileCreationIssueTestHelper.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/filecreationissue/FileCreationIssueTestHelper.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/filecreationissue/FileCreationIssueTestHelper.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formlogin/FormLoginEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formlogin/FormLoginEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formlogin/FormLoginEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formlogin/FormLoginEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formlogin/FormLoginManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formlogin/FormLoginManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formlogin/FormLoginManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formlogin/FormLoginManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formparam/FormParamEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formparam/FormParamEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formparam/FormParamEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formparam/FormParamEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formparam/FormParamIssueEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formparam/FormParamIssueEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formparam/FormParamIssueEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/formparam/FormParamIssueEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/headerlocation/HLEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/headerlocation/HLEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/headerlocation/HLEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/headerlocation/HLEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/headerlocation/HLManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/headerlocation/HLManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/headerlocation/HLManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/headerlocation/HLManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/headerlocation/HLTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/headerlocation/HLTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/headerlocation/HLTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/headerlocation/HLTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/hypermutation/AdaptiveHypermutationTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/hypermutation/AdaptiveHypermutationTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/hypermutation/AdaptiveHypermutationTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/hypermutation/AdaptiveHypermutationTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/hypermutation/HypermutationTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/hypermutation/HypermutationTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/hypermutation/HypermutationTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/hypermutation/HypermutationTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/hypermutation/HypermutationTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/hypermutation/HypermutationTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/hypermutation/HypermutationTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/hypermutation/HypermutationTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/ArchiveGeneMutationImpactXYZTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/ArchiveGeneMutationImpactXYZTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/ArchiveGeneMutationImpactXYZTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/ArchiveGeneMutationImpactXYZTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/ArchiveGeneSelectionImpactXYZInfoTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/ArchiveGeneSelectionImpactXYZInfoTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/ArchiveGeneSelectionImpactXYZInfoTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/ArchiveGeneSelectionImpactXYZInfoTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/ImpactXYZManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/ImpactXYZManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/ImpactXYZManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/ImpactXYZManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/WeightBasedMutationXYZTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/WeightBasedMutationXYZTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/WeightBasedMutationXYZTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/impactXYZ/WeightBasedMutationXYZTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/insertcollection/SqlCEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/insertcollection/SqlCEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/insertcollection/SqlCEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/insertcollection/SqlCEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/json/JsonEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/json/JsonEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/json/JsonEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/json/JsonEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/namedresource/NREMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/namedresource/NREMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/namedresource/NREMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/namedresource/NREMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/namedresource/NRManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/namedresource/NRManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/namedresource/NRManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/namedresource/NRManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/namedresource/NRTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/namedresource/NRTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/namedresource/NRTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/namedresource/NRTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/positiveinteger/PIEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/positiveinteger/PIEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/positiveinteger/PIEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/positiveinteger/PIEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/positiveinteger/PIManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/positiveinteger/PIManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/positiveinteger/PIManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/positiveinteger/PIManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/positiveinteger/PITestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/positiveinteger/PITestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/positiveinteger/PITestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/positiveinteger/PITestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/postcollection/PCEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/postcollection/PCEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/postcollection/PCEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/postcollection/PCEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/redirect/RedirectEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/redirect/RedirectEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/redirect/RedirectEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/redirect/RedirectEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/regex/RegexEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/regex/RegexEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/regex/RegexEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/regex/RegexEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/regex/RegexTaintEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/regex/RegexTaintEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/regex/RegexTaintEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/regex/RegexTaintEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/regexdate/RegexDateEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/regexdate/RegexDateEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/regexdate/RegexDateEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/regexdate/RegexDateEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/ResourceMIOHWTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/ResourceMIOHWTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/ResourceMIOHWTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/ResourceMIOHWTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/ResourceTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/ResourceTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/ResourceTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/ResourceTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/adaptivehm/ResourceDbMIOAndAdaptiveHMBasicTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/adaptivehm/ResourceDbMIOAndAdaptiveHMBasicTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/adaptivehm/ResourceDbMIOAndAdaptiveHMBasicTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/adaptivehm/ResourceDbMIOAndAdaptiveHMBasicTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/db/ResourceDbMIOBasicTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/db/ResourceDbMIOBasicTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/db/ResourceDbMIOBasicTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/db/ResourceDbMIOBasicTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/db/ResourceDependencyDBEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/db/ResourceDependencyDBEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/db/ResourceDependencyDBEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/db/ResourceDependencyDBEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/dependency/ResourceDependencyEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/dependency/ResourceDependencyEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/dependency/ResourceDependencyEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/dependency/ResourceDependencyEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/hypermutation/ResourceDbMIOAndHypermutationBasicTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/hypermutation/ResourceDbMIOAndHypermutationBasicTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/hypermutation/ResourceDbMIOAndHypermutationBasicTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/hypermutation/ResourceDbMIOAndHypermutationBasicTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/nodb/ResourceDependencyDisableDBEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/nodb/ResourceDependencyDisableDBEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/nodb/ResourceDependencyDisableDBEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/nodb/ResourceDependencyDisableDBEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/seedtest/RestResourceSamplerSeedTestTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/seedtest/RestResourceSamplerSeedTestTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/seedtest/RestResourceSamplerSeedTestTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/seedtest/RestResourceSamplerSeedTestTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/structuralelement/RestMutatorIndividualStructureTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/structuralelement/RestMutatorIndividualStructureTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/structuralelement/RestMutatorIndividualStructureTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/resource/structuralelement/RestMutatorIndividualStructureTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/scheduled/ScheduledEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/scheduled/ScheduledEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/scheduled/ScheduledEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/scheduled/ScheduledEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/scheduled/ScheduledManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/scheduled/ScheduledManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/scheduled/ScheduledManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/scheduled/ScheduledManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/security/accesscontrol/deleteput/ACDeletePutEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/security/accesscontrol/deleteput/ACDeletePutEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/security/accesscontrol/deleteput/ACDeletePutEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/security/accesscontrol/deleteput/ACDeletePutEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/security/accesscontrol/deleteput/ACDeletePutManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/security/accesscontrol/deleteput/ACDeletePutManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/security/accesscontrol/deleteput/ACDeletePutManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/security/accesscontrol/deleteput/ACDeletePutManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/snapshot/PrintSnapshotsEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/snapshot/PrintSnapshotsEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/snapshot/PrintSnapshotsEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/snapshot/PrintSnapshotsEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/sort/SortEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/sort/SortEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/sort/SortEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/sort/SortEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/splitter/SplitterTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/splitter/SplitterTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/splitter/SplitterTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/splitter/SplitterTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/splitter/TestSuiteSplitterTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/splitter/TestSuiteSplitterTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/splitter/TestSuiteSplitterTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/splitter/TestSuiteSplitterTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/sqloutput/DbTableEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/sqloutput/DbTableEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/sqloutput/DbTableEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/sqloutput/DbTableEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/stringminlength/StringMinLengthEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/stringminlength/StringMinLengthEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/stringminlength/StringMinLengthEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/stringminlength/StringMinLengthEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/synthetic/SyntheticEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/synthetic/SyntheticEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/synthetic/SyntheticEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/synthetic/SyntheticEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taint/TaintEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taint/TaintEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taint/TaintEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taint/TaintEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintInvalid/TaintInvalidEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintInvalid/TaintInvalidEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintInvalid/TaintInvalidEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintInvalid/TaintInvalidEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintMulti/TaintMultiEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintMulti/TaintMultiEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintMulti/TaintMultiEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintMulti/TaintMultiEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintcollection/TaintCollectionEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintcollection/TaintCollectionEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintcollection/TaintCollectionEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintcollection/TaintCollectionEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintenum/TaintEnumEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintenum/TaintEnumEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintenum/TaintEnumEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintenum/TaintEnumEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintignorecase/TaintIgnoreCaseEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintignorecase/TaintIgnoreCaseEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintignorecase/TaintIgnoreCaseEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintignorecase/TaintIgnoreCaseEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintnested/TaintNestedEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintnested/TaintNestedEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintnested/TaintNestedEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/taintnested/TaintNestedEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/tcpport/TcpPortEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/tcpport/TcpPortEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/tcpport/TcpPortEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/tcpport/TcpPortEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/testability/MutatorWithTestabilityRestTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/testability/MutatorWithTestabilityRestTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/testability/MutatorWithTestabilityRestTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/testability/MutatorWithTestabilityRestTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/testability/TestabilityEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/testability/TestabilityEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/testability/TestabilityEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/testability/TestabilityEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/testability/TestabilityEMwithAdaptiveMutationTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/testability/TestabilityEMwithAdaptiveMutationTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/testability/TestabilityEMwithAdaptiveMutationTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/testability/TestabilityEMwithAdaptiveMutationTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/triangle/TriangleEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/triangle/TriangleEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/triangle/TriangleEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/triangle/TriangleEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/ttpaper/TTPaperEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/ttpaper/TTPaperEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/ttpaper/TTPaperEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/ttpaper/TTPaperEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/valid/ValidEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/valid/ValidEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/valid/ValidEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/valid/ValidEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/webrequest/WebRequestEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/webrequest/WebRequestEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/webrequest/WebRequestEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/webrequest/WebRequestEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/webrequest/WebRequestManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/webrequest/WebRequestManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/webrequest/WebRequestManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/webrequest/WebRequestManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/webrequest/WebRequestTestBase.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/webrequest/WebRequestTestBase.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/webrequest/WebRequestTestBase.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/webrequest/WebRequestTestBase.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/wiremock/base/WireMockManualTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/wiremock/base/WireMockManualTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/wiremock/base/WireMockManualTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/wiremock/base/WireMockManualTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/wiremock/service/ExternalServiceMockingEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/wiremock/service/ExternalServiceMockingEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/wiremock/service/ExternalServiceMockingEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/wiremock/service/ExternalServiceMockingEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/wiremock/service/ExternalServiceMockingFlakyEMTest.java b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/wiremock/service/ExternalServiceMockingFlakyEMTest.java similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/wiremock/service/ExternalServiceMockingFlakyEMTest.java rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/wiremock/service/ExternalServiceMockingFlakyEMTest.java diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/resources/TTPaper.json b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/resources/TTPaper.json similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/resources/TTPaper.json rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/resources/TTPaper.json diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/resources/postman/resource.postman_collection.json b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/resources/postman/resource.postman_collection.json similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/resources/postman/resource.postman_collection.json rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/resources/postman/resource.postman_collection.json diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/resources/sql/existingdata.sql b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/resources/sql/existingdata.sql similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/resources/sql/existingdata.sql rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/resources/sql/existingdata.sql diff --git a/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/resources/swagger-ahm/ahm.json b/core-tests/jdk-8/spring-rest-openapi-v2/src/test/resources/swagger-ahm/ahm.json similarity index 100% rename from core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/test/resources/swagger-ahm/ahm.json rename to core-tests/jdk-8/spring-rest-openapi-v2/src/test/resources/swagger-ahm/ahm.json diff --git a/core-tests/pom.xml b/core-tests/pom.xml index cfec05600f..d9a9b789bb 100644 --- a/core-tests/pom.xml +++ b/core-tests/pom.xml @@ -15,6 +15,7 @@ e2e-tests integration-tests + jdk-8 @@ -26,4 +27,4 @@ 2.5.4 - \ No newline at end of file + diff --git a/test-utils/pom.xml b/test-utils/pom.xml index b20f675ff4..01b0ef1ee3 100644 --- a/test-utils/pom.xml +++ b/test-utils/pom.xml @@ -19,4 +19,4 @@ - \ No newline at end of file +