Merge pull request quarkus-qe#703 from pjgg/backport_2.7_2

[2.7] Bulk - Backport 2.7 - part 2
pjgg · Jun 10, 2022 · 9f34cfc · 9f34cfc
2 parents 099c4dd + 8332e8c
commit 9f34cfc
Show file tree

Hide file tree

Showing 48 changed files with 249 additions and 126 deletions.
diff --git a/.../caffeine/ServiceWithCacheResourceIT.java → ...feine/cache/caffeine/CaffeineCacheIT.java b/.../caffeine/ServiceWithCacheResourceIT.java → ...feine/cache/caffeine/CaffeineCacheIT.java
@@ -13,7 +13,7 @@
 import io.quarkus.test.scenarios.QuarkusScenario;
 
 @QuarkusScenario
-public class ServiceWithCacheResourceIT {
+public class CaffeineCacheIT {
 
     private static final String SERVICE_APPLICATION_SCOPE_PATH = "/services/" + APPLICATION_SCOPE_SERVICE_PATH;
     private static final String SERVICE_REQUEST_SCOPE_PATH = "/services/" + REQUEST_SCOPE_SERVICE_PATH;

diff --git a/.../OpenShiftServiceWithCacheResourceIT.java → ...he/caffeine/OpenShiftCaffeineCacheIT.java b/.../OpenShiftServiceWithCacheResourceIT.java → ...he/caffeine/OpenShiftCaffeineCacheIT.java
@@ -3,5 +3,5 @@
 import io.quarkus.test.scenarios.OpenShiftScenario;
 
 @OpenShiftScenario
-public class OpenShiftServiceWithCacheResourceIT extends ServiceWithCacheResourceIT {
+public class OpenShiftCaffeineCacheIT extends CaffeineCacheIT {
 }
diff --git a/.../OpenShiftServiceWithCacheResourceIT.java → .../cache/spring/OpenShiftSpringCacheIT.java b/.../OpenShiftServiceWithCacheResourceIT.java → .../cache/spring/OpenShiftSpringCacheIT.java
@@ -3,5 +3,5 @@
 import io.quarkus.test.scenarios.OpenShiftScenario;
 
 @OpenShiftScenario
-public class OpenShiftServiceWithCacheResourceIT extends ServiceWithCacheResourceIT {
+public class OpenShiftSpringCacheIT extends SpringCacheIT {
 }
diff --git a/...he/spring/ServiceWithCacheResourceIT.java → ...uarkus/ts/cache/spring/SpringCacheIT.java b/...he/spring/ServiceWithCacheResourceIT.java → ...uarkus/ts/cache/spring/SpringCacheIT.java
@@ -13,7 +13,7 @@
 import io.quarkus.test.scenarios.QuarkusScenario;
 
 @QuarkusScenario
-public class ServiceWithCacheResourceIT {
+public class SpringCacheIT {
 
     private static final String SERVICE_APPLICATION_SCOPE_PATH = "/services/" + APPLICATION_SCOPE_SERVICE_PATH;
     private static final String SERVICE_REQUEST_SCOPE_PATH = "/services/" + REQUEST_SCOPE_SERVICE_PATH;

diff --git a/...phql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/GraphQLTelemetryIT.java b/...phql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/GraphQLTelemetryIT.java
@@ -41,7 +41,7 @@ void verifyTelemetry() {
         await().atMost(1, TimeUnit.MINUTES).pollInterval(Duration.ofSeconds(10)).untilAsserted(() -> {
             String operation = "graphql";
             Response traces = given().when()
-                    .queryParam("operationName", operation)
+                    .queryParam("operation", operation)
                     .queryParam("lookback", "1h")
                     .queryParam("limit", 10)
                     .queryParam("service", "graphql-telemetry")

diff --git a/...minimum/reactive/HttpCustomHeadersIT.java → ...reactive/HttpCustomHeadersReactiveIT.java b/...minimum/reactive/HttpCustomHeadersIT.java → ...reactive/HttpCustomHeadersReactiveIT.java
@@ -13,7 +13,7 @@
 import io.quarkus.test.scenarios.QuarkusScenario;
 
 @QuarkusScenario
-public class HttpCustomHeadersIT {
+public class HttpCustomHeadersReactiveIT {
 
     @Tag("QUARKUS-1574")
     @Test

diff --git a/...eactive/OpenShiftMultipartResourceIT.java → ...OpenShiftRESTEasyReactiveMultipartIT.java b/...eactive/OpenShiftMultipartResourceIT.java → ...OpenShiftRESTEasyReactiveMultipartIT.java
@@ -3,5 +3,5 @@
 import io.quarkus.test.scenarios.OpenShiftScenario;
 
 @OpenShiftScenario
-public class OpenShiftMultipartResourceIT extends MultipartResourceIT {
+public class OpenShiftRESTEasyReactiveMultipartIT extends RESTEasyReactiveMultipartIT {
 }
diff --git a/...rs/reactive/AsciiMultipartResourceIT.java → ...e/RESTEasyReactiveMultipartCharsetIT.java b/...rs/reactive/AsciiMultipartResourceIT.java → ...e/RESTEasyReactiveMultipartCharsetIT.java
@@ -17,7 +17,7 @@
 
 @Tag("QUARKUS-1075")
 @QuarkusScenario
-public class AsciiMultipartResourceIT {
+public class RESTEasyReactiveMultipartCharsetIT {
 
     public static final String TEXT_WITH_DIACRITICS = "Přikrášlený žloťoučký kůň úpěl ďábelské ódy.";
     private static final String EXPECTED_ASCII_TEXT = new String(TEXT_WITH_DIACRITICS.getBytes(StandardCharsets.UTF_8),
@@ -27,7 +27,7 @@ public class AsciiMultipartResourceIT {
     static RestService app = new RestService().withProperties("us-asscii.properties");
 
     @Test
-    public void testMultipartText() {
+    public void textInMultipartRequestEncodedWithDefaultCharset() {
         MultiPartSpecification multiPartSpecification = new MultiPartSpecBuilder(TEXT_WITH_DIACRITICS)
                 .controlName("text")
                 .header("Content-Type", "text/plain")

diff --git a/...p/jaxrs/reactive/MultipartResourceIT.java → ...reactive/RESTEasyReactiveMultipartIT.java b/...p/jaxrs/reactive/MultipartResourceIT.java → ...reactive/RESTEasyReactiveMultipartIT.java
@@ -25,7 +25,7 @@
 
 @Tag("QUARKUS-1075")
 @QuarkusScenario
-public class MultipartResourceIT {
+public class RESTEasyReactiveMultipartIT {
 
     private static final String IMAGE_FILE_NAME = "/quarkus.png";
     private static final String TEXT_WITH_DIACRITICS = "Přikrášlený žloťoučký kůň úpěl ďábelské ódy.";
@@ -35,8 +35,8 @@ public class MultipartResourceIT {
 
     @BeforeAll
     public static void beforeAll() throws IOException {
-        imageFile = new File(MultipartResourceIT.class.getResource(IMAGE_FILE_NAME).getFile());
-        imageBytes = IOUtils.toByteArray(MultipartResourceIT.class.getResourceAsStream(IMAGE_FILE_NAME));
+        imageFile = new File(RESTEasyReactiveMultipartIT.class.getResource(IMAGE_FILE_NAME).getFile());
+        imageBytes = IOUtils.toByteArray(RESTEasyReactiveMultipartIT.class.getResourceAsStream(IMAGE_FILE_NAME));
         new Random().nextBytes(randomBytes);
     }
 

diff --git a/...p/jaxrs/OpenShiftMultipartResourceIT.java → ...p/jaxrs/OpenShiftRESTEasyMultipartIT.java b/...p/jaxrs/OpenShiftMultipartResourceIT.java → ...p/jaxrs/OpenShiftRESTEasyMultipartIT.java
@@ -3,5 +3,5 @@
 import io.quarkus.test.scenarios.OpenShiftScenario;
 
 @OpenShiftScenario
-public class OpenShiftMultipartResourceIT extends MultipartResourceIT {
+public class OpenShiftRESTEasyMultipartIT extends RESTEasyMultipartIT {
 }
diff --git a/.../http/jaxrs/AsciiMultipartResourceIT.java → ...ttp/jaxrs/RESTEasyMultipartCharsetIT.java b/.../http/jaxrs/AsciiMultipartResourceIT.java → ...ttp/jaxrs/RESTEasyMultipartCharsetIT.java
@@ -15,7 +15,7 @@
 import io.restassured.specification.MultiPartSpecification;
 
 @QuarkusScenario
-public class AsciiMultipartResourceIT {
+public class RESTEasyMultipartCharsetIT {
 
     public static final String TEXT_WITH_DIACRITICS = "Přikrášlený žloťoučký kůň úpěl ďábelské ódy.";
     private static final String EXPECTED_ASCII_TEXT = new String(TEXT_WITH_DIACRITICS.getBytes(StandardCharsets.UTF_8),
@@ -25,7 +25,7 @@ public class AsciiMultipartResourceIT {
     static RestService app = new RestService().withProperties("us-asscii.properties");
 
     @Test
-    public void testMultipartText() {
+    public void textInMultipartRequestEncodedWithDefaultCharset() {
         MultiPartSpecification multiPartSpecification = new MultiPartSpecBuilder(TEXT_WITH_DIACRITICS)
                 .controlName("text")
                 .header("Content-Type", "text/plain")

diff --git a/...us/ts/http/jaxrs/MultipartResourceIT.java → ...us/ts/http/jaxrs/RESTEasyMultipartIT.java b/...us/ts/http/jaxrs/MultipartResourceIT.java → ...us/ts/http/jaxrs/RESTEasyMultipartIT.java
@@ -23,7 +23,7 @@
 import io.restassured.specification.MultiPartSpecification;
 
 @QuarkusScenario
-public class MultipartResourceIT {
+public class RESTEasyMultipartIT {
 
     private static final String IMAGE_FILE_NAME = "/quarkus.png";
     private static final String TEXT_WITH_DIACRITICS = "Přikrášlený žloťoučký kůň úpěl ďábelské ódy.";
@@ -33,8 +33,8 @@ public class MultipartResourceIT {
 
     @BeforeAll
     public static void beforeAll() throws IOException {
-        imageFile = new File(MultipartResourceIT.class.getResource(IMAGE_FILE_NAME).getFile());
-        imageBytes = IOUtils.toByteArray(MultipartResourceIT.class.getResourceAsStream(IMAGE_FILE_NAME));
+        imageFile = new File(RESTEasyMultipartIT.class.getResource(IMAGE_FILE_NAME).getFile());
+        imageBytes = IOUtils.toByteArray(RESTEasyMultipartIT.class.getResourceAsStream(IMAGE_FILE_NAME));
         new Random().nextBytes(randomBytes);
     }
 

diff --git a/http/rest-client/pom.xml b/http/rest-client/pom.xml
@@ -23,5 +23,9 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-rest-client-jsonb</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/http/rest-client/src/test/java/io/quarkus/ts/http/restclient/ClientBookResourceIT.java b/http/rest-client/src/test/java/io/quarkus/ts/http/restclient/ClientBookResourceIT.java
@@ -8,29 +8,43 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.test.bootstrap.RestService;
 import io.quarkus.test.scenarios.QuarkusScenario;
+import io.quarkus.test.services.QuarkusApplication;
 
 @QuarkusScenario
 public class ClientBookResourceIT {
 
+    @QuarkusApplication
+    static RestService app = new RestService();
+
+    @QuarkusApplication
+    static RestService appWithMicrometerDisabled = new RestService().withProperty("quarkus.micrometer.enabled", "false");
+
     @Test
     public void shouldGetBookFromRestClientXml() {
-        given().get("/client/book/xml").then().statusCode(HttpStatus.SC_OK)
+        app.given().get("/client/book/xml").then().statusCode(HttpStatus.SC_OK)
                 .body(is(
                         "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><book><title>Title in Xml</title></book>"));
     }
 
     @Test
     public void shouldGetBookFromRestClientJson() {
-        given().get("/client/book/json").then().statusCode(HttpStatus.SC_OK)
+        app.given().get("/client/book/json").then().statusCode(HttpStatus.SC_OK)
                 .body(is("{\"title\":\"Title in Json\"}"));
     }
 
     @Test
     @Tag("QUARKUS-1376")
     public void notFoundShouldNotReturnAnyResteasyImplementationDetails() {
-        String body = given().get("/notFound").then().statusCode(HttpStatus.SC_NOT_FOUND).extract().body().asString();
+        String body = app.given().get("/notFound").then().statusCode(HttpStatus.SC_NOT_FOUND).extract().body().asString();
         Assertions.assertFalse(body.contains("RESTEASY"),
                 "Not found resource should not return any Resteasy implementation details, but was: " + body);
     }
+
+    @Test
+    @Tag("QUARKUS-2127")
+    public void noNullPointerExceptionForRestClientUsageWithDisabledMicrometer() {
+        appWithMicrometerDisabled.given().get("/client/book/xml").then().statusCode(HttpStatus.SC_OK);
+    }
 }
diff --git a/...b/mongodb/reactive/AbstractMongoDbIT.java → ...active/AbstractMongoClientReactiveIT.java b/...b/mongodb/reactive/AbstractMongoDbIT.java → ...active/AbstractMongoClientReactiveIT.java
@@ -18,10 +18,10 @@
 import io.vertx.mutiny.ext.web.client.HttpRequest;
 import io.vertx.mutiny.ext.web.client.HttpResponse;
 
-public abstract class AbstractMongoDbIT {
+public abstract class AbstractMongoClientReactiveIT {
     @ParameterizedTest
     @ValueSource(strings = { "/reactive_fruits" })
-    public void fruitsEndpoints(String path) {
+    public void insertAndGetSimpleEntity(String path) {
         final Fruit fruit1 = new Fruit("fruit1", "fruit description 1");
         final Fruit fruit2 = new Fruit("fruit2", "fruit description 2");
 
@@ -40,7 +40,7 @@ public void fruitsEndpoints(String path) {
 
     @ParameterizedTest
     @ValueSource(strings = { "/reactive_fruit_baskets" })
-    public void fruitBasketsEndpoints(String path) {
+    public void insertAndGetCompositeEntity(String path) {
         final Fruit fruit1 = new Fruit("fruit1", "fruit description 1");
         final Fruit fruit2 = new Fruit("fruit2", "fruit description 2");
         final FruitBasket fruitBasket1 = new FruitBasket("null", null);

diff --git a/...s/nosqldb/mongodb/reactive/MongoDbIT.java → ...ngodb/reactive/MongoClientReactiveIT.java b/...s/nosqldb/mongodb/reactive/MongoDbIT.java → ...ngodb/reactive/MongoClientReactiveIT.java
@@ -7,7 +7,7 @@
 import io.quarkus.test.services.QuarkusApplication;
 
 @QuarkusScenario
-public class MongoDbIT extends AbstractMongoDbIT {
+public class MongoClientReactiveIT extends AbstractMongoClientReactiveIT {
 
     @Container(image = "${mongodb.image}", port = 27017, expectedLog = "Waiting for connections")
     static MongoDbService database = new MongoDbService();

diff --git a/.../mongodb/reactive/OpenShiftMongoDbIT.java → ...ctive/OpenShiftMongoClientReactiveIT.java b/.../mongodb/reactive/OpenShiftMongoDbIT.java → ...ctive/OpenShiftMongoClientReactiveIT.java
@@ -7,7 +7,7 @@
 import io.quarkus.test.services.QuarkusApplication;
 
 @OpenShiftScenario
-public class OpenShiftMongoDbIT extends AbstractMongoDbIT {
+public class OpenShiftMongoClientReactiveIT extends AbstractMongoClientReactiveIT {
 
     @Container(image = "${mongodb.image}", port = 27017, expectedLog = "Waiting for connections")
     static MongoDbService database = new MongoDbService();

diff --git a/...quarkus/ts/nosqldb/mongodb/MongoDbIT.java → ...kus/ts/nosqldb/mongodb/MongoClientIT.java b/...quarkus/ts/nosqldb/mongodb/MongoDbIT.java → ...kus/ts/nosqldb/mongodb/MongoClientIT.java
@@ -5,8 +5,7 @@
 import java.util.List;
 
 import org.apache.http.HttpStatus;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
+import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.bootstrap.MongoDbService;
 import io.quarkus.test.bootstrap.RestService;
@@ -18,7 +17,7 @@
 import io.restassured.path.json.JsonPath;
 
 @QuarkusScenario
-public class MongoDbIT {
+public class MongoClientIT {
 
     @Container(image = "${mongodb.image}", port = 27017, expectedLog = "Waiting for connections")
     static MongoDbService database = new MongoDbService();
@@ -27,9 +26,17 @@ public class MongoDbIT {
     static RestService app = new RestService()
             .withProperty("quarkus.mongodb.connection-string", database::getJdbcUrl);
 
-    @ParameterizedTest
-    @ValueSource(strings = { "/fruits", "/codec_fruits" })
-    public void fruitsEndpoints(String path) {
+    @Test
+    public void insertAndGetSimpleEntity() {
+        insertAndGetSimpleEntity("/fruits");
+    }
+
+    @Test
+    public void insertAndGetSimpleEntityWithBsonCodec() {
+        insertAndGetSimpleEntity("/codec_fruits");
+    }
+
+    public void insertAndGetSimpleEntity(String path) {
         final Fruit fruit1 = new Fruit("fruit1", "fruit description 1");
         final Fruit fruit2 = new Fruit("fruit2", "fruit description 2");
 
@@ -49,9 +56,17 @@ public void fruitsEndpoints(String path) {
         assertThat(fruits2).isEqualTo(fruits1);
     }
 
-    @ParameterizedTest
-    @ValueSource(strings = { "/fruit_baskets", "/codec_fruit_baskets" })
-    public void fruitBasketsEndpoints(String path) {
+    @Test
+    public void insertAndGetCompositeEntity() {
+        insertAndGetCompositeEntity("/fruit_baskets");
+    }
+
+    @Test
+    public void insertAndGetCompositeEntityWithBsonCodec() {
+        insertAndGetCompositeEntity("/codec_fruit_baskets");
+    }
+
+    public void insertAndGetCompositeEntity(String path) {
         final Fruit fruit1 = new Fruit("fruit1", "fruit description 1");
         final Fruit fruit2 = new Fruit("fruit2", "fruit description 2");
         final FruitBasket fruitBasket1 = new FruitBasket("null", null);

diff --git a/...s/nosqldb/mongodb/OpenShiftMongoDbIT.java → ...sqldb/mongodb/OpenShiftMongoClientIT.java b/...s/nosqldb/mongodb/OpenShiftMongoDbIT.java → ...sqldb/mongodb/OpenShiftMongoClientIT.java
@@ -3,5 +3,5 @@
 import io.quarkus.test.scenarios.OpenShiftScenario;
 
 @OpenShiftScenario
-public class OpenShiftMongoDbIT extends MongoDbIT {
+public class OpenShiftMongoClientIT extends MongoClientIT {
 }
diff --git a/...k/authz/reactive/BaseAuthzSecurityIT.java → ...reactive/BaseAuthzSecurityReactiveIT.java b/...k/authz/reactive/BaseAuthzSecurityIT.java → ...reactive/BaseAuthzSecurityReactiveIT.java
@@ -19,7 +19,7 @@
 import io.vertx.mutiny.ext.web.client.HttpRequest;
 import io.vertx.mutiny.ext.web.client.HttpResponse;
 
-public abstract class BaseAuthzSecurityIT {
+public abstract class BaseAuthzSecurityReactiveIT {
 
     static final String NORMAL_USER = "test-normal-user";
     static final String ADMIN_USER = "test-admin-user";

diff --git a/...thz/reactive/KeycloakAuthzSecurityIT.java → ...tive/KeycloakAuthzSecurityReactiveIT.java b/...thz/reactive/KeycloakAuthzSecurityIT.java → ...tive/KeycloakAuthzSecurityReactiveIT.java
@@ -7,7 +7,7 @@
 import io.quarkus.test.services.QuarkusApplication;
 
 @QuarkusScenario
-public class KeycloakAuthzSecurityIT extends BaseAuthzSecurityIT {
+public class KeycloakAuthzSecurityReactiveIT extends BaseAuthzSecurityReactiveIT {
 
     static final int KEYCLOAK_PORT = 8080;
 

diff --git a/...active/OpenShiftRhSsoAuthzSecurityIT.java → ...penShiftRhSsoAuthzSecurityReactiveIT.java b/...active/OpenShiftRhSsoAuthzSecurityIT.java → ...penShiftRhSsoAuthzSecurityReactiveIT.java
@@ -10,7 +10,7 @@
 
 @OpenShiftScenario
 @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
-public class OpenShiftRhSsoAuthzSecurityIT extends BaseAuthzSecurityIT {
+public class OpenShiftRhSsoAuthzSecurityReactiveIT extends BaseAuthzSecurityReactiveIT {
 
     static final int KEYCLOAK_PORT = 8080;
 

diff --git a/...idcclient/extended/restclient/BaseIT.java → ...lient/extended/restclient/BaseOidcIT.java b/...idcclient/extended/restclient/BaseIT.java → ...lient/extended/restclient/BaseOidcIT.java
@@ -8,7 +8,7 @@
 import io.quarkus.test.services.Container;
 import io.quarkus.test.services.QuarkusApplication;
 
-public abstract class BaseIT {
+public abstract class BaseOidcIT {
     static final String USER = "test-user";
 
     static final int KEYCLOAK_PORT = 8080;

diff --git a/...ient/RestClientInPingPongResourcesIT.java → ...extended/restclient/OidcRestClientIT.java b/...ient/RestClientInPingPongResourcesIT.java → ...extended/restclient/OidcRestClientIT.java
@@ -15,7 +15,7 @@
 import io.restassured.http.ContentType;
 
 @QuarkusScenario
-public class RestClientInPingPongResourcesIT extends BaseIT {
+public class OidcRestClientIT extends BaseOidcIT {
 
     static final String PING_ENDPOINT = "/%s-ping";
     static final String PONG_ENDPOINT = "/%s-pong";

diff --git a/...client/extended/restclient/OpenApiIT.java → ...nded/restclient/OpenApiStoreSchemaIT.java b/...client/extended/restclient/OpenApiIT.java → ...nded/restclient/OpenApiStoreSchemaIT.java
@@ -22,7 +22,7 @@
 import io.vertx.core.json.JsonObject;
 
 @QuarkusScenario
-public class OpenApiIT extends BaseIT {
+public class OpenApiStoreSchemaIT extends BaseOidcIT {
 
     private static String directory = "target/generated/jax-rs/";
     private static final String OPEN_API_DOT = "openapi.";

diff --git a/...ShiftRestClientInPingPongResourcesIT.java → ...restclient/OpenShiftOidcRestClientIT.java b/...ShiftRestClientInPingPongResourcesIT.java → ...restclient/OpenShiftOidcRestClientIT.java
@@ -3,5 +3,5 @@
 import io.quarkus.test.scenarios.OpenShiftScenario;
 
 @OpenShiftScenario
-public class OpenShiftRestClientInPingPongResourcesIT extends RestClientInPingPongResourcesIT {
+public class OpenShiftOidcRestClientIT extends OidcRestClientIT {
 }
diff --git a/...xtended/restclient/SecuredResourceIT.java → ...extended/restclient/SecurityClaimsIT.java b/...xtended/restclient/SecuredResourceIT.java → ...extended/restclient/SecurityClaimsIT.java
@@ -9,7 +9,7 @@
 import io.quarkus.test.scenarios.QuarkusScenario;
 
 @QuarkusScenario
-public class SecuredResourceIT extends BaseIT {
+public class SecurityClaimsIT extends BaseOidcIT {
 
     private static final String SECURED_PATH = "/secured";
     private static final String CLAIMS_FROM_BEANS_PATH = "/getClaimsFromBeans";