From d9dc0ffec3527b2cd8b75fdd7274d19d4cd58d3d Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Thu, 26 Aug 2021 13:48:12 +0300 Subject: [PATCH 001/138] Add an actionable message when attribute of multipart is a file and not accessed as such Closes: #19677 --- .../MultipartPopulatorGenerator.java | 4 ++-- .../runtime/multipart/MultipartSupport.java | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java index f05f9dd80b16bf..e02091633f9024 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java @@ -394,11 +394,11 @@ static String generate(ClassInfo multipartClassInfo, ClassOutput classOutput, In String.class, Class.class, java.lang.reflect.Type.class, MediaType.class, - ResteasyReactiveRequestContext.class), + ResteasyReactiveRequestContext.class, String.class), formStrValueHandle, populate.readStaticField(typeField), populate.readStaticField(genericTypeField), populate.readStaticField(mediaTypeField), - rrCtxHandle)); + rrCtxHandle, formAttrNameHandle)); } } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/MultipartSupport.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/MultipartSupport.java index 979fb51e18c845..1ee6f0fe2278be 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/MultipartSupport.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/MultipartSupport.java @@ -20,6 +20,7 @@ import javax.ws.rs.ext.MessageBodyReader; import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.multipart.FileUpload; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.ServerSerialisers; import org.jboss.resteasy.reactive.server.core.multipart.DefaultFileUpload; @@ -31,6 +32,7 @@ /** * This class isn't used directly, it is however used by generated code meant to deal with multipart forms. */ +@SuppressWarnings("unused") public final class MultipartSupport { private static final Logger log = Logger.getLogger(RequestDeserializeHandler.class); @@ -42,8 +44,22 @@ private MultipartSupport() { @SuppressWarnings({ "unchecked", "rawtypes" }) public static Object convertFormAttribute(String value, Class type, Type genericType, MediaType mediaType, - ResteasyReactiveRequestContext context) { + ResteasyReactiveRequestContext context, String attributeName) { if (value == null) { + FormData formData = context.getFormData(); + if (formData != null) { + Collection fileUploadsForName = formData.get(attributeName); + if (fileUploadsForName != null) { + for (FormData.FormValue fileUpload : fileUploadsForName) { + if (fileUpload.isFileItem()) { + log.debug("Attribute '" + attributeName + + "' of the multipart request is a file and therefore its value is not set. To obtain the contents of the file, use type '" + + FileUpload.class + "' as the field type."); + break; + } + } + } + } return null; } From 55daca504a5a6d982714d93780df5bc2e0e84e7b Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Mon, 30 Aug 2021 07:46:50 +0300 Subject: [PATCH 002/138] Provide actionable error message when non-static inner class used as JAX-RS resource Closes: #19757 --- .../reactive/server/test/InnerClassTest.java | 44 +++++++++++++++++++ .../common/processor/EndpointIndexer.java | 4 ++ 2 files changed, 48 insertions(+) create mode 100644 extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/InnerClassTest.java diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/InnerClassTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/InnerClassTest.java new file mode 100644 index 00000000000000..1513476f85ecff --- /dev/null +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/InnerClassTest.java @@ -0,0 +1,44 @@ +package io.quarkus.resteasy.reactive.server.test; + +import static org.junit.jupiter.api.Assertions.fail; + +import java.util.function.Supplier; + +import javax.enterprise.inject.spi.DeploymentException; +import javax.ws.rs.Path; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.QuarkusUnitTest; +import io.smallrye.common.annotation.Blocking; + +public class InnerClassTest { + + @RegisterExtension + static QuarkusUnitTest test = new QuarkusUnitTest() + .setArchiveProducer(new Supplier<>() { + @Override + public JavaArchive get() { + return ShrinkWrap.create(JavaArchive.class) + .addClasses(Resource.class); + } + }).setExpectedException(DeploymentException.class); + + @Test + public void test() { + fail("Should never have been called"); + } + + @Path("test") + public class Resource { + + @Path("hello") + @Blocking + public String hello() { + return "hello"; + } + } +} diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java index 517018911779c5..0ed75c29ce9afb 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java @@ -199,6 +199,10 @@ public ResourceClass createEndpoints(ClassInfo classInfo) { try { String path = scannedResourcePaths.get(classInfo.name()); ResourceClass clazz = new ResourceClass(); + if ((classInfo.enclosingClass() != null) && !Modifier.isStatic(classInfo.flags())) { + throw new DeploymentException( + "Non static nested resources classes are not supported: '" + classInfo.name() + "'"); + } clazz.setClassName(classInfo.name().toString()); if (path != null) { if (path.endsWith("/")) { From 392cc6f3b22329ff39e0785ea7b94ca627200262 Mon Sep 17 00:00:00 2001 From: Sergey Beryozkin Date: Fri, 27 Aug 2021 15:09:21 +0100 Subject: [PATCH 003/138] Document how to test OIDC with DevServices and minor updates to quarkus-test-keycloak-server --- .../security-openid-connect-dev-services.adoc | 41 +++++-- ...ity-openid-connect-web-authentication.adoc | 48 ++++++++- .../asciidoc/security-openid-connect.adoc | 100 +++++++++++++++++- .../CodeFlowDevModeDefaultTenantTestCase.java | 8 +- ...ication-dev-mode-default-tenant.properties | 5 +- .../it/keycloak/OidcTokenPropagationTest.java | 2 +- .../KeycloakTestClient.java | 7 +- .../KeycloakTestResourceLifecycleManager.java | 1 + 8 files changed, 181 insertions(+), 31 deletions(-) rename test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/{server => client}/KeycloakTestClient.java (92%) diff --git a/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc b/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc index 32c07fdac2dfc8..0f6e5f479beb65 100644 --- a/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc +++ b/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc @@ -11,7 +11,8 @@ This guide covers the Dev Services for OpenId Connect (OIDC) Keycloak provider a == Introduction -Quarkus introduces an experimental `Dev Services For Keycloak` feature which is enabled by default when the `quarkus-oidc` extension is started in dev mode. It starts a Keycloak container and initializes it by registering the existing Keycloak realm or creating a new realm with the client and users for you to start developing your Quarkus application secured by Keycloak immediately. It will restart a container when the `application.properties` or the realm file changes have been detected. +Quarkus introduces an experimental `Dev Services For Keycloak` feature which is enabled by default when the `quarkus-oidc` extension is started in dev mode with `mvn quarkus:dev` and when the integration tests are running in test mode, but only when no `quarkus.oidc.auth-server-url` property is configured. +It starts a Keycloak container for both the dev and/or test modes and initializes them by registering the existing Keycloak realm or creating a new realm with the client and users for you to start developing your Quarkus application secured by Keycloak immediately. It will restart the container when the `application.properties` or the realm file changes have been detected. Additionally, link:dev-ui[Dev UI] available at http://localhost:8080/q/dev[/q/dev] supports this feature with a Keycloak specific page which helps to acquire the tokens from Keycloak and test your Quarkus application. @@ -28,20 +29,32 @@ $ mvn quarkus:dev 2021-06-04 16:22:47,629 INFO [🐳 .io/keycloak/keycloak:14.0.0]] (build-38) Container quay.io/keycloak/keycloak:14.0.0 is starting: 6469f6db9cec2c855fcc6c8db4273944cc9d69e8f6803a0b47eb2d5b8f5b94fd 2021-06-04 16:22:47,643 INFO [org.tes.con.wai.str.HttpWaitStrategy] (build-38) /elastic_lovelace: Waiting for 60 seconds for URL: http://localhost:32812/auth (where port 32812 maps to container port 8080) 2021-06-04 16:23:07,665 INFO [🐳 .io/keycloak/keycloak:14.0.0]] (build-38) Container quay.io/keycloak/keycloak:14.0.0 started in PT5.500489S +2021-06-04 16:23:07,666 INFO [io.qua.oid.dep.dev.key.KeycloakDevServicesProcessor] (build-38) Dev Services for Keycloak started. ... -2021-06-04 16:23:11,155 INFO [io.quarkus] (Quarkus Main Thread) security-openid-connect-quickstart 1.0.0-SNAPSHOT on JVM (powered by Quarkus 999-SNAPSHOT) started in 25.968s. Listening on: http://localhost:8080 -2021-06-04 16:23:11,157 INFO [io.quarkus] (Quarkus Main Thread) Profile dev activated. Live Coding activated. ---- The `quay.io/keycloak/keycloak:14.0.0` Keycloak image is used by default to start a container. `quarkus.keycloak.devservices.image-name` can be used to change the Keycloak image used. +Note that by default, `Dev Services for Keycloak` will not start a new container if it finds a container with a `quarkus-dev-service-keycloak` label and connect to it if this label's value matches the value of the `quarkus.keycloak.devservces.service-name` property (default value is `quarkus`). In such cases you will see a slighty different output: + +[source,shell] +---- +$ mvn quarkus:dev + +2021-08-27 18:42:43,530 INFO [io.qua.dev.com.ContainerLocator] (build-15) Dev Services container found: 48fee151a31ddfe32c39965be8f61108587b25ed2f66cdc18bb926d9e2e570c5 (quay.io/keycloak/keycloak:14.0.0). Connecting to: 0.0.0.0:32797. +2021-08-27 18:42:43,600 INFO [io.qua.oid.dep.dev.key.KeycloakDevServicesProcessor] (build-15) Dev Services for Keycloak started. +... +---- + +Note that you can disable sharing the containers with `quarkus.keycloak.devservices.shared=false`. + Now open the main link:http://localhost:8080/q/dev[Dev UI page] and you will see the `OpenId Connect Card` linking to a `Keycloak` page: image::dev-ui-oidc-keycloak-card.png[alt=Dev UI OpenId Connect Card,role="center"] Click on the `Provider: Keycloak` link and you will see a Keycloak page which will be presented slightly differently depending on how `Dev Services for Keycloak` feature has been configured. -=== Testing Service Applications +=== Developing Service Applications By default the Keycloak page can be used to support the development of a link:security-openid-connect[Quarkus OIDC service application]. @@ -63,8 +76,17 @@ Finally you can click a `Logged in` option if you'd like to log out and authenti [NOTE] ==== -You may need to register a redirect URI for the authorization code flow initiated by Dev UI for Keycloak to work. -Select a `Keycloak Admin` option in the right top corner, login as `admin:admin`, select the test realm and the client which Dev UI for Keycloak is configured with and add `http://localhost:8080/q/dev/io.quarkus.quarkus-oidc/provider` to `Valid Redirect URIs`. +You may need to register a redirect URI for the authorization code flow initiated by Dev UI for Keycloak to work because Keycloak may enforce that the authenticated users are redirected only to the configured redirect URI. It is recommended to do in production to avoid the users being redirected to the wrong endpoints in case which might happen if the correct `redirect_uri` parameter in the authentication request URI has been manipulated. + +If Keycloak does enforce it then you will see an authentication error informing you that the `redirect_uri` value is wrong. + +In this case select the `Keycloak Admin` option in the right top corner, login as `admin:admin`, select the test realm and the client which Dev UI for Keycloak is configured with and add `http://localhost:8080/q/dev/io.quarkus.quarkus-oidc/provider` to `Valid Redirect URIs`. If you used `-Dquarkus.http.port` when starting Quarkus then change `8080` to the value of `quarkus.http.port`. + +If the container is shared between multiple applications running on different ports then you will need to register `redirect_uri` values for each of these applications. + +You can set the `redirect_uri` value to `*` only for the test purposes, especially when the containers are shared between multiple applications. + +`*` `redirect_uri` value is set by `Dev Services for Keycloak` when it creates a default realm, if no custom realm is imported. ==== ==== Implicit Grant @@ -109,6 +131,13 @@ image::dev-ui-keycloak-sign-in-to-service.png[alt=Dev UI OpenId Connect Keycloak Set a relative service endpoint path, click on `Sign In To Service` and you will be redirected to Keycloak to enter a username and password in a new browser tab and get a response from the Quarkus application. +=== Running the tests + +You can run the tests against a Keycloak container started in a test mode in a link:continuous-testing[Continuous Testing] mode. + +It is also recommended to run the integration tests against Keycloak using `Dev Services for Keycloak`. +Please see link:security-openid-connect#integration-testing-keycloak-devservices[Testing OpenId Connect Service Applications with Dev Services] and link:security-openid-connect-web-authentication#integration-testing-keycloak-devservices[Testing OpenId Connect WebApp Applications with Dev Services] for more information. + === Keycloak Initialization You do not need to configure `quarkus-oidc-keycloak` to start developing your Quarkus Keycloak `OIDC` applications with the only exception being that `quarkus.oidc.application-type=web-app` has to be set in `application.properties` to give the `Keycloak` page a hint it needs to show an option to `Sign In To Service`. diff --git a/docs/src/main/asciidoc/security-openid-connect-web-authentication.adoc b/docs/src/main/asciidoc/security-openid-connect-web-authentication.adoc index 0a6f47b01151c7..ec0c6ea9578f65 100644 --- a/docs/src/main/asciidoc/security-openid-connect-web-authentication.adoc +++ b/docs/src/main/asciidoc/security-openid-connect-web-authentication.adoc @@ -582,7 +582,7 @@ It applies to ID tokens but also to access tokens in a JWT format if the `web-ap Please see link:security-openid-connect-client#token-propagation[Token Propagation] section about the Authorization Code Flow access token propagation to the downstream services. [[oidc-provider-client-authentication]] -=== Oidc Provider Client Authentication +== Oidc Provider Client Authentication `quarkus.oidc.runtime.OidcProviderClient` is used when a remote request to an OpenId Connect Provider has to be done. It has to authenticate to the OpenId Connect Provider when the authorization code has to be exchanged for the ID, access and refresh tokens, when the ID and access tokens have to be refreshed or introspected. @@ -784,10 +784,46 @@ Additionally, `OidcWiremockTestResource` set token issuer and audience to `https `OidcWiremockTestResource` can be used to emulate all OpenId Connect providers. +[[integration-testing-keycloak-devservices]] +=== Dev Services for Keycloak + +Using link:security-openid-connect-dev-services[Dev Services for Keycloak] is recommended for the integration testing against Keycloak. +`Dev Services for Keycloak` will launch and initialize a test container: it will create a `quarkus` realm, a `quarkus-app` client (`secret` secret) and add `alice` (`admin` and `user` roles) and `bob` (`user` role) users, where all of these properties can be customized. + +First prepare `application.properties`. You can start with a completely empty `application.properties` as `Dev Services for Keycloak` will register `quarkus.oidc.auth-server-url` pointing to the running test container as well as `quarkus.oidc.client-id=quarkus-app` and `quarkus.oidc.credentials.secret=secret`. + +But if you already have all the required `quarkus-oidc` properties configured then you only need to associate `quarkus.oidc.auth-server-url` with the `prod` profile for `Dev Services for Keycloak`to start a container, for example: + +[source,properties] +---- +%prod.quarkus.oidc.auth-server-url=http://localhost:8180/auth/realms/quarkus +---- + +If a custom realm file has to be imported into Keycloak before running the tests then you can configure `Dev Services for Keycloak` as follows: + +[source,properties] +---- +%prod.quarkus.oidc.auth-server-url=http://localhost:8180/auth/realms/quarkus +quarkus.keycloak.devservices.realm-path=quarkus-realm.json +---- + +Finally write a test code the same way as it is described in the <> section above. +The only difference is that `@QuarkusTestResource` is no longer needed: + +[source, java] +---- +@QuarkusTest +public class CodeFlowAuthorizationTest { +} +---- + [[integration-testing-keycloak]] -=== Keycloak +=== KeycloakTestResourceLifecycleManager -If you work with Keycloak then you can test against a live Keycloak instance by adding the following dependency: +If you need to do the integration testing against Keycloak then you are encouraged to do it with <>. +Use `KeycloakTestResourceLifecycleManager` for your tests only if there is a good reason not to use `Dev Services for Keycloak`. + +Start with adding the following dependency: [source,xml] ---- @@ -798,7 +834,9 @@ If you work with Keycloak then you can test against a live Keycloak instance by ---- -and configure `maven.surefire.plugin` as follows: +which provides `io.quarkus.test.keycloak.server.KeycloakTestResourceLifecycleManager` - an implementaion of `io.quarkus.test.common.QuarkusTestResourceLifecycleManager` which starts a Keycloak container. + +And configure `maven.surefire.plugin` as follows: [source,xml] ---- @@ -909,5 +947,5 @@ include::{generated-dir}/config/quarkus-oidc.adoc[opts=optional] * https://openid.net/connect/[OpenID Connect] * https://tools.ietf.org/html/rfc7519[JSON Web Token] * link:security-openid-connect-client[Quarkus - Using OpenID Connect and OAuth2 Client and Filters to manage access tokens] -* link:security-openid-connect-dev-services[Dev Services for OpenId Connect] +* link:security-openid-connect-dev-services[Dev Services for Keycloak] * link:security[Quarkus Security] diff --git a/docs/src/main/asciidoc/security-openid-connect.adoc b/docs/src/main/asciidoc/security-openid-connect.adoc index 38fac3a4ef2b5b..f86abda1dcf0f1 100644 --- a/docs/src/main/asciidoc/security-openid-connect.adoc +++ b/docs/src/main/asciidoc/security-openid-connect.adoc @@ -508,7 +508,7 @@ Note it is also recommended to use `quarkus.oidc.token.audience` property to ver Please see link:security-openid-connect-client#token-propagation[Token Propagation] section about the Bearer access token propagation to the downstream services. [[oidc-provider-authentication]] -=== Oidc Provider Client Authentication +== Oidc Provider Client Authentication `quarkus.oidc.runtime.OidcProviderClient` is used when a remote request to an OpenId Connect Provider has to be done. If the bearer token has to be introspected then `OidcProviderClient` has to authenticate to the OpenId Connect Provider. Please see link:security-openid-connect-web-authentication#oidc-provider-client-authentication[OidcProviderClient Authentication] for more information about all the supported authentication options. @@ -602,10 +602,98 @@ public class BearerTokenAuthorizationTest { Testing your `quarkus-oidc` `service` application with `OidcWiremockTestResource` provides the best coverage as even the communication channel is tested against the Wiremock HTTP stubs. `OidcWiremockTestResource` will be enhanced going forward to support more complex Bearer token test scenarios. +[[integration-testing-keycloak-devservices]] +=== Dev Services for Keycloak + +Using link:security-openid-connect-dev-services[Dev Services for Keycloak] is recommended for the integration testing against Keycloak. +`Dev Services for Keycloak` will launch and initialize a test container: it will create a `quarkus` realm, a `quarkus-app` client (`secret` secret) and add `alice` (`admin` and `user` roles) and `bob` (`user` role) users, where all of these properties can be customized. + +First you need to add the following dependency: + +[source,xml] +---- + + io.quarkus + quarkus-test-keycloak-server + test + +---- + +which provides a utility class `io.quarkus.test.keycloak.client.KeycloakTestClient` you can use in tests for acquiring the access tokens. + +Next prepare your `application.properties`. You can start with a completely empty `application.properties` as `Dev Services for Keycloak` will register `quarkus.oidc.auth-server-url` pointing to the running test container as well as `quarkus.oidc.client-id=quarkus-app` and `quarkus.oidc.credentials.secret=secret`. + +But if you already have all the required `quarkus-oidc` properties configured then you only need to associate `quarkus.oidc.auth-server-url` with the `prod` profile for `Dev Services for Keycloak`to start a container, for example: + +[source,properties] +---- +%prod.quarkus.oidc.auth-server-url=http://localhost:8180/auth/realms/quarkus +---- + +If a custom realm file has to be imported into Keycloak before running the tests then you can configure `Dev Services for Keycloak` as follows: + +[source,properties] +---- +%prod.quarkus.oidc.auth-server-url=http://localhost:8180/auth/realms/quarkus +quarkus.keycloak.devservices.realm-path=quarkus-realm.json +---- + +Finally write your test which will be executed in JVM mode: + +[source,java] +---- +package org.acme.security.openid.connect; + +import io.quarkus.test.junit.QuarkusTest; +import io.quarkus.test.keycloak.client.KeycloakTestClient; +import io.restassured.RestAssured; +import org.junit.jupiter.api.Test; + +@QuarkusTest +public class BearerTokenAuthenticationTest { + + KeycloakTestClient keycloakClient = new KeycloakTestClient(); + + @Test + public void testAdminAccess() { + RestAssured.given().auth().oauth2(getAccessToken("alice")) + .when().get("/api/admin") + .then() + .statusCode(200); + RestAssured.given().auth().oauth2(getAccessToken("bob")) + .when().get("/api/admin") + .then() + .statusCode(403); + } + + protected String getAccessToken(String userName) { + return keycloakClient.getAccessToken(userName); + } +} +---- + +and in native mode: + +[source,java] +---- +package org.acme.security.openid.connect; + +import io.quarkus.test.junit.QuarkusIntegrationTest; + +@QuarkusIntegrationTest +public class NativeBearerTokenAuthenticationIT extends BearerTokenAuthenticationTest { +} +---- + +Please see link:security-openid-connect-dev-services[Dev Services for Keycloak] for more information about the way it is initialized and configured. + [[integration-testing-keycloak]] -=== Keycloak +=== KeycloakTestResourceLifecycleManager + +If you need to do some integration testing against Keycloak then you are encouraged to do it with <>. +Use `KeycloakTestResourceLifecycleManager` for your tests only if there is a good reason not to use `Dev Services for Keycloak`. -If you work with Keycloak then you can test against a live Keycloak instance by adding the following dependency: +Start with adding the following dependency: [source,xml] ---- @@ -616,7 +704,9 @@ If you work with Keycloak then you can test against a live Keycloak instance by ---- -and configure `maven.surefire.plugin` as follows: +which provides `io.quarkus.test.keycloak.server.KeycloakTestResourceLifecycleManager` - an implementaion of `io.quarkus.test.common.QuarkusTestResourceLifecycleManager` which starts a Keycloak container. + +And configure the Maven Surefire plugin as follows: [source,xml] ---- @@ -917,5 +1007,5 @@ Note Quarkus `web-app` applications always require `quarkus.oidc.client-id` prop * https://openid.net/connect/[OpenID Connect] * https://tools.ietf.org/html/rfc7519[JSON Web Token] * link:security-openid-connect-client[Quarkus - Using OpenID Connect and OAuth2 Client and Filters to manage access tokens] -* link:security-openid-connect-dev-services[Dev Services for OpenId Connect] +* link:security-openid-connect-dev-services[Dev Services for Keycloak] * link:security[Quarkus Security] diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeDefaultTenantTestCase.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeDefaultTenantTestCase.java index fe82852eafb169..5cb10d6bf605f9 100644 --- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeDefaultTenantTestCase.java +++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeDefaultTenantTestCase.java @@ -40,15 +40,15 @@ public void testAccessAndRefreshTokenInjectionDevMode() throws IOException, Inte try { webClient.getPage("http://localhost:8080/protected"); - fail("Exception is expected because auth-server-url is not available and the authentication can not be completed"); + fail("Exception is expected because by default the bearer token is required"); } catch (FailingHttpStatusCodeException ex) { // Reported by Quarkus - assertEquals(500, ex.getStatusCode()); + assertEquals(401, ex.getStatusCode()); } - // Enable auth-server-url + // Enable 'web-app' application type test.modifyResourceFile("application.properties", - s -> s.replace("#quarkus.oidc.auth-server-url", "quarkus.oidc.auth-server-url")); + s -> s.replace("#quarkus.oidc.application-type=web-app", "quarkus.oidc.application-type=web-app")); HtmlPage page = webClient.getPage("http://localhost:8080/protected"); diff --git a/extensions/oidc/deployment/src/test/resources/application-dev-mode-default-tenant.properties b/extensions/oidc/deployment/src/test/resources/application-dev-mode-default-tenant.properties index 989e5ebc777c83..2853d435e676f6 100644 --- a/extensions/oidc/deployment/src/test/resources/application-dev-mode-default-tenant.properties +++ b/extensions/oidc/deployment/src/test/resources/application-dev-mode-default-tenant.properties @@ -1,9 +1,6 @@ -#quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus quarkus.oidc.client-id=quarkus-web-app quarkus.oidc.credentials.secret=secret -quarkus.oidc.application-type=web-app - -quarkus.keycloak.devservices.enabled=false +#quarkus.oidc.application-type=web-app quarkus.log.category."com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleSheet".level=FATAL diff --git a/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java index 758e65299401cc..1f025d7793c838 100644 --- a/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java +++ b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java @@ -7,7 +7,7 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.test.keycloak.server.KeycloakTestClient; +import io.quarkus.test.keycloak.client.KeycloakTestClient; import io.restassured.RestAssured; @QuarkusTest diff --git a/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestClient.java b/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/client/KeycloakTestClient.java similarity index 92% rename from test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestClient.java rename to test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/client/KeycloakTestClient.java index f1120c07776b86..5c551dd34c4c05 100644 --- a/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestClient.java +++ b/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/client/KeycloakTestClient.java @@ -1,11 +1,10 @@ -package io.quarkus.test.keycloak.server; +package io.quarkus.test.keycloak.client; import org.eclipse.microprofile.config.ConfigProvider; import org.keycloak.representations.AccessTokenResponse; import io.quarkus.runtime.configuration.ConfigurationException; import io.quarkus.test.common.DevServicesContext; -import io.quarkus.test.junit.QuarkusIntegrationTest; import io.restassured.RestAssured; public class KeycloakTestClient implements DevServicesContext.ContextAware { @@ -24,10 +23,6 @@ public KeycloakTestClient() { } - public KeycloakTestClient(QuarkusIntegrationTest.Context testContext) { - this.testContext = testContext; - } - public String getAccessToken(String userName) { return getAccessToken(userName, getClientId()); } diff --git a/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestResourceLifecycleManager.java b/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestResourceLifecycleManager.java index f64f8cfac0c3b1..dd8c8eb963c436 100644 --- a/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestResourceLifecycleManager.java +++ b/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestResourceLifecycleManager.java @@ -95,6 +95,7 @@ public Map start() { Map conf = new HashMap<>(); conf.put("keycloak.url", KEYCLOAK_SERVER_URL); + conf.put("quarkus.oidc.auth-server-url", KEYCLOAK_SERVER_URL + "/realms/" + KEYCLOAK_REALM); return conf; } From 5db60deb47613729b97453025cd4af7a0cbfe0c9 Mon Sep 17 00:00:00 2001 From: Falko Modler Date: Sat, 28 Aug 2021 23:06:51 +0200 Subject: [PATCH 004/138] Fix wrong TestInfo test method in @Before/AfterEach Fixes #19747 --- .../it/main/QuarkusTestCallbacksTestCase.java | 35 ++++++++++++++++--- ...leAnnotationCheckerBeforeEachCallback.java | 3 ++ .../test/junit/QuarkusTestExtension.java | 25 ++++++++----- 3 files changed, 50 insertions(+), 13 deletions(-) diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java index 404630cb8cec56..af121205b21c2a 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java @@ -3,11 +3,16 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import java.lang.reflect.Method; -import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; @@ -22,11 +27,29 @@ @QuarkusTest public class QuarkusTestCallbacksTestCase { + @BeforeEach + void beforeEachWithTestInfo(TestInfo testInfo) throws NoSuchMethodException { + checkBeforeOrAfterEachTestInfo(testInfo, "beforeEachWithTestInfo"); + } + + @AfterEach + void afterEachWithTestInfo(TestInfo testInfo) throws NoSuchMethodException { + checkBeforeOrAfterEachTestInfo(testInfo, "afterEachWithTestInfo"); + } + + private void checkBeforeOrAfterEachTestInfo(TestInfo testInfo, String unexpectedMethodName) throws NoSuchMethodException { + assertNotNull(testInfo); + String testMethodName = testInfo.getTestMethod().get().getName(); + assertNotEquals(testMethodName, + QuarkusTestCallbacksTestCase.class.getDeclaredMethod(unexpectedMethodName, TestInfo.class)); + assertTrue(testMethodName.startsWith("test")); + } + @Test @TestAnnotation @Order(1) public void testTestMethodHasAnnotation() { - + assertTrue(SimpleAnnotationCheckerBeforeEachCallback.testAnnotationChecked); } @Test @@ -36,11 +59,13 @@ public void testBeforeClass() { } @Test + @TestAnnotation @Order(3) public void testInfoTestCase(TestInfo testInfo) throws NoSuchMethodException { - Assertions.assertEquals(testInfo.getTestClass().get(), QuarkusTestCallbacksTestCase.class); - Assertions.assertEquals(testInfo.getTestMethod().get(), - QuarkusTestCallbacksTestCase.class.getDeclaredMethod("testInfoTestCase", TestInfo.class)); + assertEquals(testInfo.getTestClass().get(), QuarkusTestCallbacksTestCase.class); + Method testMethod = testInfo.getTestMethod().get(); + assertEquals(testMethod, QuarkusTestCallbacksTestCase.class.getDeclaredMethod("testInfoTestCase", TestInfo.class)); + assertEquals(1, testMethod.getAnnotationsByType(TestAnnotation.class).length); } @Target({ METHOD }) diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/SimpleAnnotationCheckerBeforeEachCallback.java b/integration-tests/main/src/test/java/io/quarkus/it/main/SimpleAnnotationCheckerBeforeEachCallback.java index 85927763f10852..8e9447609046b7 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/SimpleAnnotationCheckerBeforeEachCallback.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/SimpleAnnotationCheckerBeforeEachCallback.java @@ -7,6 +7,8 @@ public class SimpleAnnotationCheckerBeforeEachCallback implements QuarkusTestBeforeEachCallback { + static boolean testAnnotationChecked; + @Override public void beforeEach(QuarkusTestMethodContext context) { // make sure that this comes into play only for the test we care about @@ -26,5 +28,6 @@ public void beforeEach(QuarkusTestMethodContext context) { throw new IllegalStateException( "Expected to find annotation @TestAnnotation on method test method testTestMethodHasAnnotation"); } + testAnnotationChecked = true; } } diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java index 6a4574d813a6da..deb9fc5f555409 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Deque; import java.util.HashMap; +import java.util.IdentityHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -196,6 +197,8 @@ public void run() { } }; + private final IdentityHashMap tcclMethodCache = new IdentityHashMap<>(); + static { ClassLoader classLoader = QuarkusTestExtension.class.getClassLoader(); if (classLoader instanceof QuarkusClassLoader) { @@ -430,6 +433,7 @@ public void close() throws IOException { } tm.close(); } finally { + tcclMethodCache.clear(); GroovyCacheCleaner.clearGroovyCache(); if (hangTaskKey != null) { hangTaskKey.cancel(true); @@ -988,13 +992,13 @@ private Object runExtensionMethod(ReflectiveInvocationContext invocation try { Class testClassFromTCCL = Class.forName(extensionContext.getRequiredTestClass().getName(), true, Thread.currentThread().getContextClassLoader()); - Method newMethod = determineTCCLExtensionMethod(invocationContext, testClassFromTCCL); + Method newMethod = determineTCCLExtensionMethod(invocationContext.getExecutable(), testClassFromTCCL); boolean methodFromEnclosing = false; // this is needed to support before*** and after*** methods that are part of class that encloses the test class // (the test class is in this case a @Nested test) if ((newMethod == null) && (testClassFromTCCL.getEnclosingClass() != null)) { testClassFromTCCL = testClassFromTCCL.getEnclosingClass(); - newMethod = determineTCCLExtensionMethod(invocationContext, testClassFromTCCL); + newMethod = determineTCCLExtensionMethod(invocationContext.getExecutable(), testClassFromTCCL); methodFromEnclosing = true; } if (newMethod == null) { @@ -1035,8 +1039,9 @@ private Object runExtensionMethod(ReflectiveInvocationContext invocation cloneRequired = false; } else if (TestInfo.class.isAssignableFrom(theclass)) { TestInfo info = (TestInfo) arg; + Method newTestMethod = determineTCCLExtensionMethod(info.getTestMethod().get(), testClassFromTCCL); replacement = new TestInfoImpl(info.getDisplayName(), info.getTags(), Optional.of(testClassFromTCCL), - Optional.of(newMethod)); + Optional.of(newTestMethod)); } else if (clonePattern.matcher(className).matches()) { cloneRequired = true; } else { @@ -1089,13 +1094,16 @@ private Object runExtensionMethod(ReflectiveInvocationContext invocation } } - private Method determineTCCLExtensionMethod(ReflectiveInvocationContext invocationContext, Class c) + private Method determineTCCLExtensionMethod(Method originalMethod, Class c) throws ClassNotFoundException { - Method newMethod = null; + Method newMethod = tcclMethodCache.get(originalMethod); + if (newMethod != null) { + return newMethod; + } while (c != Object.class) { - if (c.getName().equals(invocationContext.getExecutable().getDeclaringClass().getName())) { + if (c.getName().equals(originalMethod.getDeclaringClass().getName())) { try { - Class[] originalParameterTypes = invocationContext.getExecutable().getParameterTypes(); + Class[] originalParameterTypes = originalMethod.getParameterTypes(); List> parameterTypesFromTccl = new ArrayList<>(originalParameterTypes.length); for (Class type : originalParameterTypes) { if (type.isPrimitive()) { @@ -1106,7 +1114,7 @@ private Method determineTCCLExtensionMethod(ReflectiveInvocationContext Thread.currentThread().getContextClassLoader())); } } - newMethod = c.getDeclaredMethod(invocationContext.getExecutable().getName(), + newMethod = c.getDeclaredMethod(originalMethod.getName(), parameterTypesFromTccl.toArray(new Class[0])); break; } catch (NoSuchMethodException ignored) { @@ -1115,6 +1123,7 @@ private Method determineTCCLExtensionMethod(ReflectiveInvocationContext } c = c.getSuperclass(); } + tcclMethodCache.put(originalMethod, newMethod); return newMethod; } From 870c730dcd7f08b899dba6611c1fce1d607b9356 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Mon, 30 Aug 2021 14:16:12 +0300 Subject: [PATCH 005/138] Provide actionable error message when RESTEasy can't pick Provider constructor This can happen when a provider is registered via a Dynamic Feature. Unfortunately the error message can not contain the class which causes the problem because it is not passed into the method, the class itself is not present in fields which can be accessed at this point and the StackWalker does not have access to parameters Closes: #19756 --- .../resteasy/common/runtime/QuarkusInjectorFactory.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java index cc4bf24082679e..695c001f11b966 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java @@ -28,6 +28,10 @@ public class QuarkusInjectorFactory extends InjectorFactoryImpl { @SuppressWarnings("rawtypes") @Override public ConstructorInjector createConstructor(Constructor constructor, ResteasyProviderFactory providerFactory) { + if (constructor == null) { + throw new IllegalStateException( + "Unable to locate proper constructor for dynamically registered provider. Make sure the class has a no-args constructor and that it uses '@Context' for field injection if necessary."); + } log.debugf("Create constructor: %s", constructor); return new QuarkusConstructorInjector(constructor, super.createConstructor(constructor, providerFactory)); } From 2e6fb151707164ce2f44b0d202d70baf7992ba59 Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Mon, 30 Aug 2021 13:43:27 +0200 Subject: [PATCH 006/138] fix issue in dev ui logstream that register listener on all select elements. Signed-off-by:Phillip Kruger --- .../deployment/src/main/resources/dev-static/js/logstream.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js b/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js index aa3e4cd1f74f29..86fcb0883c56d6 100644 --- a/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js +++ b/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js @@ -736,7 +736,7 @@ function populateLoggerLevelModal(loggerNamesArray, levelNamesArray){ tbodyLevels.append(row); } - $('select').on('change', function() { + $('.logleveldropdown').on('change', function() { changeLogLevel(this.value, $(this).find('option:selected').text()); }); @@ -764,7 +764,7 @@ function getTextClass(level){ function createDropdown(name, level, levelNamesArray){ - var dd = ""; // Populate the dropdown for (var i = 0; i < levelNamesArray.length; i++) { var selected = ""; From b0fbae4f50393344d532cc948cf7cfc27bd22256 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Mon, 30 Aug 2021 15:38:33 +0200 Subject: [PATCH 007/138] Remove two classes that has been moved to test-framework/artemis --- .../it/artemis/ArtemisTestResource.java | 39 ------------------- .../it/artemis/ArtemisTestResource.java | 39 ------------------- 2 files changed, 78 deletions(-) delete mode 100644 integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java delete mode 100644 integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java diff --git a/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java b/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java deleted file mode 100644 index 822bd492209d15..00000000000000 --- a/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.quarkus.it.artemis; - -import java.nio.file.Paths; -import java.util.Collections; -import java.util.Map; - -import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; -import org.apache.commons.io.FileUtils; - -import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; - -public class ArtemisTestResource implements QuarkusTestResourceLifecycleManager { - - private EmbeddedActiveMQ embedded; - - @Override - public Map start() { - try { - FileUtils.deleteDirectory(Paths.get("./target/artemis").toFile()); - embedded = new EmbeddedActiveMQ(); - embedded.start(); - } catch (Exception e) { - throw new RuntimeException("Could not start embedded ActiveMQ server", e); - } - return Collections.emptyMap(); - } - - @Override - public void stop() { - if (embedded == null) { - return; - } - try { - embedded.stop(); - } catch (Exception e) { - throw new RuntimeException("Could not stop embedded ActiveMQ server", e); - } - } -} diff --git a/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java b/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java deleted file mode 100644 index 822bd492209d15..00000000000000 --- a/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.quarkus.it.artemis; - -import java.nio.file.Paths; -import java.util.Collections; -import java.util.Map; - -import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; -import org.apache.commons.io.FileUtils; - -import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; - -public class ArtemisTestResource implements QuarkusTestResourceLifecycleManager { - - private EmbeddedActiveMQ embedded; - - @Override - public Map start() { - try { - FileUtils.deleteDirectory(Paths.get("./target/artemis").toFile()); - embedded = new EmbeddedActiveMQ(); - embedded.start(); - } catch (Exception e) { - throw new RuntimeException("Could not start embedded ActiveMQ server", e); - } - return Collections.emptyMap(); - } - - @Override - public void stop() { - if (embedded == null) { - return; - } - try { - embedded.stop(); - } catch (Exception e) { - throw new RuntimeException("Could not stop embedded ActiveMQ server", e); - } - } -} From 979d0c7730d77216309328249c671e24f2d708c1 Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Mon, 30 Aug 2021 15:38:39 +0200 Subject: [PATCH 008/138] Show Dev UI Tile even if there is no Guide. Signed-off-by:Phillip Kruger --- .../vertx/http/deployment/devmode/console/DevConsole.java | 4 +++- .../resources/dev-templates/tags/nonActionableExtension.html | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java index e251597a536a1f..b7942c1ddd55bb 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java @@ -175,9 +175,11 @@ public void sendMainPage(RoutingContext event) { Template simpleTemplate = engine.getTemplate(namespace + "/embedded.html"); boolean hasConsoleEntry = simpleTemplate != null; boolean hasGuide = metadata.containsKey("guide"); + boolean isUnlisted = metadata.containsKey("unlisted") + && (metadata.get("unlisted").equals(true) || metadata.get("unlisted").equals("true")); loaded.put("hasConsoleEntry", hasConsoleEntry); loaded.put("hasGuide", hasGuide); - if (hasConsoleEntry || hasGuide) { + if (!isUnlisted) { if (hasConsoleEntry) { Map data = new HashMap<>(); data.putAll(globalData); diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/nonActionableExtension.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/nonActionableExtension.html index 46f101d8d54260..739970bd2bca7b 100644 --- a/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/nonActionableExtension.html +++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/nonActionableExtension.html @@ -1,4 +1,3 @@ -{#if it.metadata?? && !it.metadata.unlisted??}
@@ -31,5 +30,4 @@
{/if}
-
-{/if} \ No newline at end of file + \ No newline at end of file From e419671f069e69baec3227d87c218b68d702d2c1 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Mon, 30 Aug 2021 17:02:38 +0300 Subject: [PATCH 009/138] Use the proper config values when pulling base image for native build using Jib Fixes: #19771 --- .../container/image/jib/deployment/JibProcessor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java index 83e01cdd95028e..5b6dd138834425 100644 --- a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java +++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java @@ -161,7 +161,7 @@ public void buildFromNative(ContainerImageConfig containerImageConfig, JibConfig "The native binary produced by the build is not a Linux binary and therefore cannot be used in a Linux container image. Consider adding \"quarkus.native.container-build=true\" to your configuration"); } - JibContainerBuilder jibContainerBuilder = createContainerBuilderFromNative(containerImageConfig, jibConfig, + JibContainerBuilder jibContainerBuilder = createContainerBuilderFromNative(jibConfig, nativeImage, containerImageLabels); setUser(jibConfig, jibContainerBuilder); setPlatforms(jibConfig, jibContainerBuilder); @@ -517,7 +517,7 @@ private JibContainerBuilder createContainerBuilderFromLegacyJar(JibConfig jibCon } } - private JibContainerBuilder createContainerBuilderFromNative(ContainerImageConfig containerImageConfig, JibConfig jibConfig, + private JibContainerBuilder createContainerBuilderFromNative(JibConfig jibConfig, NativeImageBuildItem nativeImageBuildItem, List containerImageLabels) { List entrypoint; @@ -532,8 +532,8 @@ private JibContainerBuilder createContainerBuilderFromNative(ContainerImageConfi try { AbsoluteUnixPath workDirInContainer = AbsoluteUnixPath.get("/work"); JibContainerBuilder jibContainerBuilder = Jib - .from(toRegistryImage(ImageReference.parse(jibConfig.baseNativeImage), containerImageConfig.username, - containerImageConfig.password)) + .from(toRegistryImage(ImageReference.parse(jibConfig.baseNativeImage), jibConfig.baseRegistryUsername, + jibConfig.baseRegistryPassword)) .addFileEntriesLayer(FileEntriesLayer.builder() .addEntry(nativeImageBuildItem.getPath(), workDirInContainer.resolve(BINARY_NAME_IN_CONTAINER), FilePermissions.fromOctalString("775")) From 7d1a76a63b155714956b8f6b5b36bb69da8194cf Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Mon, 30 Aug 2021 09:30:26 +0300 Subject: [PATCH 010/138] Use testcontainers (if applicable) to determine if Docker working Fixes: #19741 --- .../quarkus/deployment/IsDockerWorking.java | 185 +++++++++++++----- 1 file changed, 131 insertions(+), 54 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/IsDockerWorking.java b/core/deployment/src/main/java/io/quarkus/deployment/IsDockerWorking.java index 1fce4a2260d01d..038cb3ea28ebbc 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/IsDockerWorking.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/IsDockerWorking.java @@ -6,11 +6,14 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.lang.reflect.InvocationTargetException; import java.net.Socket; import java.net.URI; import java.net.URISyntaxException; +import java.util.List; import java.util.function.BooleanSupplier; import java.util.function.Function; +import java.util.function.Supplier; import org.jboss.logging.Logger; @@ -20,90 +23,164 @@ public class IsDockerWorking implements BooleanSupplier { private static final Logger LOGGER = Logger.getLogger(IsDockerWorking.class.getName()); - private final boolean silent; + private final List strategies; public IsDockerWorking() { this(false); } public IsDockerWorking(boolean silent) { - this.silent = silent; + this.strategies = List.of(new TestContainersStrategy(silent), new DockerHostStrategy(), + new DockerBinaryStrategy(silent)); } @Override public boolean getAsBoolean() { - //remote docker detection - //we don't want to pull in the docker API here - //so we just see if the DOCKER_HOST is set and we can connect to it - //we can't actually verify it is docker listening on the other end - String dockerHost = System.getenv("DOCKER_HOST"); - if (dockerHost != null && !dockerHost.startsWith("unix:")) { - try { - URI url = new URI(dockerHost); - try (Socket s = new Socket(url.getHost(), url.getPort())) { - return true; - } catch (IOException e) { - LOGGER.warnf("Unable to connect to DOCKER_HOST URI %s, make sure docker is running on the specified host", - dockerHost); - } - } catch (URISyntaxException e) { - LOGGER.warnf("Unable to parse DOCKER_HOST URI %s, it will be ignored for working docker detection", dockerHost); + for (Strategy strategy : strategies) { + Result result = strategy.get(); + if (result == Result.AVAILABLE) { + return true; } } + return false; + } - try { - if (!ExecUtil.execSilent("docker", "-v")) { - LOGGER.warn("'docker -v' returned an error code. Make sure your Docker binary is correct"); - return false; - } - } catch (Exception e) { - LOGGER.warnf("No Docker binary found or general error: %s", e); - return false; + public static class IsDockerRunningSilent extends IsDockerWorking { + public IsDockerRunningSilent() { + super(true); } + } - try { - OutputFilter filter = new OutputFilter(); - if (ExecUtil.exec(new File("."), filter, "docker", "version", "--format", "'{{.Server.Version}}'")) { - LOGGER.debugf("Docker daemon found. Version: %s", filter.getOutput()); - return true; - } else { + private interface Strategy extends Supplier { + + } + + /** + * Delegates the check to testcontainers (if the latter is on the classpath) + */ + private static class TestContainersStrategy implements Strategy { + + private final boolean silent; + + private TestContainersStrategy(boolean silent) { + this.silent = silent; + } + + @Override + public Result get() { + try { + Class dockerClientFactoryClass = Thread.currentThread().getContextClassLoader() + .loadClass("org.testcontainers.DockerClientFactory"); + Object dockerClientFactoryInstance = dockerClientFactoryClass.getMethod("instance").invoke(null); + boolean isAvailable = (boolean) dockerClientFactoryClass.getMethod("isDockerAvailable") + .invoke(dockerClientFactoryInstance); + return isAvailable ? Result.AVAILABLE : Result.UNAVAILABLE; + } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { if (!silent) { - LOGGER.warn("Could not determine version of Docker daemon"); + LOGGER.debug("Unable to use testcontainers to determine if Docker is working", e); + } + return Result.UNKNOWN; + } + } + } + + /** + * Detection using a remote host socket + * We don't want to pull in the docker API here, so we just see if the DOCKER_HOST is set + * and if we can connect to it. + * We can't actually verify it is docker listening on the other end. + * Furthermore, this does not support Unix Sockets + */ + private static class DockerHostStrategy implements Strategy { + + @Override + public Result get() { + + String dockerHost = System.getenv("DOCKER_HOST"); + if (dockerHost != null && !dockerHost.startsWith("unix:")) { + try { + URI url = new URI(dockerHost); + try (Socket s = new Socket(url.getHost(), url.getPort())) { + return Result.AVAILABLE; + } catch (IOException e) { + LOGGER.warnf( + "Unable to connect to DOCKER_HOST URI %s, make sure docker is running on the specified host", + dockerHost); + } + } catch (URISyntaxException e) { + LOGGER.warnf("Unable to parse DOCKER_HOST URI %s, it will be ignored for working docker detection", + dockerHost); } - return false; } - } catch (Exception e) { - LOGGER.warn("Unexpected error occurred while determining Docker daemon version", e); - return false; + return Result.UNKNOWN; } } - public static class OutputFilter implements Function { - private final StringBuilder builder = new StringBuilder(); + private static class DockerBinaryStrategy implements Strategy { + + private final boolean silent; + + private DockerBinaryStrategy(boolean silent) { + this.silent = silent; + } @Override - public Runnable apply(InputStream is) { - return () -> { - try (InputStreamReader isr = new InputStreamReader(is); - BufferedReader reader = new BufferedReader(isr)) { + public Result get() { + try { + if (!ExecUtil.execSilent("docker", "-v")) { + LOGGER.warn("'docker -v' returned an error code. Make sure your Docker binary is correct"); + return Result.UNKNOWN; + } + } catch (Exception e) { + LOGGER.warnf("No Docker binary found or general error: %s", e); + return Result.UNKNOWN; + } - for (String line = reader.readLine(); line != null; line = reader.readLine()) { - builder.append(line); + try { + OutputFilter filter = new OutputFilter(); + if (ExecUtil.exec(new File("."), filter, "docker", "version", "--format", "'{{.Server.Version}}'")) { + LOGGER.debugf("Docker daemon found. Version: %s", filter.getOutput()); + return Result.AVAILABLE; + } else { + if (!silent) { + LOGGER.warn("Could not determine version of Docker daemon"); } - } catch (IOException e) { - throw new RuntimeException("Error reading stream.", e); + return Result.UNAVAILABLE; } - }; + } catch (Exception e) { + LOGGER.warn("Unexpected error occurred while determining Docker daemon version", e); + return Result.UNKNOWN; + } } - public String getOutput() { - return builder.toString(); + public static class OutputFilter implements Function { + private final StringBuilder builder = new StringBuilder(); + + @Override + public Runnable apply(InputStream is) { + return () -> { + + try (InputStreamReader isr = new InputStreamReader(is); + BufferedReader reader = new BufferedReader(isr)) { + + for (String line = reader.readLine(); line != null; line = reader.readLine()) { + builder.append(line); + } + } catch (IOException e) { + throw new RuntimeException("Error reading stream.", e); + } + }; + } + + public String getOutput() { + return builder.toString(); + } } } - public static class IsDockerRunningSilent extends IsDockerWorking { - public IsDockerRunningSilent() { - super(true); - } + private enum Result { + AVAILABLE, + UNAVAILABLE, + UNKNOWN } } From 95c6533df0d906a56ef23bae7fe4271f2cf5762e Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Mon, 30 Aug 2021 18:46:51 +0200 Subject: [PATCH 011/138] Some Swagger UI Screenshots updates in the Guides Signed-off-by:Phillip Kruger --- .../openapi-swaggerui-guide-screenshot01.png | Bin 64406 -> 67946 bytes .../openapi-swaggerui-guide-screenshot02.png | Bin 75716 -> 78515 bytes .../reactive-routes-guide-screenshot01.png | Bin 37923 -> 49345 bytes .../images/spring-web-guide-screenshot01.png | Bin 54268 -> 64063 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/src/main/asciidoc/images/openapi-swaggerui-guide-screenshot01.png b/docs/src/main/asciidoc/images/openapi-swaggerui-guide-screenshot01.png index 41e2f61e433fa9401ebbe2e6f72fa8f86211b67c..1b590c7e847f8d111b36622e293b5c4360cbd27b 100644 GIT binary patch literal 67946 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 literal 64406 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Û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∋%^T&G&HvtzQvu&c=KV! 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

?3P}5d=poy*U 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

X6S5DAiS)9Lx%WeC0 zh*4^rWOaHXwpm{EUU69@(VaU7Y2_NFpx3i4G5WNCu5WFk{_CNmYF~aY8|R_+5LuVz zW_M*x&g1pNOcig`*#WeE<-K$tGtA-D5iw85C?3t6eLg?5&V1no2OVL;SUg%nSjM8g z&nLrHhIAAt1Qyn30AO?dNzb`g+RVnbaT@Alll&!|RByKcFj9G$f* z$hEdXYQb@$M4tW&-=`dMq&OkT?1^DpMPWdIUUSt?N?UAps;^yVMYUW>pt5uKw@g`J zTCZ#KQd-b$U=LA8EDmN+!^r^A`|3U|pJcr55B7y7C0EG`5KKZRqiA^ys{^f64a)hy zzvCUVaw$J?c)a>1Lo+M7WJ##I*!-_5Y>jr&tR}Ct{cv)w5BwKG#2TpEvLgjmR4vEU zCDn-gMY&vj0SmcesCvwI6zR(Z{(6~D;(M*fGM7n~c9S4ul!l`)v#5a0K;d-w3DGir zDUx0Hv)P_4Bq2x`KfQlU%~T!EtDve|ET=tMUfl(w70)*j{UwWlNr=CO*ZzadzJAjN(v^P~$5EXYf_G29)f6BgHv~$s9o^dW4{+oOE0R6&>l7T; z)=`~50+*Juqf8%?D=-723k#%Y#;?;nz-D)MYr6>8{AGo-8`1l9oow)P^NE|$T-MfP zJ2}Jpv$L-6#VA=vsXKUoOyN2M3@_S#d5WBW_?Jum|0ZbFwxZWDBdFp;mM8gmcE{M# z7>>a$EG+1q=XWHdF!ruImLG}w&4o6JNGqqp^OZUYL0S!=*!0N}f%g~B5oG;Mk}u~! zSOH9=)U50JU5@eRKmNbWe||=O2W9@({QvW@dYC)&Scvaqm0vdq?R?ReQ`gD_jCy7P z2=^wdyjiBsz5I^c_%W65qV&N25|IDnL!>S>N!np;>ThJ(IZgk5=DYo8F?lblM5c1t zt~~rhW{QT9fx(86)ko^MV~x`Z#$0#%o5ePtMwZR==Z$;|P2?EZo3Ifi#rTU>(7JEk zTL=<%57mFPFx(`o^P0|nSaNK!!5@Tjj0T+GI(kRSISqcrP*p7PPC4Pgg*D532031^ zizW110aL;mLzOc;F%rU+6hLu$`yNfi^d@!U;hlN@!UONoLD?}JdtR{#>YDKSq04Cy z%Poi_vffnZYFa~5y2oNs{{mFjL#xj`MqSxh?B_l=VA7O*i40U^P%1$V#1 z6&Vrczv_kK+jQt?$`n$hza3lQr=)kX*C&bHU4DC4xYWYBg`_;P5}5$qGhvF* z69qMyWidr>sk2+QRu~j6o=#{HG=nhc>chAh^LAB^TAb8POOaUIaW50FLh({_ZF=W} ztC#v7>C(}tOXb%KrRxJ_KR;J?HLi8#7ktgN*fCo)Ub0~b7iEKf{vux>%(cen03oCV z46Qprmb|JJ_RD2))qj2Z!AS(kTWQk-Q6#rU*;4W!yO&> zc6qsP>>EGLb5N>iHKV6N+E)D#!|1vncRnn}u~5*cQ;}naf;7w5Kq@3$OiB}Du@Ryk zdYCE%=nEqi!2$y2{w*l~61?5DxVSglr=Pze<$#+g8iMQE8C8%57t*G9tvy7A&xCJb z#p9)7*|B8WU{XMsh9ajU+#F{oUA`;fY)68`lo!79GO7AbHFybGEa#UjGb?M^#lZ?u zUVRvZMyOS&^0IIMySR97>NCHM!3nV;T~PAQJe~un6uZ5sTvM+BH_#dJ@Ytg6{$sQ# zx&GjXcBe*>&R@%w{G^Dz;aFbNtD6=J^!sphSfTah~DSbe0(+6eyVmS z4v;u48!czJ@a>aS!7uY$>%AySZR|iv9^&Q6O&WpN+%2W??8T#EeMg-SN4SUyay7S?o*8>_;lFLl@_wp=vxV$nw;>qaazDLgo_AmP>NDjVUEhQoeE z#U1O*m;2&Nb&aH)=%0+Hhs9;Q<}jLKEZwu0OKy!|*R9pTc<8t~+&hbiUwFpdY9}l) z`s{uZl7W$t@h**az8+0`^(l2Vt>#r~{X5zYrp5C%dk8FMH&SS=sFV*RyI^{;a+&P2Hp57*-j{nnP=#j&sjEX{T40TshXKvRItsh4KE!1;anqu!*s6zTfhP;eVw!(?V7qW(VlgUuk` zoRx;Ggf2p{hXWA@z&GRbE48_2nI53_v_)Pu*M`jx9&}N-d=XjpuY3g!oou7=L4M8 zzEID_ixnwR6vtM)=N`p+ApSXs{{As&e;X+9>{d_y;`IDGGf44rma z_C|*D$1@&JM3|_I@^Oz8O%^Rmxyspud8MW=eK;IgmQpe?mIAo^fbv3RGFt-1akyk@ z7wg=|`$yKzuSPh{?GJT4ofZH~^t5p)*Cm)OUGFXY^_Tyc9n@6|%hsKf1{143dsSbw zwK%6f6tc#A*Bo2FK3U;DP@}t(pWVf3_h;e|Z`uRHqr8{!wh@t3`YJ8c! zT7Pd|$x+*sBy>wPd0w>7iW+?Yc;Sq^I1SxR#Nx!d`Sh42e)Jb^5gyJ(3enKCR=l3K zEr#}->=x8gdfy@8qMI3LXn0RvcbufBr~mw!sXK4RM`1rvvlspmPU;;{VG?GpNn8>A zTbw87(kQzS&~N}%_8Tg5ksTO~a$y$fY~|0i2=9}5D*Tr&%~4X&?QJ?iJ{H1$I0Xpu zYv|QN1^a2)3al9@Q|w_rdQ}211N;-cdPiy^M_R{;xTupU%jXvu6dtHdf=6-z6##z4qg2f{XOl3$bSBz6_>3X}V zh>5EH31Hh{<=Zc?c{hlgI*W;S$eL%cPw#OUB}p)>pRt_LBqlUyZ4PI3)4i+S z-s8>46!pRPqOqbwFL69w8D?U0F%D}#@o05_M8>oFfdLs$D4OSW!v}BCMzSPb8WB{HQy*+-)Vh`l&17lt*jpQ^0BqD# z(9jUpF!0!V$Wo+Qk_oSqR9|=#3-~AuQ}B@nKZIzInGayE%4eSvcVFrMF6*y4>Dly` z70tJr^bt5|qMGYK^62-yrGBXxjP59?KB5Q8{IISdsz~hF&Vu^q=H{Y}>?M^c+cT_66L$z`M&U#ubSrOxPYeZXh|L21(e7SDY=ls7n79b@bJwl) zi}WgCMQU#)ZTD9+j=KhH;mvA%sqpCn6?|+X^dzd(za;GdbxbK{cw@y>6W!prteq5a z+fnGYD0s4l?CsVYi?jz@8<&~tBZLcI!q;$N=NKVk>wl{E`m`#nRN6JHvfP9dO4D0U zQk$XSZdYAIomU zO7A$bG70zcW$e(&hvMD4{bJpnJGq6dk66b-is!XgNqhcZe0-?+nDpj+hV#*Se>%kb^{LBYl?sFMDCj9 z@RJuk-*C!>mLW4$j#n>oO@$sIjF*DKYi7Zr*x<=8~W;#5ZzfMT8>7iS`S=@pJy zb^(ksIdhldn8hnMD#%-6ikrLM)7u{sQFdKNi{l#%I5mB38%4Y)N>93DZ64o{vaKwD zKsJa9cY5>QBrTN-%>2+-{uAzb;vu(fopkXH6Z07sJxi zrIKPp>|-^Bq#Zu7vH3-kpy(Q~R#9})e*SBpTTral-yOC6a>|jY;-x%20o~zZUnj<1 zV`x*=t3}-qGr_xsG;v}6$u%C+vB`F$Z`irxgi?*31GWm;k7y}%3L|*;=JOXm3>Qys z2}$5=GKemzcWTT&DsrT?WiIs|mCJf-4}Xzbx&ll+X(beZuWaa#BYprf`F*}L0v2ta zOhVrGC%(4~ozrriEN&(n`lB2Ye-2m1LFK8~M{JHz%4DJ!GhO}ZSh2fS`=vMT#)f9j zT6Tj&#Tr0F*@GD+WVOp+kIb1WI#7!sFWchJA7Pjr(t9txrwhU5Vs2r&M;j zf78SGNaaF6eRF;ivG$>7^Uw6zcSl%X^(IJ9%m zFMKWDRGTyrdUvFY+oCPLYzU0eRtft1*moLnXS4tvA+J7iIYFdC$1-Ok7 zbZX!}6xA%Qy)g+hXsK^Z@$eJ{Kx?!MS6R}{90|Qk8{f)n41*_$*tv0C=v4W8vkfew z7nPJwv>?QO7_*Y$$EAws)R!OLE^3cEb}XIQj6pN*?M*%PTGU29ga}(38kK!6Xe@px zFc&4Yr+h&O+AZu3F1ZmzO9L4v4qy~`;AXXOTm_%;l<7BO%BQsr{9!xHhj{&T@x?+E zYWUW%Q=bT8f;ny?12ZlB-Ei9U6_4WQ>H5RhV`^iVDhZbKfPirjAJfEACY8F{jrdo= z<7G=9R;yKx`sx zAZ-_YD6k5vaoE}(DZNbY7w+LO*7ooL7M3!+&B*!T7R}K}Ev8`XUd`G72{_`(i(Z(9 zKYqIZQoeJv6zCfTsP@fabQ!T*4`lAUIOI0v-#1(Q4hTVfJHwumiC5e zvNw+etMBLBo7n;x>J~k>_1Bk^>(t1Wr!66wQZozhg?|C<<;OicvOzR}ci~QI`tpJ* z*AKDPoV1NAnJ+WP9t%O>=4+9b%A3O%X<@Hz+44YN@+^{K+f**LYuaB2hSqwmzW%CT zAvay`d1$4zhRLW}X$W4zOSlj>Q|G^{HEJ8Y8js<2HDeJTH^&(@-i=L1&A;L|t@D(a z;8MFcvlA#&>S5hGT9WPQbf(8<5Y7CHr#F+3kHPTAY-*-WYfo8oZ>v0}iHcH>&at!L z8pzHXYS!Xlvz=lnqP$%ESBSf4^kcUC$U65mXr=$D$ConCIKtEuchI4K1H`+ELse4~ zN1I|5K_{G~BFJkQ!Qo$(a_aITT)o0)F39=bbD$P&NjpT+w@j;~3{39C<5h(D^N$x>oaZX`Bs##Ci1~rw4l3ZrGrjH?G|7tb@o; z=;9s3@jSjiGAfd8T9>PFE^WG9EGr_u(1Kf|*y7t4F$^6IjqE@y$i;5D0I0t=(aOz0 zqrT&sTIW9WLx;L|%%xzk`uzeP%O_QDA6@2#)io9=5!+u`H{gBDW#AZFq+b>fW#Mmb zplt`$jk;wj48=A`XbtxICab;?ciF9MFdHMcyB-6fNJwJsbqb&SR^y}jaJ2q0W!Ac1 z^Zjr>!tp0k=XbAmdrwH}k|Ln5axN;4jfxLkx`s|r?U&)x5tQ(Aq3shL!*&7LAG zmUfB%q*(dAPrx`I$keIB2Q0V}Rnbp*rkp1ZadY<&&AQCp z3O7O9E|1!IS5k~sIig<^pr)={Wq`+MSyvvk8~g)4kCM@AYC=~+1aur7k(|=zIoRcb z7opWPf}uf0M6)@+8l_8Zp{x_bY8COav3(Oj`~AJOS`cH!qwHSGZ03c|@UI(z?_1*w zJktKEVCZAj7MdemF$7JpH(b&RDNfaw!e}mu0+-{wB~F!Qr_#b#DRQL%zLu?mvpee7N06xCF+jCg9j9Z4yy zPD-reyjSUg&kWpKihj*UF;G}?^zxqsfwB>Jw z7n(viUE|Ui`0h<}#U+v@%?dfF7UJlJ0pm%v^JgK5Pta5|VHu!~Se6Tcv z*;t>RNJXAV^=eO{>p`JL%4P*RI|D_E$=Rs=c=P5< z{~0JhSd?rJ!MB1qf}nAv{YV&E#-twyI!WJKYUfS}-dGOPBG5a z0i?oK&IxiA(Ie;589CBDw3lGYJbo)P(=1Bkc?zJ_dq~$FMN3y{zNhBJ?asv(WVkgZ zV_M@5nhE=Khs0GE6rlN;A=9d4nzj-`nxt{@q7yg}x+ex8BTKI&#xQ{Cuzd1b2*%+Z zN^P14QwGA;6KoH2r8l5ACW$sG955@>t5@)+RR9(;$**sTb`%&t!S2$w^OxFs;CyLN z*}6mlp(JI017x_rVI-Vgn`Rr_=zcPnQqxYMUS547V3|+oew|1AU1>C^q0zXS_v3Um z{j@8e)y-yZ<3__e2iLd#IF|~)vF<$a|BAEyIIgPK7wn(fAdAx*n8=Cx@xJ@{rppO0 z(aXo8PV-a7-O`0eAHs|}2Xc*T=KKj@b<>LS#9c+@SA@S=sjJHo>3|iB_(5%|lY`r!yr23s^zRol$mK zZpnE;%_F3xEZVd30hf?O0tgpRe2>79a*RC}i&#QE>14}r=Kdoi;M2|3ueD7BuYEFz zRZK$pF}fWg0_Hgzbp?r9X;#hBHj$;r&9LdC4b>RJ>*_sCdAU6ovFGjwmCxNzMM{mE z;(@evdnERjNV)@L63Ch4j4_4>1T={Shlh_1In~Uk2K->Ij^JYROV$VV-j(L;XgEyg z<8Xj+T+;=->VkOr* ziGyZCOygA2J28Pw)12OB2IF!mfdJ(gm;!;v*?V*aM1WKty16}PCHtDL%iT`WsZIiT z0Iz^E4i`V+CjiziGvyEK7NB}fE#|gDht!f%!c69JkrBD_%Mh?dLJtI^Is$07w zu5x)Eue1IpnwgEwUWhy9**(%ylCL2fIsB!$cWqI!++#nDCp8c!jfmlf^4CXLQwE>sl^^iM0TerCpjH(OG3*={r^-U!wMT>)Mr z&SyAU=v{(BL5m-1nxF2EOXwE+waO%47FsCLn>xa^sbv>RS;a7ut5<54xW*1sq_33M ziPzpXcU*i+TWnP8$)Pj!hEQx$m+Tl~b5&rWVsF?87NRF~yyA!Ymo zm2aAp-kGowL&YwcM+0R{B6unAoSlZoc7jt}W`?=ra@PR)n}RWW;{@1*!=)ecqa-X{ zTF?e$pUdv1atCSpl4?tEK&?k=@rk(0Rl^31jUL&GZoqdTyq^sPa=cg|XRr_hbfftVcirT#hj6I{eAn%@# z++=<=;3H_`6StcC&IU|3Y{eVyzC#ge%6#agzpP5`BcE#hd&)5*+{(*ihT=L~o*i}2 zl#SzEk$e^C!S2h0BW^mMru&K_YW_ws`|{;XaxLEYgEA(*6c6%d&McM0%(noXQ*5&q6<&EHdYajf^P>^dls16X<*COs>F18 z*b>DAI_n;OuuBrHa*XlF;!D1P@Z$Xy4}TH1E{35OAQBn(5m3TfmH7j8DZ}fx-N;+h z=9r}}FHzjRZbmKPy71~1^2D1$jQ5NdtPwePq|~Z=+~<#}W7$}b14ksat4-ojE66c5 z3VM&Cn!|;z9UacykA19f{{e>7oRrl=--#o3CT(Dk?zyMo&!TLXd$WtYQs0wJ>!;J< z5de&V7d?~2y>}1uV_~7cAHo?9aRCu>SySg~t;aUi%8iL$y~KW{OdX!XntXvaJ~lH6 z0(u;OiHgb(DxD3bVl7aqm^RpJZJ~0Ap$K7;smx2WDpRmamb90*X#E}qB|5q#c`mJ3 z(2$F}D66x*443LF?Yh>u!8D4J<=z`vlg8c#H6J|-jPe5l))sJ!39VwJH>tg39r(O( zuWfa_%S)W@uj$R5jGF}kdap)##MdUBdnQ{eu4*}N+iZ7!$*Q=jBPcd*!W2w^)C_|i!vbUV%son%4c*TrA_GiRI-G#JByD?)sRSMMVs*;~Vw_J^{F{RyZ z`S_7IK3$9$giZ#C2O^+b8%xo?y*7E?$O*a|1`T8H2g>pTKIBEgltvv>WKya>4(KAQ zQg*y$04g3~zXh2b9PIS{i@U~2X9~B1QfnD)>MMby(<;NEW0`W4-PYFDx3aA($DYjS z)I2L>Vpvv4b6)Sbis@qfpjCg@CiGd6lt3ZbzINy6qWek61jaOBS7Mq#{r3LxKv#|Z zQ165Wx9XJp&QizNab_pzvFFajj5f{bg5gL6RU*xQdgB>VScgz0I_@p{Zga3^7nj%hk^!=LeT3LLkb{c{^yVs{L;YDp; zA~Fnmd_QeLSd4bh%4j<7M@G@6q!??mOe0v~0K)f{1q&LR={ko)$5t;VOEoeedC=a+ zBI>+5>-X`+DDr0yL_y@3F*_^m_Nd34Klt<)_E=(_(Hfj5Jydp0;=&&v{*4PjzPQD8 zG8*OIR;rC|*RQa$d0VoU0w)Oj;Z%UC4bFD?OuBtC``2xL({g7l9ZuE-XgbMQGT;$= zLWxlWI~&!Sj&T(@Dd0!p`{K97EuUo-Kt@t&gLhWh&a0JwDlZ(P%$NIEAemm7#)i6X zqA(>+vN+%m-r2|U=$o0FqZ`G|f7N8!hoK3zB? zcai7mO#UTsqEazXEWyYMfjBQ)dI2SjY5%u$v;X^4qJO`_*e$_4>&>rYg4z?Jv5XCKzMO5NB{Z|knQyPDm=)LM>mJA4}C za3e)>i?iwZ>Q9gjj9C0LY(sbQE)}Ux^Pm2aM;3>5{vKQqZ!)E3>$<>u*M!2}wa6@h5`DW4;1-w3;HjTR0 zNIF+|WN}8o_y*@HD)rf0rOe2Nm#2La^bX~goO&HtwW#y7_KZUhmYineRL13p9*s(f z+E3*B$yD~mjWtIYVM+YraSnkEG{p;qdY6tNmfiM1?8r8&467yCkFAZT!y>z_aSQd} zm3-}ML2HXOF}I*adj9-SAZ)oneY$WQ{oR2%^JQelFT9_;68 z1kALD#i@Q0gx-`|o=uLwU}nhoq3hpFN7_ZDa{-V-Vg*Z@}@t2B-4Tjo zns?{U$)u<4Q(kQf>Q!F%5LT{3kUtdvzW>+7S0zfp*Zxq_{Btq(mdCfp8Gru4_9Y`j ziza5O=~KXq6*=2aS-xTF1}hJ~IuBOBck2JVZ+D@|5btm2JJ~}5ceaf13$5>|+kWME5++jPH?%}Wca}D!z@Slo?*nbLMN(KL6EN0DO zw4Q;c>NhtxfBbl~bDr^kqBV)Z$i8|t<$VO)@yp1`wZ@Qb53fOGNBw!m-}kMChK4se z(Io@!rJ=-D@e^-Kq`V?fE4Vmr+3hb0(*l z+9U#Qnnk$Sk~1aXL;c-Qy&6mW=MEJo|3(d?his#k6DoRDPS6D+D{<7Z5&BHNrEauz zgc5!PkdqVi20kuAdChFjsysAtn<)7_D(V(jU^F_kKNWxXv`y-$vhV}pEyvjs#NxN^ zP+YO8XN_@@km0;0?e};FIXVR&W9fSGR`JMd3oa#n1M%K7o$&nm39U~6d9YmeC3~!I z_lVm9X=D~MA*GS(UTeNBf#y4VA74_1+L+z=Pu&!Hj>*Ja*@jI+f=nYeX|?Z1iWix3OmeKl%tDF3^m;kNhN{DTp3SKD%;`GPM;TMS`KHU0oD}sb~(cT8i3dU80Q5HQJz(iz#7hK0{Vp8EDTZX8}spI@o z!uP|d7*~B=DjPn-UwsPMZ1}eQ1mqv$K==I!F7N{V{m1 z1yxg6zit%O2Gij!S-{Bfoj7b|?|_9&c}i$gQ~`h2yKT4Rb#t~QCmW6A4+f7oTaO}5 z1)z(c3qKhMN#RoOWVuCEkEj)+6Vijcb~ulqq(|cu)xB`aSm;2o{DfPdX`)Yyv)-qQmF$Hl@rboT!)9=(=bM4xsa0{Xrl(1dTJtN3y%aAt z0x?k?BmE~l-WAfF^PL&48q`CsDe{l>xxVkdJug1-a4+GFo z?Md0(*&JFYKd9D(!5@phrnRe$M-F`)UpYOn5tIfhgnJJywoIzYBvl>7wkgqciXz^x z^-p1@sFaJxN|dDxcLe0*Z1>Gv_fWc*4*>?RQJ%C8LGNj z#%Yhsw|x3>tUconyoPVWC0`6o)Yibori~vLJ|@+@YfTYp3?Dxp>DFcBnMlfW;9q*2 z2SzrU4m2zReEi*ODy44Tswu&w8I>hl7p4zI zu;cq-Qgtd*NeQmD_6XG!e?McvMArLc!CwfLAN9J`oL3|RL_0{Tx;TU1meZEBP5v#E zTN^mW*J2dbr{$zsY+9cfoq1Qo+?=niB`Zlz?z+gX;a(2RULtXk=JrZ=&$y z{>Lrv5N*l3usnAw%syHzSMtTYdV^J-9jQy+Py}h{^+xl%6}tqQi(hM$#ZY>$Js^dN zkss~V{bO7_&I`ENf}+eO6xmxZlLM+9P+g(Lj_fK!aGIj#y_9tz_ekLnsWOj~Hehh` zzU6^d362w1Y}Cg+WOYz#Pi0h+hOmrOU`b!yp2O{Zxmu*CMUDaGG}l!$(lM^a2{<%XX!|WWv{m0A?0-`2)7{ zJ!F~=O=i>mjQq7U|A*A~k~sI{W-)>i>GdS%hS2ppG33)hpsMZ{;iIO%}cC+ced z)-a3YV%v9_5LVJdYz@+0%6-6%oyrFZLHp?C3%u6+9Zq{Mo(0XHMAu-T47RE|VRP!$ z9$DoVQ}=@c{sx1qMXze*8SwR^)yc|p&wi3!@CT^9PB>6Npff*UZg8%Em!<+vF)1}t zcdcl;6kUxwNb4IU>rMnySPf&rL6 zV)9Iwiw$sOs0dB$*`O*RIdRPPsp9nf z(oM*M#EgeJUpH!tceuWt-UfcYG<@KaS_{Pf5ZTdXNg`+PHn5f0;U6~Pqa#9F4lpW_ zFlPATzU>D*U&GXsIIry$RQ>MPN9L&Pl&KHH)#eY=LTU_GYX{VGu4}&{f<54xrI;9V zj$0}jHHeAqeO4@6s&}!rikg~keV2Bg)~WBHIGNy991ne$UQ!TaHm{TaCOr)v8jvf7 zLIt@V8Z2HSO#^T-#4<4ObLuI9%e*9H2lw&?siI&(a7|~V9W&%9+tP&&nex8?M9UN9bc1vyT981+A zAD0+Q-hYCh`ZDc*m2;CCSXZ`$?SvO5hM!ah;}gWv_ydK>eD#JMjtcMVN#jPCD(7Za z3isiQL2YdVt*8NU8Fi*Uk{}S3^~|gBU{|J9wI`8<1<)nY;5-<_L|;d3_wLwbt;g6V zyAo4@KxNenuN4q%bBdEHH{TW~mb$dE)7&KlZ!1y#;G_=$0 zff+D*@WVomiV-eePOdV>qtEEhzC8Ap&Iw56nxQ}gK))zpwr8};dfm{w)~;3LyJcm# z_zSX(FEA)}B1t>OKYil{KJ<|3qIFTT_<7*ez8o2tE@dIqbT=B(tj92u4cL0h@Psri zqa?3}%FbfkLs<4?sLK^@`S9xFPnPr1TNo>n`evx+*)>ln8caYY9vR$a4mi~tB+)BjY5?F@qzX3{)0;Y1&FhAt&Lq>U3bo!!CauTYPt6S>-Y6*Jh`5VT$=v$;nJVe zB}e;cQ1IVwZf+VHk?!ZaSf1idy(P(|q zN3ONsmFX8^{eRb;|2qu-hn~*!PZjbzoBzXs{}&|xZp2U#oK z=PuwW;od0|mGb*xd+r;Jr#~8CY-S<)(jI?1kEq^g*D)=4zIAjHB}n+p>Mmb>y4gBt zu3O>U%3aMOaS|ib*2wx;h-9B4p0Z>B8|x3B-u)lMy$4iNUAHc*uLZGyD2Q|g=}o$H zMT$}tq&Mlk_Y$Il^r9d&6s7mxLntD>Nrw=6hlCbLAV9b~zTfxXbG~!Vz4ssIzvE{x z28^AZWUsaNnrqHyKJ%HQvr=MS@Jj9$<`hJ);N~=VuSggoMU9K7O*pN&-;xKvT0?#8 zld&}cF23;Z#VywzAe#!0@b()t!d>)Y;d+DNCtnFL*@q5}1G}V}%WX#ytPJpKTr2lF z2Zg`KG*M!|VVoX#skb4HI=2*Ovdkb)#+N?pF}4;JkP%dCtviIlcDK6(Pf7amK%35N z)5eTj(!ja088+LL?)zd*?sMsan!mnL*DSl{G&6YE=^%$bB)j>~zn&LnfX&yB4TOdS zm}6`5(-cbmgidWIeh~*65m(`O)@ipl|(W>m^$5dj>I{HjNF+dMTw^9HLkC)S4nN2RjTb|MH9A?OX1;+(q%>U zS6ifA7B|oBwDHfpX9q9e_cJ#fdOC+V*S$D5?XMBeVFBEc;=&qlXvZy2M$v(-hG@z9 z)AzU?&W@BOjp?mieDLGb&diG0#KHy^!=7(~;~KIWnXfk>QN2>t5A<9>Kg=et^KL!a zbw<9FjxDqsDMB}h(#T_H=%$J%r(Uee$?Ef$7iR_5ekv1|*w?ZR|7B^@_pWGry#&P9 zeZJnFXsRhqX81my+R+mp+aY8t?^s%kgv>$>44aqQNhh>?&5pZ+CvVbUQ>r4YUverr zscp*+WSH^+n{kC4bjoZwK+?4>SMIff!=Mrqi+ic9-#Xl(V@Pq9jZsepf4g2~T)r&v zVI9!Q{S&yI?}ZrZjq8sMr*FU|;Huoq(gQ8(t7+P2f|=iJh3%gsML0XFPaY3- z7Fo9N2G@G$W0|b`16I(ETAa-|{B!lvc)RJz#wKJAEt#BEV)bfOMT>>EAabTTJuRxX zt5tRMff^01jWf?Vd?9^6GM;-aE9D*uH%$XFhCD0ED#sFL>|Um^y_mJJ-C0er4IeUJ z_6!UNl~KsZXYnyHF>R^_x5U)>=r3lnd;} zw5;Mh>Ca!xKjI`K?%}1mPr_yR)JgyFh->>^yzwSqzT0xFRs+yZF|D5QAZ1IxE*P?7 z1Q$Zg)p_I3Lg&q@92DO?l5aGf z98-=u3Z;=Wm}BqmZKK3m)ic-GlcsEkDoUr8tz&iU&INn2r)Y<5KuopNdo?`zQeCksxMpp)~>KC6H!$pv`KGAp;V)0d_xlv zO`bg3`V~GGm@;ya2hj56!|Q-NwLsV4dQzmH6}W_wZ!O7nRWJ1|LbUAIiCtKA$A}r0 za^zU!b&5O>acrWha>c0{4kh18nKzJle>M{3(dB`9ca+FZb>%^nqoHyUUxSx_-IAY0 zF;?{<9#we$_((4$Ceg=nJz5E)60E$lQdY?0xi&y}0_4~al9iVickMV6dE~pO?QoLi znB$KPx|&ZeE*omfHbBB_;AhQ+`Gp+9<2aRV!yzqM+2QH??)#+bnsFSNr2WK@Kc;Nff?GcscLKyPv{cFazMmgdO80OrUX!jw13HJ8Jk zQSJjSoTxJ?iN%vxlz^k6b;^4hJlC2f>y*{iWh=^Xre9Et^L5428kJuY`J~n|cRs7$ zq3sv>OF}@yvlm6f7xuQOJ%;1*?AEDo2DgbB3U1lI7kyb#-99C%MQgfjIDfNl`JU73 zEzIgRsn`+D#b6w^tT3p|$Dkzp>&p*f+l!-5wO{Wms2RfQK%>9ICA0|(sW0bzB~Gm$ zaJ32xeSCa$8+=Mtqt_h3a_gD}jvw}MPF-F*zZoRl&ZEuVv|qPSiZ4>va-@Y zG<)CvqFsE#!;6G%`Jvy|M*1vkDRjKR%xfoAbD)koo=21YG%LT?Q0949)JM7svcIDtoP8=#$O0z8|U35A-Qa!ludu(gO3%JcARzVDNv2O znLY?VX8O84AuDUMUCo=}Z@!M9&^JZ&HO{{}u%D~^lsZ?j|EX)+fg^VZe$PT9Z!}`F zPhRcVwXO4|O**fK^?czc&K82&aVx06YXoIq49L<8QQz_@h>JbVACLYV{lD}wvGkK% zhg?r83I5I{XNJFv)BiiJu*5w{R0DD`P6$YB{4iHGu`9l@16@>r2q7J z|4WDUfB!B2C4@{c=BZ8fOf(P9T$i*;`T7=cio5t(+h?4nO$}a~EAduULew({P9zL> zky&x6eb8KR9V+(4+ti{XYIs33)Kuz^-@kD3d}5r<(?Tr9hGrvw#n4FnaC^W5yg}}+ zAkE6PE`7h{rf08|C^ljjT(W0@Zi=c3@Ys}e^t71y1`<%u4S^JBusm{QnAT| zuVw-LMt*2$e4bSWqF-6l6)a7m@gu;&N{$@LaffqW%5_b(*GXZtNT~EZYi9ifF^?Zc zr@GDm5#bYB-98ojWo)jM!bI#QOY${F?`zOWAP&@`I%j8@+4&x`vrmuDO15NspvzxJ zt7$Wwnf!SdI7xMWXB-w`76Aqnb1CZv~zTE(fr_cZ@&_qM)>?=Eq z!}F>iyMl*x5897l^Mh0O;_{O017$)yK^+=)QiN^b61l3j=`tdX7Wk>wyY*TO@D=|$ z<_wOz^->z2wHjIGdmVrDSuJYjEMPvK9%$bQO70*9-u5|o)xxmZn9_SEsq}M;fOCg# zR%VUoAs1R^$%ncV#%uf$a?-St|QZV~!oQ%{We$cUw zBe%R_i2%tN;f2*`rg?`IAD8oWjR}U9c&l~I60Frrj$L{I>pHt~bWI@Tfxj_I6n~!B zbT4Kwt=7KJDU79#U&R;0fapeV9SjE^b!=_&(1-STmQ1Y0sll%r1UP^B;WR}H5%<_k znAhmYlIdRX@*Q^#cvNdiZ!F>vl z3V1l|Hq{$}AHdacWHr$5qs|1FamxBF-y^&>Qf3so0)}ajvWWXp#HyPcDFMQsY)g6!;;-6rDz}W>lS(s^hMg&vuiFw$rYT z*!g5rry1)IofdPzKz{=+azcg(>nO4*N||WcWOA}dLx7$Xm)MiRBqr*YZDZ z^Alj=%`RkQBw_B0uXek`vCQPPwCpq=Ixvz@pfx!J?TvV`6Fj9ueNOT!xEXbb{Qf%MoF+CzD&CV>Yi5kQH<=ZK_EoP6IO0_T8awc=M=WnnUG08 z1qSqdv6b3#;Uv4ljnsY?Iv$PH0=2*DUqwLBevFn|!n^^2I2+pHP=7!DiD|<) zSNy9(?#XW(eb?D}8HFkIM0iE5&v7)t99N8vR@jYzft>Mv_4v4+IMJfpvL+tFt5>@o za=HEbuYf93WeCH8eUmNb)b!Qr%RYIYQ>G5tlpXDof;M>dYO-h#xul-0&P;8y)w|_ z*9Gm=SM#p%-Jx!A-R&y^jO&MsJI!u4$}e>$t!5F~6Q|T?s|~ELVYNj!Usr@^1MNLb z1AFeDYA>9I0HaN}^9LksC8C;`1f4e_v%&mj8lul+?zu{<7$1d$p`&_ThH8x zkU7FD0-0NU+7p*Vq5f7kRtX7269F!j5ZYk{+73vB=n!P`K3rVK#{DhCdr61>f8u2y zWm*e&HXK5-GD-SLj}`?8Op7xi;4;WbY;kL(DKSy~LS=-jW(yT%1pZw5kn>MS>i^Xa zPkz0y$9&R#2{TOxI_@WILSPjuqf2{dJ>q8`eK=!?HepMXxb7xP_>xNmXpbw%0KlGTBh|o@l!QTL$E@k;cmaMnc)R~0%`VsIorsh@_ zfZ8z#b^L}fS-=sQq$P|K9D>DF({U1Mj-`kY#w-^(*mUW;GryssNad^;nxMAy<_TZf zA9@P`HvInT_w^%VD$$Z0w=h*Vrgaa@NuJaR*h+_R$qJEoYKxvaYp#4-!vKn-^T&OL z3M5W+hLiAObk?TP!-`Gkckjl2XvP?qm+T{-io3p`G!Ds)W6bzXsJ2bmEO1o0yfB~5 zsht&`#!;$SL?offB7|=~o~369nSYw{NAc+dP~H3bow`yzc6TKyQrD)(X8JnW>6*qN zQF}9lo}P*dD1?!sev6emk!QNvWNkeTJO@KTYMX)6 zwn@$cP&}}J)4~GDLUGP(ArxdC4JU~-B15;2!2PRo1AVVvs}5=2NoMcya(zcO45YNS zT;#w{o8LuoIEGuFHS$heG`@!;RlfTD%xl){)N^q>D#5o_ZjMguOhbLNGHgj=sTkaL zY)uERWN}1mLRIx@UY5<*?1Z$nbqHprRF1}KR4Lm!`nuX$;tBPy-@Cp02iPw4nTG3% zJu*i`A0F>5K5n1r1Q0aYWp6(;>%5$(ko9D@0#mF@K>OGa7!*d6U{Ge9=v&K3J!3~k zvs|RDa?3bFrzpTeAL@Ih%cFXJf4bGn>P)NgqRX()jzP3|qO)gqwqwV|saYWPn5TNV zIv;sU3HRB*mQzXArC1%NyygU{m80Pt%eUubWTZ}9ve}l8o=rU+X`SO04-K`3DHBQ4 zRV--}%ywO<39&SR~)s02-fM5+J6isVOHrJbvT+yID?=n|$<~M&|t4S4X`n zA}flh%+SoFCE-ZA#Q4HQw8t`Vk*I?&M@u%k!P^fjJhK8ht#1d)?--oO>w? zFfSe$JA@_83N38%@P_NhQwLD_<&kd8cx$3FOUgk{_$5B=S5iANivL(1paj_K0igF7ry5CQIOt0`LpfLheZbXyBrnwvkF?b*Zb0|?_y$il*V zwEEY~{q1IFi>?i?mn?KJtmV4aXkBzK?dV2U+QsToZ^d+W4Jzh{w*26_2@rni2>(m^ zNDpl_eUmeN^4c5sY$uw1obVrF6xUsJW2;+U{ty9>TxjWR;sO3U4zZEY_vd%gs|z1; zjUT(}ne@!bAEG|g#{62lWS0~zFBrgMY@fWA|o{KkfRnDbkxK_>DIgCimnzpG=lV{uJwEFR2Atrx-%q$Saaod1G zG^YXPgJ!ak5buvR_}wx2V>7#3GmxXPI`sh+#&h~C?YAaFqvQJeof0|OWu$(Es|{&U z*G_n6i_4G{Hzz!KG9#+9Y#>_*N=hqr#>G1CKX2bxha83O!$gcAbPH8y1hdwzTasg5{z^kzE*Lud}Z_bb*TW2v@iIimtnS+(`!BZc4K^uk4E1Z*a`Nu@9Gxr_&U5D3TM3`Lz=`uCVG=jue5w==$2D>}c?CZP! zs3f!$N3=~^oVLG;i28~%6c9h&I`iWaeMmv!;f?O5ECGlq|6xmjx6bt)6%lDy@(kPT zw6UF6Cq!o!3A@iO=I7_XG&%2G9g@>abQE&b{UvoiIIhvC?WX>#aITAtNNeZ}vu@~D zcXpTBoH=vNBKt|+dSP(?w-s^Gldl>Yh09(L5zy?&IiEmfA-g!Ys8C<_S}tpzC3Ph6 zepvJlz2@~2cuTdmD5cd*_Dopg^<^)Hu<&rPr`z0WQK8oUVnd_5I)Y|%2{5R3lQY~uqLhMI@+sE??Cn<}IvW%zp+TWY(r)9UuiF1>3uE@yBntQ*h58WvAq(;EkN5Y-3 z-dO6)IJUP4$Q?Sg@7l=QE16ds!I-uX2NDu7M3Yr$SDTArf&sb|V1b2)I-ovgV9Pw2 z?3a+%GmjLup;W5dG~f040$OjEK-fng(nvLKf3E9PbMys|GV1Y;wvj3rc!O=r@B&VL3Zm>EVbwO>_j*?v75MK*2| z9cpdJk0r@SI$N#B415X@!_I{5%7}-D${zJebCHpiq(wj>n2PQ1<3UGEG7}M@k)+ey zna>i{evj>!7VnS5-z+pj^dtf0s`rmTWuMn}p(7pt0L4nu-lOLmg<$uZ3)p8`ke-_ZF_xI_q+zelAJswnEaQ8>3FHxS z8^8r*QwKKWePQ}E5wJs0ixWg!KXl`ht(KR&$BxLV99fjASDwKK%f5KK&AGBW^cFR4 zr@@+U<;hBnOQ;>|Y9mif&RqhLm;#hM#5~YFeX$=iz#8L? z4BLeND9$h$7>>}6bA9*H*1o^vVPNPh)ur(y8g?IS=xqGZ5bCL=?G1af908)!2M2$UqA z&hlVDLUX|cn8a@W)m19F16TAq9fe#ZQz$PeC0L~EK&MR0e)hJKzdOHBGGIpwrJBUC_Wzii>(4uCcngc@KzR{gp{%Ap|XU1hpHS2 z-si@G58(!n0wl7{LJ=FS8dbFRnFpikGp{9O)z&_hqEm7-`}}t$2(@SU%&mc~nJy&W z$K{vLKG$LakVIK#jfLsmrXAZFXF;9TlpKU2ZBbhM<&ha7QJHT0>~s$oY|27IHKS@_ zGoHv{#y2qcMSvq(Syj~``dx9{_2XPL^?xAS$Yz8Jk6TaXS&Z(a8F|+GY`r_n637>g z0?IUJYE^yFE<@WX8uypukh93rjM@in{}L;e-&C5^7&h@$^e-Q+vHX|Ri9S>7Bawk ze=DnjaXQ2*2IAG3HK1_6)4j;ncu(}*@bS5o`c$|R^tx_?2pvtWYukquF|wZ1F#VGW8XUU200Z-9dmNaU~&vI~GDKi7Z ztwc?uK)HSzLw3O|#I)!cyx99$$%b;sNFaM&wY#?P6knMU0BEZY7b<4xa)Qq?<0rE^ z`BSGGF_EA?-o%n)mg>kgvUL>0`=+}U!iqM62cs-JUI%djA3^8|pfmVvHQqGr_in)1 zK3W7;p9;8963=@EYJ$3&BIV8G<>g1xZi5+|(8Ax#iAe&MwCBh(Aj|w+YHnsgBexLOv{oNOl zz@m9`ylD%n-~av5(2k{Mf0>C8I07PX*+fex=r-IqKNwmBkVv zat;>*;%+Lzj!%$D0SB5R`4FlWDuA*$$uWQ*%~d6qS^>^s`&57DI#=M5UcVvCf9qZ5 zqT`F@6W86vmwMk8i3wN}`3pj{Z7oR6M-_#=C`BK-4@tQlAYe#BR89UEc#+YXRteWw zpsOpoHT$X7y+%=&%!F(|Hv|VP$xCv7_0fF%siwW%?okDYci7_&tS4Y8`!UIBdeTz_ z=~Fft;2B-CdM11_&=@yR1RQxj+(B&#{QVmXdGNDQ2AfQSp_Qn&eIo~8(7+3FbU=Qj z@B4n~XnnBD@R_g3hVAC6#(+Et_UCp^^qX@Eg|U<@VT8ba8$ zf_X<ZRAq`9*qwz0KP;{ z4F8VjWXh{?2fQuEm8LXjr*Gt1wM-WDWA7P0Mkz%eZBjZxBoyr#zju^--xgwPXe=<*KY(%FRo^UjIm7-b8BYjiQI zZhIy?G^vz(n*!l#`YzpP60AD6NG0j#4--%kaw3d#QDNd*_|<=LMG55x(ho7ShkM=K zdu8*7!=X!a&Qm}4=uSzH^Ub#Ec{gjdj=Jm(q3%7ocLby}&d@s!^VLV=KvjX)0@luJ z^9VpXP;X~-*`F1MvJDQjAnJWA^DoSJcx{d36iym z*V0~T;2372tjtUjC;F4jc)&QrVwgyZ(@#)CP>kcrW5I64n>%5({u?6F4%1nayVK9W zIxm5wP}!;JdD*SpfjRO9R{t%1i{hN;aw;u8__L$2GuWW^`zZywN5EKbe(XX-{#DNP z$ARlay^0}apy#)DXnGBlGep;kfDa76X#@gHazRF_brEGcICKVT(sP9KC;)u#3fO}R zzGmO?>b;||nl0_xnj#Tr1BFw%j642bolZHYU_?z5=4-pHLn>m{5J`_+6K^LtSgH}d z&E?s~-B!@b9W4*x=yahXqK(@HJzlpf7PFwub!Ui|!|L0y4cLe<@yHsu$gPnFi2Hm9 zv3hGn>kg<{3<>nqh2W{lhU>}I^hI2eYly__n1JaQ^twK;+DsV!M7iF0$^R=r27i=V zNb-z$e(s@kf+_;ScM9a4hOFV32T+?u2@sN8MRkKB1?TWch8KB!P??> z`i3dmE+zi~^0;-4L!4Kln%LpvKdzhYDqt$eEcugxj%j3X-GyYNH*_|)Qom+lzio(s zvmq16Yu({Mb@f|i7n)8I!vH{ZCAWVD%VKe1mpemd9Ay-6hRXq*9(oZkTYjqDo#If_ zT2^9=3M+}@QuXTS3uzW%{MpO|byR3*=J2K(tTnCWq>hJbS`;(4Y36F8AtwZ%XyIg^OC;+Om-bv(#`3>GBI7-I(;! z{xPt$<6GrTsrxMuoXdJ|Y>Lg?L15>o$a; z*5CYPS8<-$a}}4eC0F#}rhW|MBVZp}FQos|H0N`Z`?R$7Mn9`Yjy;U)E6om}kK>}} zKpmQGz4I$m_9JjimoJHqPhdG<%G34#bwgeos-)1mma7C*6~;C@{Mw%Bj{sJ(cQX)) zNqGI)i(A2AK866iu}3=UU3+XkSM5lVvC2_EjC|@ccPyN9bCbCTpYsE~Mp6j6Kn-4i z@q;~phHkm+=flo>tyRPSJ@leXxVBKz*6r8Sd+5z8+H$Hkj!tuDuc(Jes+a(3q=&T_ zyDI^W|Jz!73@sXWja@)>HHRBcG)tG(&)ogW$epA$7$_(xa=-`aoY6HzymPg?dt~SR zn2robYj)=YA)_O4tc^B$PCV;k&x4)tWn@KnYsS1PW*na$-Zs;gsKqN%Ow^{`I?;T8am0v~hf#+@jnwk23e| zCB*Ez<{aE`?_lE4yd#^l#WSFS2{aQxJ71bw650vv>6U|F>8D!U&YPq(JqUeOOXfzk z9Ohe`PPaDG0;?Gtw-}10%RM_2-9+TKyatd9Md;m%mG=Nvzc|2T46sH!8pi8zSNd|* z^r2R}Yr3F9QR^#yypv`020e|kc@0EahogF8;id539zdEVljQReXJX6YM5B9=OCKX< z)2lRn1eOxVsC6V2{jA(~txkFu4qXlT4KUJ#c$t_*CAEdjbDzxj^r*R{sMEE~G;MAt z?8GEr(NviRY72B(ghV7og+?Fc>a#M|+Dkr+Gih`Sm`~sqS7lB5)!23{N%S)}pu&7c z>b&fJikKZOM+gC9Z@HK(-*@PnT2Tx9_W(Wlopk&;(vfBCrv1x*9`OnHd2{l1L1C4n zgh^R|yq&h3ndgB=O|a8%-Wx|1rBAKL7u#pLuIo!4Gy(QQ=gFGKN5(etD);9=@7UX< z#FS))CTjh}k}Oe~ulJIxZh*dl3S`-rj%qth6uI zZf;yc;2l{-iR2y{KkgW$l1k@5vtkVr(Xa(wap&wLP5R*>U_ouxuHXgRn>g-K*>%#B z-L?=rUJSjptA-kHnZ}ve$$LP5FGhrwWt<+sI);JD)edLR%`c@b*i^AvnE&PFX;0B*^ZlTd7a6yMxsvFQed}u&&TU1sCY|hfi-bKmDML7 zd2Bx0p^shjV3?|t5L)=bK*pDx=Ku0A)2mS)n~Zzs5bEXap(WcB zpf6kE!CudhY7?~^)A;u_79;3gw-eqvAo6(snh+dY^!5paudJ>W0G5TZ^Ogxiq%MQi zy|*fx`#uG_8AlJNs^#K3x#yCN=1a5_MJWOD^0@zM(SJZP7!MZ6OM1-7Yg#)muGwm7 zP0S7;W}AI4NP&J*S)(?x?piTE@$u8T>Jlj=w1{6eeR+Wa%Jyd`btOV6XP%m}SrU#U zI2Zb6sOlv_k+BL9qFL2k>r6m9aQO?%4zvG$V5z9c~gbhBtMOF6px@u|dRGe*c?^WY{#`j$))WPr^!A}gjk-NTF`oF) zEpg-ia4t0pS8Wf6jrNgwFZTSP-jT;pd!+$3tt3prhFk%8gOw^Ea}3j3Fg zjfM+``1b8R_cy=V#LJbx*JasyCKUf0pJ#A=&g(Ljy2gmm#~KQBuej_-wH{mT0JhYF2LS z7q>=^B@89us!x`mq59il5(d92x`lc4AF}WxxL#^xDW4SNRw6v zc`s=KmCF~&)lJ|ps-I`d!(N>M3O4XNbWd6B zTbo@}6cAgIZdydVQK3yj?8UR=Ik5Q@^wG-Aj1~c$Mv*?zdZh6^hcAt!PHTLE!qGf~ zuDg6o;7|L=ks&afWGyz&Oj+Agl@5w4?9ur3jh1eGvc#?=6(-GvNZg#WJvfNj(uoMY zZD@3n*6lJNHFfq|mw#@q+1vu{vKw@Mu*Oigi-WBb5qjKQHEE*PsHIXQ34PIBqF$-Q?! zEDJt7qM;E-2j_i>i}OGoG`N9jTZ~Vf)q0-6(uhWq-1@ zHg4s_*><^0fuP-Tmq1#$-NjM|BvIk6?Y1suO200-j({Y@mjq=#ywf1&VClQmA@G%mCwnD{#NVP) zEzS{UXT4O%W$ePG#D@aCO<9;=n#YXLPd{77ZeJf&O)@pTokYZ}R1`0%nCSUN&f;Jg zaCQ52omVTP<&dB6PE2S?7a!O3LAhzhig<#$yPGKemQpu2*43+ty9SN5k&;)=`X)U| zxpeKv!}Ei{(mP8RG`f^eNjtOYTIiAdo;w&@&UP_>P;foqtoLipOhlp3zq8jeVrvDc_P7P1Z`gk?kJTjHt>8`I1JNwD;q=I3Wy$w-^LqVxtJNg^`JwiWxT}e z4)oiUSwZP)uV_)tq$*%@oe_a~M!y*|dUeB*7|Xg~%`}vK$-7P@w1?8P&QUrp^L}ia zSNp_~?eWy6Mj5SY;N#2O3CZ>#8i*s_6wZ3PgP;j3~88X@5=OF{fRGisRlHC1>OG^S|Wre{*+fvbx# z?{*R`DQQh?@|UFC8)}b(z8IcIq|LZ3Jns-YIxi9=X)Hfpn3Xn`N6oRd^oH=e*YRdd zd2To+7-<&El&rNK$?QJi72Er6Fv@bIs5b|r^;-ykC-&sck=0`fBEqeRHFIHQHks_1 z@g1cH9&2>0^AV00;<@Hv_CO{Zq1-n(NG1~m^TmPc?F+kk0xVL^mj^WTy;7TU@@shT zX`GD-`&E+ujO;IHXpx(XtIR&^lf1vg{Z8urR_pcHr`MM?7`UH3bfS%ddmTha6}r=b zc|$TiV~+*43)3}EvKePigWtJ$R@b~KcvtyFss33H2Z&vov*(NJ9`0Di@mR$ptCzOV>a{OQcZuIW^% zeZ0S%eaNm|x~k|&KVImqllN=4CCPSEqcpcH?VI1S;?goR5%cMbXvUynYjT-aF@GJt zJkd^|<(Rxxva{?g?un}OxOGvVz!}7)6w^t4==(V6_jd9&?CONa<*G+BKEC9d^b*}C zT|-BNC`y8sj?Nz>5uNdj0ayb?cKZ)hwn}wdEVePA+-0MnY~p;Q(N61i-NNjctW=1r zy@Gx2++8qUbybgtB1NQEs>Gx8ZKvW!X-3SDdXTFSKKDne_U3c5t>%@LqKQo>O-|-p zFJ+c)Ne%XXi3M9Ud{eyl^9%Y>-+P*e8>WwgUfeLL_Yi%|nqO=;-uSU@sE^`Ps&0|L z3y_T2)6hP#Uj9@o?4qAb55lzpEBMkHJAUgZG7{>=zuVCGfOLCK>&E^uX13|l+1N%4 ztBwDB{!&^|Un9gqX~eac(E@_neT@@=X_eOJp{6#pHZcXq1st4U(g_`5O^&(2Rh zDT@H93u@23W@?E4%tk-`8YT0lyVz*0O!xbz)-~`$KRpI7?NKQJaVI9`a{w}Q-i9?d zP!=QiCbArmVd%E_zF+Cjz&kRC1$-L7>IZmuXkW98uO4;5y!THuIgtl*lg4s#a>>Hy zB}F~#su*gZxI;a;=SsQGAI$wtx4AhYO09lJ=hxgo&T-0-KJ`RVh2?p|Lazl{rNLXW zVxER=Z{vovDe?DJit z=8sxh!nq*cN382FOn-JXF)qayQP8sN-U7=_5J2uX-wh=gPI-eH!FAL(xiEh-A^QOi zA={q$Mfs|J*XR7ma8o$p)JM`tlj}Dn%n+oK+xYiz0&KpJ{P&DqN&=cXzgc)DDw-?| z1b>%!BTuq{U#6e zodJki^V*X%RVz3^U%!35L<@?g+_2J+1TrJuK)kEMQQJbgIb zuTml6=3v0_S%qFJV5q*$kMBje1z9hoqyun;W$z~Q!#+1jW5wC(ynnH$Rk zM3>twOYqsfFvFtBj7G5Yv{ws)L;3(hl_50d1c4r6XTt9?V)asHKIm@ejcI30HJ!Zk z9MO<-4@uxXW3HO0uDO*rIb?8wT0^Vt=nBvIEX=HK`@lG?ew|fIKAt@E-{E+W?$LM$ z=ehdxGaaqzq*HWbUX)%H=0inil4us(kLFP3#@94sQ2Xaug%Ujs!+f(2vXtpHk4lTq zQxv+*#v=bDx3cbv2}$DikAWG=@=tp#nJlsJ;pqlfRI*p3Og?>DG*A;-0$ZXJx6~sVCj9(20FdpWSQ>lY4Ol0O4}{FuvCaw>+|*2 znIcE=``VA*!;L}o{IJEhLCcF7buG;%ze4ndJFAgQLG@r!G2tG*qcP35**_o=F?DH+ zV_`2R{prkj=Cm4c_1!Wze#A25X+QpUIxUCiaz&OTqo!WqDG4Vg!;U>Wzj_CE^G~A8S@zQ?c3;b9PS|o+S%C<7uv- zH$9biWqKyySMQ_`=WnlV1}4ZO?TpceUONYXC2N%iyt11-@oJ;^0Z&l9`|6w%Q8aDR z*?7z{+#h1MdJh5aEk6j+j@I*$YJb0KP->&2NmC(rLthiIRnWc^**x%5>{}i8qE!AU z(xNIvev9smniMtOudB$fMphM(R$gkqkkCo{)~LOXmfNO z{UR`>rcYj88Ra8d@AAC`7k#((ahljfQsd63NnX(;);)pYhKWWMcJ%1fTjH&{-$55| zvuILjmGf1>P(Kg@i!<-QI9lKM^pFdmO;V@Q<%O`#-Va-l$j6FC0$YiCz4X!T3t0 zl0gvs8fCn)c+g#$?#t&BwBcc4VRKToxu0#;m3(jrbL?P5CZkjVMqNmgUZt~is#e-| za;VDhU1eO*mx#}|_3K6XZFh5bgC|^jFX#xP?{Dfir~IJ%g*Fh5**uHYojlsDEZv6> zWgPm0JA49dx|B{?*D-<+__>rlPi-XV0&?r)6=~!GXA!6SMSk39+fay#Xd+!GPON&$cu3{O<1swlntd1ohL7|0v8#-ISyce38{A!r+wDp;_&KQ- z=Wl(AX9A>;-v0H8Lu~27u!<*28zxyhod$VRYVrbZB@>Gl<>NdZF(k;dT8^94;N-M3C>UCu|XzLu>gYEn3fS-(F@O+#yEf7`1gmw8wQNr&8(c_nAy?$M*0(;cm;MyDCpMHtZCc*SZ)1Hn8&yxP)c^ovL-?sX$E01@siF?~K%F9Zt6v@?f z>qktCs57pfL$|=fiFKPlw$wmr=@FXv`Az!HP7-QC^%b6{5#!6~(j09+Z%*e5}6l$Rll zLEZ>^|L(80CQ>I__2~b&mVl_aisimyBWQv@0NGGA8HUbLz(#5 z(dn$Pskn$O{L4yLMD7qT=j+O+)D%D1_7_HWqYNEX5vK@^>Lyzrr^M{ zE_g0C>+@Y1Hc?X7Y}3o}eb9eLGc!S4xi zbMNc%eTf2|`hqk91w~z(yVCjr!t>&GQFWM$+EdGhkMm`^M=p~3=gB#7YjoUj{Ak&_ z^35Vgk6p*+x4-Y!xtUd$V)AqB9+2Md1xtrw7SyB-*@jI3&0@F4YlRuc6W(rppX4e? zN;+?snZFvo1>9KWp@G9M5|uf*p@FdY-s*EQsH=m5N`|n6EY#)TFjP?P)kO0^Fi6Tw zS!r9+*uQoMZmdcuaHfaUaZ4Lb_ z@yw_gkQ5A_u@V{7^++Y4DIdUqZ{G@*?U@qFIWJ|;9RNP2wP-oO@KPDmbi>K9Top7C zRKqP+c>x`L0D^aJk4wGg-Uc;_Y(YF#c@I+o1nyGP7j4Lo%WOeUy1v(f8iVR#{nFs+ z94$Z)^HT&~g|>=kHd9Tf-Aa<~M4E}{P~VM>g@wiUbSmY6TD3j}me;t`5PdHXGUO2_ zRGQOE^i2O^z@jJ7eBN2{7&*~#5G^pLB<9Al=-EtqkHEv1M&CnATv~hKdfRp;53OWr zIJs_N*psVVB?Y5Cp{S-|iku9&6+}FmC*zj?$F+1KHTyNY|1I_Ye_x)62 z>Bvyv8Ln6PJQXGGw0=Hd3PS#DJGb0{offxzAe5FRV)^3?FI|iJ|8v(-kMj>m}9uD+hmTR(Wo z$HzCUub>G!HZouLZC`UjfF8Ndq^Rlp_R6>xN*{#mrJa(}PgMl?=J8LQ7>Ib}EYf6| znVOQ6Z5nepu^yuTM|0O1)l}B5aU2B)1S}wm!hj$G(t97{AOg}sIw)0IPm{R2hrT78a?U@ci*Hdwx(@fPBzM z=9h~0+y$P>Wid`0!k^S)h@*NqHkqlFb(R~_E9}K06G%X)Cg?ujxclaM)WB5BY`JV= zzjd{>(CS_2TA!~#z>qrxYcP9&}|Sf=_wNDQ6%Y5Q<0ysY^?1zsNMpE z3`K2U-A0XheA42hPrXmv_*RkvZL_c6{jIDAD8Aww3tsqgYEfH@3ryX`n`yWQ?Y#rj z;H`UmvGFyr~UTHj2B z%#P&L9!@46uTMSv`csjN^*KSa7XbiSZT*o=a%TL>hLw&*`3#r{HWN5y@ypU z_mTtO2#}`~qSm@;=*ZAQ^^avR0AnW4bgvldm1lzSQcH4VmLuga>sP(r%cuYU00H5F z-Qtr2mPxx-Gqv5UCVJw9%TMou&1Zje>e}r7po2`pfdpv1{^Ur_gS%rx-+aY&jJ0eL z!68d}ja9r24zcjJa3e9nZ3!=AtuCVyxi8k7Vb$`@g=x%>tVcBP;`3RcO|RXZ`s#Ym zPH$+m+9yXNJ`gn0tb1hE0g1Vz`_p`$I2)<|aG%!*yn#22=;3+xI{Madoh%vOkB`PekG^ z1Zd^mJ*1E29OZ3N33Ju>(!0*RknbJA6A6WD0$A*GX$Mya)CyiNZ8$5|+amvGVJuiA zNiEqRU!4+bvi#7yod5F{lLZz4_~QE)e4){;<9N-c?EI9k#BF9-q})pjf})d-=qd9* ziM-9*a_r?50odP|h{0kbvup4mIH@I^G1KsE^^GgvQwwjRT-*k3ZME+u_f>84@w@|F z#i5(p@qc(UJMe=79*M;9ripQ7;gbZAl07%$+}fa2Icg8|kySbR_XhZf-u$M)|x6?Cex7%ga0!QEXYo+tQwIrH+k=JO}zWZWB zj>X1Ad?pVv*)BfmZMsnZ3Kz=Y3dGkvqIO)Xo>(3h((~hT5@$!Tv7Osz`2zUj%k|TR z@+ptOdD_{~4+F!){M;RUQkk3K%@>fS1#OS6ja58@p7Ab}3JmvK3ea@m5Q$5p|7;+| zZ{Fhc8@v%F_A7Yn(omHx%%RyANKW0xM800TjTrgd==9`$XY{#dfJs7lN7pnL7OuY1 z6Sblb-)X4EO5SQRz@P4En1zcut3x#Vkf!MaYds`mJe7Fk%Uuo;>v?t>I&}Rs`4qLUb-edLs)i2~3EU{5oWxOSrPMnC+mLTHfC1%i(9k zJblNcW@)P); zRD6QLAn3lXHFHt3Z;)J@rO~Dzi`esROD)q@#a!lQz6uS2n8gs%?%<+%Wa0mk(A%d)o$wHJS@`tyrq z`suNtQ9&*|bU&yUoap6#BXnDx$@Kn;UO-v;wlyCkNorru9zuqyQm6z9`c}R&?eWM? zAwW zQ;jh`9P7iAp1(0nxJX+gRn4t9u6G?Vkk`E+ts?CMb=mZetCuOIUkA^DI1B@3zc0P- z*Q30ysle)WkB2kCvxi||`;=L?wf$<`>Sv05-_be~pz(@iY?wG! zQ+#*NEOD2TGrSi{`1EPgAf-79@Dd-0A96)`8TqMk7II_ohwA0I&;hz!M{5WbxrzwX z-dWu70Y+WJtuyn}p|+^86|K;X6zM+ePUb|FUK-bB=wNp124rZu@T?RxcDtO;qubHQ zqEVm*|BOZfJPFUAcOzQw-Mg}w=9zOg7w33v!$@@;ujttl8!UoMT4SRaJIUru-*yP zE2_omDIYG@pOc8+{GMsTq&)~bh+TO%FTJZKl(&uj;2uWmldFcr_J54W;NIF#8F09J zwG}Nq&xqxL9!w)Ug(yy?OX>PGX$Z7)3~`l7pjYQ*Yc9RikA4yDM2=R*$obzrRto^M z_P=;=wsmxBB|yr|lR{>ekZnmH-W8U&r=`9tQJEZ9iv0A&Z~`OKs7SN3T~=5c5;a)Z zy{7Glt#5K-sn*5^8pMwo8%VXXvQlyKy$5;HHuP}%8Sb4_OzjO%Dd4q)m;NNHs;@%| z_!VrLylSQ25Gdw~_b#;4Eb3$TGrNr4Ra(o6K^fqUF6%**XPEn`SxS8AO00b-Tbp`A zEiZ_JGa5-*Wnj^ShVNNQt)eakVNytDBR<*&s)MgWAk z^^#&#KaZ;nGwQR%5UH^tQCa9{pOP)}I*-(#aD$3I`Bzt$d!;j&axbj86$#gl*vIQ( zb0(tA%Qd9+R$Ep(JQnf3OOvLpZ>$yrjr%jNX;VUAt8k-pAOv2B8M8;3*vW|MbVbFL zE6146B-vO+*CL+qfEiD-g7`&=C2b#2SB`#7WfR7yo=ooqj(W=t42C&9XP8}naI`*P zA&vGHsLA`Pa<TDlkpHv3#wz)b1NC2$ z=>Fv@fR4}-4PoRd2zOu*(RA)R?Dw67V+|Cpxq*bWn51EoKH6~1)Gw@h;et#;2FW4B zchaxNhgtZh#ezNso@(jI8fk$dvZGQJB7o?oBD1}K$)(bB{o*-W6qWUSii>K_haF%_ zu^J6FU^^Cmn?#n__S0kD%k=5PxI7U6>OJzdF2HJr`A$f7J9`pe9G_|S>GCrO_n*Zn zX{HRj-`zUf#0!dBP!SyEuC;4;JV7X7&jim?cdkyh6qU!X5!dW7kfi(8+P**X+2|Re z4#t>Y`Q@e{vKkWuFgIogEwq+85D572srg17Z=i%&YxkT>hbg^7XX;jIWPG4$iD+|I zLUhHUKZ`FHl|De#@rmmmx3+g4hIaw~Z~gewA0Zwj;!XEh^6<9ySqnN5!e0ts$Dz2r zp;|$hrK@AiSrOWg4#yhAcS0)1iD<-RP=MkRy>14`uyb@Vcr^^+Kl^P(xfjFV?xJ(%y!JY|LJ+izaeP?Zn(I`aloMvRChEggn`4Reyl zz4xA|A~KD+1%#6)4@irhWmx9J$sf^FYMERC;#2iu$${zN!Zg7e0xLK3_b7}2QiLTM zlsd{>zF;XP<27BwcWzNpzh1HE&dV+CVS-lR+9Ao7X0!v5IXy&SO}HZ~p?x#7Y9|W7 z7>p2#Fp9a#=&2S-B&kh=vR^1yCwyMFY>QT`XLtR1dtiZfD8BwKZMyKSjz*N12gTW) zoavZ*|M0^~FZ$9r&lzDyCB__FsbinHbT+@;wHZv?^;s?C(~a6gS4o+^>O*@voI+gL zvM(G+KKua~M~7(1mP@AOB`oBZSLDt!Df^GGMZM|dvANJCjA*BeTCih+D}$$er}8~f z!F^-uM|kE*gRutelu_FsJ)=aUTlmLWWhAP4#Ua@q zFnt9jr2{+a>cqsNFSThw8lS|lGu+7#zSM^RGoJ=`?9>WBItoLVR&U5uM^(O^9BZ10to8vdal^6^GFaqn#pPHj{tU6|^F7zZXPaL*;sP~7D48bn zz9--fa_ie0L^ySzCq}zQ|1hJmKj9%wqT}aCHw2s`HT*@bXxx@OU$u3lJHS7`uB#e@ zhS{0;0ZY;t!W7Qb@8MLuk_1Y#F}mxPhI`_Uo;$%FciY=%u+81MwC}yzBCLR{HrfIy zeAJZ>7UNtDQ#m>5WCI2*1#*g@R4AKaFW557M+a^^@KuR9&jg^FkC>$w<@aRTV76J%~7nBjfKeuNSNunELaj)a(dS?QL>GhTmJvRgLYh4Wz13A4eXKDs77G#@5J>c1KUc z7-=%x*oGZiyU)b}&^-iS^=Su#!o=|qV&k*K=?9a1+k*L&`2ZcZ0ukHXu-R5sFnLDL z@|s^5%){o_ohGaKv73vw&VMdA(z$kCQsE1mk=9ZkoAOrq@G<)1%YVK zsFjrgAbTFUfQy+iYq2rKuW%+Rmo41DzSQ!}YJM)#@|tqW-HC|3)|(SK`#ohSEiuntIJPr()6OR*uzapdYxgh>qGm9j$?}&=GIheOKK>@gf1`hm+8gES1b|E#DxOf`Y(Lz&{lm?giv`jw zA(#X3ivvE`{??n>%)h1n{rlev`h778_`x3Ir)4IrN11;)mAR=F5H-}cW}ii7U15`F zxi7K4{8NXYze@a{eTKf1J?|6cI}GV3FvY=}5Zqce$!oHfYkt{cUp~)8J!U-NqQ1be z>=gz7JFiDVKHbq^?~Dz%oNHga6cbx%BIu&kB543|+@x>hYIdD$cPG`IAicOM_UL1M zU{6x>r3Oy|u%{5_=6Y(Im={M1UI<9U8>ihVo$AuE2~WE(%`)z9yr88S+46`i*{3s~ z2rHC7ai5=TTc%m{tL~tOcn9*0ZMnq#E@s88VBMDbxMk6HdCE?xcXl-)enY{W9lb|9 XDC1>{^4E=2mLUxFO@FNgJ$(Kj4X4H5 literal 75716 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 diff --git a/docs/src/main/asciidoc/images/spring-web-guide-screenshot01.png b/docs/src/main/asciidoc/images/spring-web-guide-screenshot01.png index 32a107b416a1a737c533269ed50cf501cb3c2c4e..13e131ca758aa206aaa47fff518b9873134afa3c 100644 GIT binary patch literal 64063 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�+?VuUjJ+z5ApsJTocmeM*{{4WY1zYdiQ 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�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 C5kyA- literal 54268 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

  • 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 From 3b9ef1d1bc5cab301441aac704f1c9df75ac23d2 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Mon, 30 Aug 2021 20:20:55 +0200 Subject: [PATCH 012/138] Upgrade build-reporting-maven-extension to 1.0.4 Fixes module path relativization for incremental builds. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b5d22660f27966..73c52d788391e8 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ io.quarkus.bot build-reporting-maven-extension - 1.0.3 + 1.0.4 From 913d86abf28253fa5ced412d00e4b2288a952367 Mon Sep 17 00:00:00 2001 From: Falko Modler Date: Mon, 30 Aug 2021 21:54:14 +0200 Subject: [PATCH 013/138] Add timestamp to each StepTiming message --- .../main/java/io/quarkus/runtime/util/StepTiming.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/runtime/src/main/java/io/quarkus/runtime/util/StepTiming.java b/core/runtime/src/main/java/io/quarkus/runtime/util/StepTiming.java index 7b73ecb03c20a6..7d4f4b5c65d221 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/util/StepTiming.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/util/StepTiming.java @@ -1,5 +1,9 @@ package io.quarkus.runtime.util; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; + import io.quarkus.runtime.StartupContext; public class StepTiming { @@ -23,8 +27,10 @@ public static void printStepTime(StartupContext startupContext) { } long stepTimingStop = System.currentTimeMillis(); String currentBuildStepName = startupContext.getCurrentBuildStepName(); - System.out - .println("Build step " + currentBuildStepName + " completed in: " + (stepTimingStop - stepTimingStart) + "ms"); + System.out.printf("%1$tF %1$tT,%1$tL Build step %2$s completed in: %3$sms%n", + LocalDateTime.ofInstant(Instant.ofEpochMilli(stepTimingStop), ZoneId.systemDefault()), + currentBuildStepName, + stepTimingStop - stepTimingStart); stepTimingStart = System.currentTimeMillis(); } } From 9c553639dd19035c4936c4f9ec89be16dac78d6f Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Fri, 27 Aug 2021 11:55:08 +1000 Subject: [PATCH 014/138] Fix "Response head already sent" Fixes #19621 --- .../http/runtime/QuarkusErrorHandler.java | 82 +++++++++++-------- .../web/mutiny/NdjsonMultiRouteTest.java | 2 +- .../vertx/web/mutiny/SSEMultiRouteTest.java | 2 +- 3 files changed, 52 insertions(+), 34 deletions(-) diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandler.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandler.java index 04fae63b0f3965..6484de2a3f34d8 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandler.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandler.java @@ -41,40 +41,49 @@ public QuarkusErrorHandler(boolean showStack) { @Override public void handle(RoutingContext event) { - if (event.failure() == null) { - event.response().setStatusCode(event.statusCode()); - event.response().end(); - return; - } - //this can happen if there is no auth mechanisms - if (event.failure() instanceof UnauthorizedException) { - HttpAuthenticator authenticator = event.get(HttpAuthenticator.class.getName()); - if (authenticator != null) { - authenticator.sendChallenge(event).subscribe().with(new Consumer() { - @Override - public void accept(Boolean aBoolean) { - event.response().end(); - } - }, new Consumer() { - @Override - public void accept(Throwable throwable) { - event.fail(throwable); - } - }); - } else { + try { + if (event.failure() == null) { + event.response().setStatusCode(event.statusCode()); + event.response().end(); + return; + } + //this can happen if there is no auth mechanisms + if (event.failure() instanceof UnauthorizedException) { + HttpAuthenticator authenticator = event.get(HttpAuthenticator.class.getName()); + if (authenticator != null) { + authenticator.sendChallenge(event).subscribe().with(new Consumer() { + @Override + public void accept(Boolean aBoolean) { + event.response().end(); + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) { + event.fail(throwable); + } + }); + } else { + event.response().setStatusCode(HttpResponseStatus.UNAUTHORIZED.code()).end(); + } + return; + } + if (event.failure() instanceof ForbiddenException) { + event.response().setStatusCode(HttpResponseStatus.FORBIDDEN.code()).end(); + return; + } + if (event.failure() instanceof AuthenticationFailedException) { + //generally this should be handled elsewhere + //but if we get to this point bad things have happened + //so it is better to send a response than to hang event.response().setStatusCode(HttpResponseStatus.UNAUTHORIZED.code()).end(); + return; + } + } catch (IllegalStateException e) { + //ignore this if the response is already started + if (!event.response().ended()) { + //could be that just the head is committed + event.response().end(); } - return; - } - if (event.failure() instanceof ForbiddenException) { - event.response().setStatusCode(HttpResponseStatus.FORBIDDEN.code()).end(); - return; - } - if (event.failure() instanceof AuthenticationFailedException) { - //generally this should be handled elsewhere - //but if we get to this point bad things have happened - //so it is better to send a response than to hang - event.response().setStatusCode(HttpResponseStatus.UNAUTHORIZED.code()).end(); return; } @@ -100,6 +109,15 @@ public void accept(Throwable throwable) { } else { log.errorf(exception, "HTTP Request to %s failed, error id: %s", event.request().uri(), uuid); } + //we have logged the error + //now lets see if we can actually send a response + //if not we just return + if (event.response().ended()) { + return; + } else if (event.response().headWritten()) { + event.response().end(); + return; + } String accept = event.request().getHeader("Accept"); if (accept != null && accept.contains("application/json")) { event.response().headers().set(HttpHeaderNames.CONTENT_TYPE, "application/json; charset=utf-8"); diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/NdjsonMultiRouteTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/NdjsonMultiRouteTest.java index 97e31d960907cc..8c2d652896705c 100644 --- a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/NdjsonMultiRouteTest.java +++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/NdjsonMultiRouteTest.java @@ -47,7 +47,7 @@ public void testNdjsonMultiRoute() { // We get the item followed by the exception when().get("/hello-and-fail").then().statusCode(200) .body(containsString("\"Hello\"")) - .body(containsString("boom")); + .body(not(containsString("boom"))); when().get("/void").then().statusCode(204).body(hasLength(0)); diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java index 6c998dbf1a1067..3dd1656631f1ef 100644 --- a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java +++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java @@ -44,7 +44,7 @@ public void testSSEMultiRoute() { // We get the item followed by the exception when().get("/hello-and-fail").then().statusCode(200) .body(containsString("id: 0")) - .body(containsString("boom")); + .body(not(containsString("boom"))); when().get("/buffer").then().statusCode(200) .body(is("data: Buffer\nid: 0\n\n")) From 4af2bf89df3a8623d610b0389586ba5cdbf3b703 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Aug 2021 21:06:57 +0000 Subject: [PATCH 015/138] Bump awssdk.version from 2.17.29 to 2.17.30 Bumps `awssdk.version` from 2.17.29 to 2.17.30. Updates `software.amazon.awssdk:bom` from 2.17.29 to 2.17.30 - [Release notes](https://github.com/aws/aws-sdk-java-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java-v2/compare/2.17.29...2.17.30) Updates `apache-client` from 2.17.29 to 2.17.30 --- updated-dependencies: - dependency-name: software.amazon.awssdk:bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:apache-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index f1c39ced2103be..5a28a7cab7d310 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -145,7 +145,7 @@ 3.10.0 1.6 2.9.1 - 2.17.29 + 2.17.30 2.40.0 1.4.2 1.5.30 From 25ab92601ba13d2fe083d48578028e69d4ec2bc8 Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Tue, 31 Aug 2021 09:47:43 +1000 Subject: [PATCH 016/138] Update Dev UI with the correct state when resuming Fixes #19777 --- ...ntinuousTestingWebSocketTestListener.java} | 40 ++++++++++++------- .../devmode/tests/TestsProcessor.java | 4 +- 2 files changed, 28 insertions(+), 16 deletions(-) rename extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/{ContinuousTestingWebSocketListener.java => ContinuousTestingWebSocketTestListener.java} (56%) diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ContinuousTestingWebSocketListener.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ContinuousTestingWebSocketTestListener.java similarity index 56% rename from extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ContinuousTestingWebSocketListener.java rename to extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ContinuousTestingWebSocketTestListener.java index 703dfe9514f448..2d83492a8186b3 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ContinuousTestingWebSocketListener.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ContinuousTestingWebSocketTestListener.java @@ -11,7 +11,9 @@ import io.quarkus.deployment.dev.testing.TestRunResults; import io.quarkus.dev.testing.ContinuousTestingWebsocketListener; -public class ContinuousTestingWebSocketListener implements TestListener { +public class ContinuousTestingWebSocketTestListener implements TestListener { + + private volatile ContinuousTestingWebsocketListener.State lastState; @Override public void listenerRegistered(TestController testController) { @@ -20,9 +22,18 @@ public void listenerRegistered(TestController testController) { @Override public void testsEnabled() { - ContinuousTestingWebsocketListener - .setLastState( - new ContinuousTestingWebsocketListener.State(true, true, 0L, 0L, 0L, 0L, false, false, false, true)); + if (lastState == null) { + ContinuousTestingWebsocketListener + .setLastState(new ContinuousTestingWebsocketListener.State(true, false, + 0, 0, 0, 0, + ContinuousTestingWebsocketListener.getLastState().isBrokenOnly, + ContinuousTestingWebsocketListener.getLastState().isTestOutput, + ContinuousTestingWebsocketListener.getLastState().isInstrumentationBasedReload, + ContinuousTestingWebsocketListener.getLastState().isLiveReload)); + } else { + ContinuousTestingWebsocketListener + .setLastState(lastState); + } } @Override @@ -46,17 +57,18 @@ public void testComplete(TestResult result) { @Override public void runComplete(TestRunResults testRunResults) { + lastState = new ContinuousTestingWebsocketListener.State(true, false, + testRunResults.getPassedCount() + + testRunResults.getFailedCount() + + testRunResults.getSkippedCount(), + testRunResults.getPassedCount(), + testRunResults.getFailedCount(), testRunResults.getSkippedCount(), + ContinuousTestingWebsocketListener.getLastState().isBrokenOnly, + ContinuousTestingWebsocketListener.getLastState().isTestOutput, + ContinuousTestingWebsocketListener.getLastState().isInstrumentationBasedReload, + ContinuousTestingWebsocketListener.getLastState().isLiveReload); ContinuousTestingWebsocketListener.setLastState( - new ContinuousTestingWebsocketListener.State(true, false, - testRunResults.getPassedCount() + - testRunResults.getFailedCount() + - testRunResults.getSkippedCount(), - testRunResults.getPassedCount(), - testRunResults.getFailedCount(), testRunResults.getSkippedCount(), - ContinuousTestingWebsocketListener.getLastState().isBrokenOnly, - ContinuousTestingWebsocketListener.getLastState().isTestOutput, - ContinuousTestingWebsocketListener.getLastState().isInstrumentationBasedReload, - ContinuousTestingWebsocketListener.getLastState().isLiveReload)); + lastState); } @Override diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java index fe0a98105eb8bc..6bc93507d3b807 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java @@ -23,7 +23,7 @@ import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem; import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; import io.quarkus.vertx.http.deployment.RouteBuildItem; -import io.quarkus.vertx.http.deployment.devmode.console.ContinuousTestingWebSocketListener; +import io.quarkus.vertx.http.deployment.devmode.console.ContinuousTestingWebSocketTestListener; import io.quarkus.vertx.http.runtime.devmode.DevConsoleRecorder; import io.quarkus.vertx.http.runtime.devmode.Json; import io.vertx.core.Handler; @@ -61,7 +61,7 @@ public void setupTestRoutes( .route("dev/test") .handler(recorder.continousTestHandler(shutdownContextBuildItem)) .build()); - testListenerBuildItemBuildProducer.produce(new TestListenerBuildItem(new ContinuousTestingWebSocketListener())); + testListenerBuildItemBuildProducer.produce(new TestListenerBuildItem(new ContinuousTestingWebSocketTestListener())); } } From 28fbb44d4ce49a25595ef27431a103543c633563 Mon Sep 17 00:00:00 2001 From: Matej Novotny Date: Thu, 26 Aug 2021 22:12:15 +0200 Subject: [PATCH 017/138] Arc - pre-destroy and post construct shouldn't be considered as candidates for around invoke interception. Add a test for various kinds of interception together. --- .../io/quarkus/arc/processor/Methods.java | 4 ++ ...MultipleInterceptionTypesTogetherTest.java | 53 +++++++++++++++++++ .../test/interceptors/complex/MyBinding.java | 17 ++++++ .../interceptors/complex/MyInterceptor.java | 50 +++++++++++++++++ .../test/interceptors/complex/SomeBean.java | 33 ++++++++++++ 5 files changed, 157 insertions(+) create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MultipleInterceptionTypesTogetherTest.java create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java index d0769ac4639f5a..5505104f632aa8 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java @@ -495,6 +495,10 @@ public boolean test(MethodInfo method) { // The algorithm we use to detect these methods is best effort, i.e. there might be use cases where the detection fails return hasImplementation(method); } + if (method.hasAnnotation(DotNames.POST_CONSTRUCT) || method.hasAnnotation(DotNames.PRE_DESTROY)) { + // @PreDestroy and @PostConstruct methods declared on the bean are NOT candidates for around invoke interception + return true; + } if (isOverridenByBridgeMethod(method)) { return true; } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MultipleInterceptionTypesTogetherTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MultipleInterceptionTypesTogetherTest.java new file mode 100644 index 00000000000000..2c6dabf1a0ffa4 --- /dev/null +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MultipleInterceptionTypesTogetherTest.java @@ -0,0 +1,53 @@ +package io.quarkus.arc.test.interceptors.complex; + +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +public class MultipleInterceptionTypesTogetherTest { + + @RegisterExtension + public ArcTestContainer container = new ArcTestContainer(MyBinding.class, SomeBean.class, MyInterceptor.class); + + @Test + public void testInterceptionIsInvokedWhenAppropriate() { + SomeBean.reset(); + MyInterceptor.reset(); + // assert initial state + Assertions.assertEquals(false, SomeBean.postConstructInvoked.get()); + Assertions.assertEquals(false, SomeBean.preDestroyInvoked.get()); + Assertions.assertEquals(false, MyInterceptor.aroundConstructInvoked.get()); + Assertions.assertEquals(false, MyInterceptor.postConstructInvoked.get()); + Assertions.assertEquals(false, MyInterceptor.preDestroyInvoked.get()); + Assertions.assertEquals(false, MyInterceptor.aroundInvokeInvoked.get()); + // create bean instance, no method was invoked so far + InstanceHandle instance = Arc.container().instance(SomeBean.class); + SomeBean bean = instance.get(); + // assert lifecycle callback were invoked but no around invoke was triggered + Assertions.assertEquals(true, SomeBean.postConstructInvoked.get()); + Assertions.assertEquals(false, SomeBean.preDestroyInvoked.get()); + Assertions.assertEquals(true, MyInterceptor.aroundConstructInvoked.get()); + Assertions.assertEquals(true, MyInterceptor.postConstructInvoked.get()); + Assertions.assertEquals(false, MyInterceptor.preDestroyInvoked.get()); + Assertions.assertEquals(false, MyInterceptor.aroundInvokeInvoked.get()); + // invoke bean method and assert around invoke was triggered + bean.ping(); + Assertions.assertEquals(true, SomeBean.postConstructInvoked.get()); + Assertions.assertEquals(false, SomeBean.preDestroyInvoked.get()); + Assertions.assertEquals(true, MyInterceptor.aroundConstructInvoked.get()); + Assertions.assertEquals(true, MyInterceptor.postConstructInvoked.get()); + Assertions.assertEquals(false, MyInterceptor.preDestroyInvoked.get()); + Assertions.assertEquals(true, MyInterceptor.aroundInvokeInvoked.get()); + // trigger bean destruction and assert lifecycle interceptors were triggered + instance.destroy(); + Assertions.assertEquals(true, SomeBean.postConstructInvoked.get()); + Assertions.assertEquals(true, SomeBean.preDestroyInvoked.get()); + Assertions.assertEquals(true, MyInterceptor.aroundConstructInvoked.get()); + Assertions.assertEquals(true, MyInterceptor.postConstructInvoked.get()); + Assertions.assertEquals(true, MyInterceptor.preDestroyInvoked.get()); + Assertions.assertEquals(true, MyInterceptor.aroundInvokeInvoked.get()); + } +} diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java new file mode 100644 index 00000000000000..21b0676c746308 --- /dev/null +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java @@ -0,0 +1,17 @@ +package io.quarkus.arc.test.interceptors.complex; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import javax.interceptor.InterceptorBinding; + +@Target({ TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@InterceptorBinding +public @interface MyBinding { +} diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java new file mode 100644 index 00000000000000..c61548c310a04a --- /dev/null +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java @@ -0,0 +1,50 @@ +package io.quarkus.arc.test.interceptors.complex; + +import java.util.concurrent.atomic.AtomicBoolean; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.annotation.Priority; +import javax.interceptor.AroundConstruct; +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; + +@Interceptor +@Priority(1) +@MyBinding +public class MyInterceptor { + + public static AtomicBoolean preDestroyInvoked = new AtomicBoolean(false); + public static AtomicBoolean postConstructInvoked = new AtomicBoolean(false); + public static AtomicBoolean aroundConstructInvoked = new AtomicBoolean(false); + public static AtomicBoolean aroundInvokeInvoked = new AtomicBoolean(false); + + @PreDestroy + public void preDestroy(InvocationContext ic) { + preDestroyInvoked.set(true); + } + + @PostConstruct + public void postConstruct(InvocationContext ic) { + postConstructInvoked.set(true); + } + + @AroundConstruct + public void aroundConstruct(InvocationContext ic) throws Exception { + aroundConstructInvoked.set(true); + ic.proceed(); + } + + @AroundInvoke + public Object aroundInvoke(InvocationContext ic) throws Exception { + aroundInvokeInvoked.set(true); + return ic.proceed(); + } + + public static void reset() { + preDestroyInvoked.set(false); + postConstructInvoked.set(false); + aroundConstructInvoked.set(false); + aroundInvokeInvoked.set(false); + } +} diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java new file mode 100644 index 00000000000000..4de05da30ffb93 --- /dev/null +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java @@ -0,0 +1,33 @@ +package io.quarkus.arc.test.interceptors.complex; + +import java.util.concurrent.atomic.AtomicBoolean; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.inject.Singleton; + +@Singleton +@MyBinding +public class SomeBean { + + public static AtomicBoolean preDestroyInvoked = new AtomicBoolean(false); + public static AtomicBoolean postConstructInvoked = new AtomicBoolean(false); + + @PreDestroy + public void preDestroy() { + preDestroyInvoked.set(true); + } + + @PostConstruct + public void postConstruct() { + postConstructInvoked.set(true); + } + + public void ping() { + + } + + public static void reset() { + preDestroyInvoked.set(false); + postConstructInvoked.set(false); + } +} From 236dbd01a029b2fdc4467e0c3e41647d1815a3f5 Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Tue, 31 Aug 2021 09:44:58 +0200 Subject: [PATCH 018/138] OpenAPI Auto security based on extensions Signed-off-by: Phillip Kruger --- .../oidc/deployment/OidcBuildStep.java | 9 ++ .../jwt/deployment/SmallRyeJwtProcessor.java | 6 ++ .../deployment/SmallRyeOpenApiConfig.java | 6 ++ .../deployment/SmallRyeOpenApiProcessor.java | 77 ++++++++++++++++- .../runtime/OpenApiDocumentService.java | 26 +++--- .../openapi/runtime/OpenApiHandler.java | 7 +- .../openapi/runtime/OpenApiRecorder.java | 6 +- .../filter/AutoBasicSecurityFilter.java | 37 +++++++++ .../runtime/filter/AutoJWTSecurityFilter.java | 48 +++++++++++ .../runtime/filter/AutoSecurityFilter.java | 82 +++++++++++++++++++ .../openapi/runtime/filter/AutoUrl.java | 60 ++++++++++++++ .../filter/OpenIDConnectSecurityFilter.java | 71 ++++++++++++++++ .../deployment/HttpSecurityProcessor.java | 8 +- .../SecurityInformationBuildItem.java | 59 +++++++++++++ 14 files changed, 486 insertions(+), 16 deletions(-) create mode 100644 extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoBasicSecurityFilter.java create mode 100644 extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoJWTSecurityFilter.java create mode 100644 extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoSecurityFilter.java create mode 100644 extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoUrl.java create mode 100644 extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/OpenIDConnectSecurityFilter.java create mode 100644 extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/SecurityInformationBuildItem.java diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java index b0b958807c0da4..fad473c1b05b78 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java @@ -38,6 +38,7 @@ import io.quarkus.oidc.runtime.TenantConfigBean; import io.quarkus.runtime.TlsConfig; import io.quarkus.vertx.core.deployment.CoreVertxBuildItem; +import io.quarkus.vertx.http.deployment.SecurityInformationBuildItem; import io.smallrye.jwt.auth.cdi.ClaimValueProducer; import io.smallrye.jwt.auth.cdi.CommonJwtProducer; import io.smallrye.jwt.auth.cdi.JsonValueProducer; @@ -51,6 +52,14 @@ FeatureBuildItem featureBuildItem() { return new FeatureBuildItem(Feature.OIDC); } + @BuildStep(onlyIf = IsEnabled.class) + public void provideSecurityInformation(BuildProducer securityInformationProducer) { + // TODO: By default quarkus.oidc.application-type = service + // Also look at other options (web-app, hybrid) + securityInformationProducer + .produce(SecurityInformationBuildItem.OPENIDCONNECT("quarkus.oidc.auth-server-url")); + } + @BuildStep(onlyIf = IsEnabled.class) AdditionalBeanBuildItem jwtClaimIntegration(Capabilities capabilities) { if (!capabilities.isPresent(Capability.JWT)) { diff --git a/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java b/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java index a4aeafe88a9819..3fe6668cc1282c 100644 --- a/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java +++ b/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java @@ -37,6 +37,7 @@ import io.quarkus.smallrye.jwt.runtime.auth.JwtPrincipalProducer; import io.quarkus.smallrye.jwt.runtime.auth.MpJwtValidator; import io.quarkus.smallrye.jwt.runtime.auth.RawOptionalClaimCreator; +import io.quarkus.vertx.http.deployment.SecurityInformationBuildItem; import io.smallrye.jwt.algorithm.KeyEncryptionAlgorithm; import io.smallrye.jwt.algorithm.SignatureAlgorithm; import io.smallrye.jwt.auth.cdi.ClaimValueProducer; @@ -69,6 +70,11 @@ EnableAllSecurityServicesBuildItem security() { return new EnableAllSecurityServicesBuildItem(); } + @BuildStep(onlyIf = IsEnabled.class) + public void provideSecurityInformation(BuildProducer securityInformationProducer) { + securityInformationProducer.produce(SecurityInformationBuildItem.JWT()); + } + /** * Register the CDI beans that are needed by the MP-JWT extension * diff --git a/extensions/smallrye-openapi-common/deployment/src/main/java/io/quarkus/smallrye/openapi/common/deployment/SmallRyeOpenApiConfig.java b/extensions/smallrye-openapi-common/deployment/src/main/java/io/quarkus/smallrye/openapi/common/deployment/SmallRyeOpenApiConfig.java index ee2c9295eb5833..22a8546f728d44 100644 --- a/extensions/smallrye-openapi-common/deployment/src/main/java/io/quarkus/smallrye/openapi/common/deployment/SmallRyeOpenApiConfig.java +++ b/extensions/smallrye-openapi-common/deployment/src/main/java/io/quarkus/smallrye/openapi/common/deployment/SmallRyeOpenApiConfig.java @@ -70,6 +70,12 @@ public final class SmallRyeOpenApiConfig { @ConfigItem(defaultValue = "true") public boolean autoAddTags; + /** + * This will automatically add security based on the security extension included (if any). + */ + @ConfigItem(defaultValue = "true") + public boolean autoAddSecurity; + /** * Add a scheme value to the Basic HTTP Security Scheme */ diff --git a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java index 3689aef33ab9e4..b8c40f5650d6df 100644 --- a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java +++ b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java @@ -76,9 +76,14 @@ import io.quarkus.smallrye.openapi.runtime.OpenApiDocumentService; import io.quarkus.smallrye.openapi.runtime.OpenApiRecorder; import io.quarkus.smallrye.openapi.runtime.OpenApiRuntimeConfig; +import io.quarkus.smallrye.openapi.runtime.filter.AutoBasicSecurityFilter; +import io.quarkus.smallrye.openapi.runtime.filter.AutoJWTSecurityFilter; +import io.quarkus.smallrye.openapi.runtime.filter.AutoUrl; +import io.quarkus.smallrye.openapi.runtime.filter.OpenIDConnectSecurityFilter; import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem; import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; import io.quarkus.vertx.http.deployment.RouteBuildItem; +import io.quarkus.vertx.http.deployment.SecurityInformationBuildItem; import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem; import io.quarkus.vertx.http.runtime.HttpConfiguration; import io.smallrye.openapi.api.OpenApiConfig; @@ -168,9 +173,11 @@ RouteBuildItem handler(LaunchModeBuildItem launch, BuildProducer displayableEndpoints, OpenApiRecorder recorder, NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem, + List securityInformationBuildItems, OpenApiRuntimeConfig openApiRuntimeConfig, ShutdownContextBuildItem shutdownContext, SmallRyeOpenApiConfig openApiConfig, + OpenApiFilteredIndexViewBuildItem apiFilteredIndexViewBuildItem, HttpConfiguration httpConfiguration) { /* * Ugly Hack @@ -187,7 +194,17 @@ RouteBuildItem handler(LaunchModeBuildItem launch, recorder.setupClDevMode(shutdownContext); } - Handler handler = recorder.handler(openApiRuntimeConfig, httpConfiguration); + OASFilter autoSecurityFilter = null; + if (openApiConfig.autoAddSecurity) { + // Only add the security if there are secured endpoints + OASFilter autoRolesAllowedFilter = getAutoRolesAllowedFilter(openApiConfig.securitySchemeName, + apiFilteredIndexViewBuildItem, openApiConfig); + if (autoRolesAllowedFilter != null) { + autoSecurityFilter = getAutoSecurityFilter(securityInformationBuildItems, openApiConfig); + } + } + + Handler handler = recorder.handler(openApiRuntimeConfig, httpConfiguration, autoSecurityFilter); return nonApplicationRootPathBuildItem.routeBuilder() .route(openApiConfig.path) .routeConfigKey("quarkus.smallrye-openapi.path") @@ -277,6 +294,64 @@ void addSecurityFilter(BuildProducer addToOpenA } + private OASFilter getAutoSecurityFilter(List securityInformationBuildItems, + SmallRyeOpenApiConfig config) { + + // Auto add a security from security extension(s) + if (!config.securityScheme.isPresent() && securityInformationBuildItems != null + && !securityInformationBuildItems.isEmpty()) { + // This needs to be a filter in runtime as the config we use to auto configure is in runtime + for (SecurityInformationBuildItem securityInformationBuildItem : securityInformationBuildItems) { + SecurityInformationBuildItem.SecurityModel securityModel = securityInformationBuildItem.getSecurityModel(); + switch (securityModel) { + case jwt: + return new AutoJWTSecurityFilter( + config.securitySchemeName, + config.securitySchemeDescription, + config.jwtSecuritySchemeValue, + config.jwtBearerFormat); + case basic: + return new AutoBasicSecurityFilter( + config.securitySchemeName, + config.securitySchemeDescription, + config.basicSecuritySchemeValue); + case oidc: + Optional maybeInfo = securityInformationBuildItem + .getOpenIDConnectInformation(); + + if (maybeInfo.isPresent()) { + SecurityInformationBuildItem.OpenIDConnectInformation info = maybeInfo.get(); + + AutoUrl authorizationUrl = new AutoUrl( + config.oidcOpenIdConnectUrl.orElse(null), + info.getUrlConfigKey(), + "/protocol/openid-connect/auth"); + + AutoUrl refreshUrl = new AutoUrl( + config.oidcOpenIdConnectUrl.orElse(null), + info.getUrlConfigKey(), + "/protocol/openid-connect/token"); + + AutoUrl tokenUrl = new AutoUrl( + config.oidcOpenIdConnectUrl.orElse(null), + info.getUrlConfigKey(), + "/protocol/openid-connect/token/introspect"); + + return new OpenIDConnectSecurityFilter( + config.securitySchemeName, + config.securitySchemeDescription, + authorizationUrl, refreshUrl, tokenUrl); + + } + break; + default: + break; + } + } + } + return null; + } + private OASFilter getAutoRolesAllowedFilter(String securitySchemeName, OpenApiFilteredIndexViewBuildItem apiFilteredIndexViewBuildItem, SmallRyeOpenApiConfig config) { diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java index c9625b408becfe..95f19a6f1f1bf3 100644 --- a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java +++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java @@ -4,7 +4,6 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.Config; @@ -30,16 +29,15 @@ public class OpenApiDocumentService implements OpenApiDocumentHolder { private OpenApiDocumentHolder documentHolder; - @PostConstruct - void create() throws IOException { + void init(OASFilter autoSecurityFilter) { Config config = ConfigProvider.getConfig(); this.alwaysRunFilter = config.getOptionalValue("quarkus.smallrye-openapi.always-run-filter", Boolean.class) .orElse(Boolean.FALSE); if (alwaysRunFilter) { - this.documentHolder = new DynamicDocument(config); + this.documentHolder = new DynamicDocument(config, autoSecurityFilter); } else { - this.documentHolder = new StaticDocument(config); + this.documentHolder = new StaticDocument(config, autoSecurityFilter); } } @@ -59,7 +57,7 @@ class StaticDocument implements OpenApiDocumentHolder { private byte[] jsonDocument; private byte[] yamlDocument; - StaticDocument(Config config) { + StaticDocument(Config config, OASFilter autoFilter) { ClassLoader cl = OpenApiConstants.classLoader == null ? Thread.currentThread().getContextClassLoader() : OpenApiConstants.classLoader; try (InputStream is = cl.getResourceAsStream(OpenApiConstants.BASE_NAME + Format.JSON)) { @@ -72,6 +70,9 @@ class StaticDocument implements OpenApiDocumentHolder { document.reset(); document.config(openApiConfig); document.modelFromStaticFile(OpenApiProcessor.modelFromStaticFile(staticFile)); + if (autoFilter != null) { + document.filter(autoFilter); + } document.filter(OpenApiProcessor.getFilter(openApiConfig, cl)); document.initialize(); @@ -104,9 +105,10 @@ class DynamicDocument implements OpenApiDocumentHolder { private OpenAPI generatedOnBuild; private OpenApiConfig openApiConfig; - private OASFilter filter; + private OASFilter userFilter; + private OASFilter autoFilter; - DynamicDocument(Config config) { + DynamicDocument(Config config, OASFilter autoFilter) { ClassLoader cl = OpenApiConstants.classLoader == null ? Thread.currentThread().getContextClassLoader() : OpenApiConstants.classLoader; try (InputStream is = cl.getResourceAsStream(OpenApiConstants.BASE_NAME + Format.JSON)) { @@ -114,7 +116,8 @@ class DynamicDocument implements OpenApiDocumentHolder { try (OpenApiStaticFile staticFile = new OpenApiStaticFile(is, Format.JSON)) { this.generatedOnBuild = OpenApiProcessor.modelFromStaticFile(staticFile); this.openApiConfig = new OpenApiConfigImpl(config); - this.filter = OpenApiProcessor.getFilter(openApiConfig, cl); + this.userFilter = OpenApiProcessor.getFilter(openApiConfig, cl); + this.autoFilter = autoFilter; } } } catch (IOException ex) { @@ -153,7 +156,10 @@ private OpenApiDocument getOpenApiDocument() { document.reset(); document.config(this.openApiConfig); document.modelFromStaticFile(this.generatedOnBuild); - document.filter(this.filter); + if (this.autoFilter != null) { + document.filter(this.autoFilter); + } + document.filter(this.userFilter); document.initialize(); return document; } diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiHandler.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiHandler.java index 9be329c3afea77..c226b42b47fc3b 100644 --- a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiHandler.java +++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiHandler.java @@ -2,6 +2,8 @@ import java.util.List; +import org.eclipse.microprofile.openapi.OASFilter; + import io.quarkus.arc.Arc; import io.smallrye.openapi.runtime.io.Format; import io.vertx.core.Handler; @@ -32,9 +34,11 @@ public class OpenApiHandler implements Handler { } final boolean corsEnabled; + final OASFilter autoSecurityFilter; - public OpenApiHandler(boolean corsEnabled) { + public OpenApiHandler(boolean corsEnabled, OASFilter autoSecurityFilter) { this.corsEnabled = corsEnabled; + this.autoSecurityFilter = autoSecurityFilter; } @Override @@ -77,6 +81,7 @@ public void handle(RoutingContext event) { private OpenApiDocumentService getOpenApiDocumentService() { if (this.openApiDocumentService == null) { this.openApiDocumentService = Arc.container().instance(OpenApiDocumentService.class).get(); + this.openApiDocumentService.init(this.autoSecurityFilter); } return this.openApiDocumentService; } diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRecorder.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRecorder.java index be5250c3b0075e..3d3e3c196ee282 100644 --- a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRecorder.java +++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRecorder.java @@ -5,6 +5,7 @@ import java.net.URL; import java.util.Enumeration; +import org.eclipse.microprofile.openapi.OASFilter; import org.eclipse.microprofile.openapi.spi.OASFactoryResolver; import io.quarkus.runtime.ShutdownContext; @@ -16,9 +17,10 @@ @Recorder public class OpenApiRecorder { - public Handler handler(OpenApiRuntimeConfig runtimeConfig, HttpConfiguration configuration) { + public Handler handler(OpenApiRuntimeConfig runtimeConfig, HttpConfiguration configuration, + OASFilter autoSecurityFilter) { if (runtimeConfig.enable) { - return new OpenApiHandler(configuration.corsEnabled); + return new OpenApiHandler(configuration.corsEnabled, autoSecurityFilter); } else { return new OpenApiNotFoundHandler(); } diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoBasicSecurityFilter.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoBasicSecurityFilter.java new file mode 100644 index 00000000000000..fc1850052c0504 --- /dev/null +++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoBasicSecurityFilter.java @@ -0,0 +1,37 @@ +package io.quarkus.smallrye.openapi.runtime.filter; + +import org.eclipse.microprofile.openapi.OASFactory; +import org.eclipse.microprofile.openapi.models.security.SecurityScheme; + +/** + * Add Basic Authentication security automatically based on the added security extensions + */ +public class AutoBasicSecurityFilter extends AutoSecurityFilter { + private String basicSecuritySchemeValue; + + public AutoBasicSecurityFilter() { + super(); + } + + public AutoBasicSecurityFilter(String securitySchemeName, String securitySchemeDescription, + String basicSecuritySchemeValue) { + super(securitySchemeName, securitySchemeDescription); + this.basicSecuritySchemeValue = basicSecuritySchemeValue; + } + + public String getBasicSecuritySchemeValue() { + return basicSecuritySchemeValue; + } + + public void setBasicSecuritySchemeValue(String basicSecuritySchemeValue) { + this.basicSecuritySchemeValue = basicSecuritySchemeValue; + } + + @Override + protected SecurityScheme getSecurityScheme() { + SecurityScheme securityScheme = OASFactory.createSecurityScheme(); + securityScheme.setType(SecurityScheme.Type.HTTP); + securityScheme.setScheme(basicSecuritySchemeValue); + return securityScheme; + } +} \ No newline at end of file diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoJWTSecurityFilter.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoJWTSecurityFilter.java new file mode 100644 index 00000000000000..c246fce55b844a --- /dev/null +++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoJWTSecurityFilter.java @@ -0,0 +1,48 @@ +package io.quarkus.smallrye.openapi.runtime.filter; + +import org.eclipse.microprofile.openapi.OASFactory; +import org.eclipse.microprofile.openapi.models.security.SecurityScheme; + +/** + * Add JWT Authentication security automatically based on the added security extensions + */ +public class AutoJWTSecurityFilter extends AutoSecurityFilter { + private String jwtSecuritySchemeValue; + private String jwtBearerFormat; + + public AutoJWTSecurityFilter() { + super(); + } + + public AutoJWTSecurityFilter(String securitySchemeName, String securitySchemeDescription, String jwtSecuritySchemeValue, + String jwtBearerFormat) { + super(securitySchemeName, securitySchemeDescription); + this.jwtSecuritySchemeValue = jwtSecuritySchemeValue; + this.jwtBearerFormat = jwtBearerFormat; + } + + public String getJwtSecuritySchemeValue() { + return jwtSecuritySchemeValue; + } + + public void setJwtSecuritySchemeValue(String jwtSecuritySchemeValue) { + this.jwtSecuritySchemeValue = jwtSecuritySchemeValue; + } + + public String getJwtBearerFormat() { + return jwtBearerFormat; + } + + public void setJwtBearerFormat(String jwtBearerFormat) { + this.jwtBearerFormat = jwtBearerFormat; + } + + @Override + protected SecurityScheme getSecurityScheme() { + SecurityScheme securityScheme = OASFactory.createSecurityScheme(); + securityScheme.setType(SecurityScheme.Type.HTTP); + securityScheme.setScheme(jwtSecuritySchemeValue); + securityScheme.setBearerFormat(jwtBearerFormat); + return securityScheme; + } +} diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoSecurityFilter.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoSecurityFilter.java new file mode 100644 index 00000000000000..00f4cd8c597cfb --- /dev/null +++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoSecurityFilter.java @@ -0,0 +1,82 @@ +package io.quarkus.smallrye.openapi.runtime.filter; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.microprofile.config.Config; +import org.eclipse.microprofile.config.ConfigProvider; +import org.eclipse.microprofile.openapi.OASFactory; +import org.eclipse.microprofile.openapi.OASFilter; +import org.eclipse.microprofile.openapi.models.OpenAPI; +import org.eclipse.microprofile.openapi.models.security.SecurityScheme; +import org.jboss.logging.Logger; + +/** + * Auto add security + */ +public abstract class AutoSecurityFilter implements OASFilter { + private static final Logger log = Logger.getLogger(AutoSecurityFilter.class); + + private String securitySchemeName; + private String securitySchemeDescription; + + public AutoSecurityFilter() { + + } + + public AutoSecurityFilter(String securitySchemeName, String securitySchemeDescription) { + this.securitySchemeName = securitySchemeName; + this.securitySchemeDescription = securitySchemeDescription; + } + + public String getSecuritySchemeName() { + return securitySchemeName; + } + + public void setSecuritySchemeName(String securitySchemeName) { + this.securitySchemeName = securitySchemeName; + } + + public String getSecuritySchemeDescription() { + return securitySchemeDescription; + } + + public void setSecuritySchemeDescription(String securitySchemeDescription) { + this.securitySchemeDescription = securitySchemeDescription; + } + + @Override + public void filterOpenAPI(OpenAPI openAPI) { + // Make sure components are created + if (openAPI.getComponents() == null) { + openAPI.setComponents(OASFactory.createComponents()); + } + + Map securitySchemes = new HashMap<>(); + + // Add any existing security + if (openAPI.getComponents().getSecuritySchemes() != null + && !openAPI.getComponents().getSecuritySchemes().isEmpty()) { + securitySchemes.putAll(openAPI.getComponents().getSecuritySchemes()); + } + + SecurityScheme securityScheme = getSecurityScheme(); + securityScheme.setDescription(securitySchemeDescription); + securitySchemes.put(securitySchemeName, securityScheme); + openAPI.getComponents().setSecuritySchemes(securitySchemes); + } + + protected abstract SecurityScheme getSecurityScheme(); + + protected String getUrl(String configKey, String defaultValue, String shouldEndWith) { + Config c = ConfigProvider.getConfig(); + + String u = c.getOptionalValue(configKey, String.class).orElse(defaultValue); + + if (u != null && !u.endsWith(shouldEndWith)) { + u = u + shouldEndWith; + } + return u; + } + +} \ No newline at end of file diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoUrl.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoUrl.java new file mode 100644 index 00000000000000..8ee97b65c624d6 --- /dev/null +++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoUrl.java @@ -0,0 +1,60 @@ +package io.quarkus.smallrye.openapi.runtime.filter; + +import org.eclipse.microprofile.config.Config; +import org.eclipse.microprofile.config.ConfigProvider; + +/** + * Create a URL from a config, or a default value + */ +public class AutoUrl { + + private String defaultValue; + private String configKey; + private String path; + + public AutoUrl() { + } + + public AutoUrl(String defaultValue, String configKey, String path) { + this.defaultValue = defaultValue; + this.configKey = configKey; + this.path = path; + } + + public String getDefaultValue() { + return defaultValue; + } + + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + public String getConfigKey() { + return configKey; + } + + public void setConfigKey(String configKey) { + this.configKey = configKey; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getFinalUrlValue() { + Config c = ConfigProvider.getConfig(); + + String u = c.getOptionalValue(this.configKey, String.class).orElse(defaultValue); + + if (u != null && path != null && !u.endsWith(path)) { + u = u + path; + } + + return u; + } + +} diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/OpenIDConnectSecurityFilter.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/OpenIDConnectSecurityFilter.java new file mode 100644 index 00000000000000..cbc18a5c320b73 --- /dev/null +++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/OpenIDConnectSecurityFilter.java @@ -0,0 +1,71 @@ +package io.quarkus.smallrye.openapi.runtime.filter; + +import org.eclipse.microprofile.openapi.OASFactory; +import org.eclipse.microprofile.openapi.models.security.OAuthFlow; +import org.eclipse.microprofile.openapi.models.security.OAuthFlows; +import org.eclipse.microprofile.openapi.models.security.SecurityScheme; + +/** + * Add OAuth 2 (Implicit) Authentication security automatically based on the added security extensions + */ +public class OpenIDConnectSecurityFilter extends AutoSecurityFilter { + + private AutoUrl authorizationUrl; + private AutoUrl refreshUrl; + private AutoUrl tokenUrl; + + public OpenIDConnectSecurityFilter() { + super(); + } + + public OpenIDConnectSecurityFilter(String securitySchemeName, String securitySchemeDescription, + AutoUrl authorizationUrl, + AutoUrl refreshUrl, + AutoUrl tokenUrl) { + super(securitySchemeName, securitySchemeDescription); + this.authorizationUrl = authorizationUrl; + this.refreshUrl = refreshUrl; + this.tokenUrl = tokenUrl; + } + + public AutoUrl getAuthorizationUrl() { + return authorizationUrl; + } + + public void setAuthorizationUrl(AutoUrl authorizationUrl) { + this.authorizationUrl = authorizationUrl; + } + + public AutoUrl getRefreshUrl() { + return refreshUrl; + } + + public void setRefreshUrl(AutoUrl refreshUrl) { + this.refreshUrl = refreshUrl; + } + + public AutoUrl getTokenUrl() { + return tokenUrl; + } + + public void setTokenUrl(AutoUrl tokenUrl) { + this.tokenUrl = tokenUrl; + } + + @Override + protected SecurityScheme getSecurityScheme() { + SecurityScheme securityScheme = OASFactory.createSecurityScheme(); + + securityScheme.setType(SecurityScheme.Type.OAUTH2); + OAuthFlows oAuthFlows = OASFactory.createOAuthFlows(); + OAuthFlow oAuthFlow = OASFactory.createOAuthFlow(); + oAuthFlow.authorizationUrl(this.authorizationUrl.getFinalUrlValue()); + oAuthFlow.refreshUrl(this.refreshUrl.getFinalUrlValue()); + oAuthFlow.tokenUrl(this.tokenUrl.getFinalUrlValue()); + oAuthFlows.setImplicit(oAuthFlow); + securityScheme.setFlows(oAuthFlows); + + return securityScheme; + } + +} \ No newline at end of file diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java index e6a7e0d54c6c51..a7b7956bf0068a 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java @@ -89,7 +89,8 @@ SyntheticBeanBuildItem initMtlsClientAuth( @Record(ExecutionTime.RUNTIME_INIT) SyntheticBeanBuildItem initBasicAuth( HttpSecurityRecorder recorder, - HttpBuildTimeConfig buildTimeConfig) { + HttpBuildTimeConfig buildTimeConfig, + BuildProducer securityInformationProducer) { if ((buildTimeConfig.auth.form.enabled || isMtlsClientAuthenticationEnabled(buildTimeConfig)) && !buildTimeConfig.auth.basic) { //if form auth is enabled and we are not then we don't install @@ -105,6 +106,7 @@ SyntheticBeanBuildItem initBasicAuth( && !buildTimeConfig.auth.basic) { //if not explicitly enabled we make this a default bean, so it is the fallback if nothing else is defined configurator.defaultBean(); + securityInformationProducer.produce(SecurityInformationBuildItem.BASIC()); } return configurator.done(); @@ -119,7 +121,8 @@ void setupAuthenticationMechanisms( Capabilities capabilities, BuildProducer beanContainerListenerBuildItemBuildProducer, HttpBuildTimeConfig buildTimeConfig, - List httpSecurityPolicyBuildItemList) { + List httpSecurityPolicyBuildItemList, + BuildProducer securityInformationProducer) { Map> policyMap = new HashMap<>(); for (HttpSecurityPolicyBuildItem e : httpSecurityPolicyBuildItemList) { if (policyMap.containsKey(e.getName())) { @@ -131,6 +134,7 @@ void setupAuthenticationMechanisms( if (buildTimeConfig.auth.form.enabled) { } else if (buildTimeConfig.auth.basic) { beanProducer.produce(AdditionalBeanBuildItem.unremovableOf(BasicAuthenticationMechanism.class)); + securityInformationProducer.produce(SecurityInformationBuildItem.BASIC()); } if (capabilities.isPresent(Capability.SECURITY)) { diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/SecurityInformationBuildItem.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/SecurityInformationBuildItem.java new file mode 100644 index 00000000000000..f1b6c64aec8a43 --- /dev/null +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/SecurityInformationBuildItem.java @@ -0,0 +1,59 @@ +package io.quarkus.vertx.http.deployment; + +import java.util.Optional; + +import io.quarkus.builder.item.MultiBuildItem; + +/** + * Contains information on the security model used in the application + */ +public final class SecurityInformationBuildItem extends MultiBuildItem { + + private final SecurityModel securityModel; + private final Optional openIDConnectInformation; + + public static SecurityInformationBuildItem BASIC() { + return new SecurityInformationBuildItem(SecurityModel.basic, Optional.empty()); + } + + public static SecurityInformationBuildItem JWT() { + return new SecurityInformationBuildItem(SecurityModel.jwt, Optional.empty()); + } + + public static SecurityInformationBuildItem OPENIDCONNECT(String urlConfigKey) { + return new SecurityInformationBuildItem(SecurityModel.oidc, + Optional.of(new OpenIDConnectInformation(urlConfigKey))); + } + + public SecurityInformationBuildItem(SecurityModel securityModel, + Optional openIDConnectInformation) { + this.securityModel = securityModel; + this.openIDConnectInformation = openIDConnectInformation; + } + + public SecurityModel getSecurityModel() { + return securityModel; + } + + public Optional getOpenIDConnectInformation() { + return openIDConnectInformation; + } + + public enum SecurityModel { + basic, + jwt, + oidc + } + + public static class OpenIDConnectInformation { + private final String urlConfigKey; + + public OpenIDConnectInformation(String urlConfigKey) { + this.urlConfigKey = urlConfigKey; + } + + public String getUrlConfigKey() { + return urlConfigKey; + } + } +} \ No newline at end of file From 7142e7913f0f476889b7353432d339ca14b2ad12 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Tue, 31 Aug 2021 11:59:36 +0200 Subject: [PATCH 019/138] fix: K8s Service can be re-applied Signed-off-by: Marc Nuri --- .../deployment/KubernetesDeployer.java | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java index c358fb29ea50d5..362b63ae063578 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java @@ -11,11 +11,12 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Path; -import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -25,6 +26,7 @@ import io.dekorate.utils.Serialization; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.KubernetesList; +import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.openshift.api.model.Route; @@ -42,7 +44,6 @@ import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem; import io.quarkus.kubernetes.client.deployment.KubernetesClientErrorHandler; import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem; -import io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem; public class KubernetesDeployer { @@ -60,7 +61,7 @@ public void selectDeploymentTarget(ContainerImageInfoBuildItem containerImageInf Optional activeContainerImageCapability = ContainerImageCapabilitiesUtil .getActiveContainerImageCapability(capabilities); - if (!activeContainerImageCapability.isPresent()) { + if (activeContainerImageCapability.isEmpty()) { // we can't thrown an exception here, because it could prevent the Kubernetes resources from being generated return; } @@ -85,10 +86,10 @@ public void deploy(KubernetesClientBuildItem kubernetesClient, return; } - if (!selectedDeploymentTarget.isPresent()) { + if (selectedDeploymentTarget.isEmpty()) { - if (!ContainerImageCapabilitiesUtil - .getActiveContainerImageCapability(capabilities).isPresent()) { + if (ContainerImageCapabilitiesUtil + .getActiveContainerImageCapability(capabilities).isEmpty()) { throw new RuntimeException( "A Kubernetes deployment was requested but no extension was found to build a container image. Consider adding one of following extensions: " + CONTAINER_IMAGE_EXTENSIONS_STR + "."); @@ -158,11 +159,6 @@ private DeploymentTargetEntry determineDeploymentTarget( return selectedTarget; } - private Optional getOptionalDeploymentTarget( - List deploymentTargets, String name) { - return deploymentTargets.stream().filter(d -> name.equals(d.getName())).findFirst(); - } - private DeploymentResultBuildItem deploy(DeploymentTargetEntry deploymentTarget, KubernetesClient client, Path outputDir, OpenshiftConfig openshiftConfig, ApplicationInfoBuildItem applicationInfo) { @@ -174,12 +170,13 @@ private DeploymentResultBuildItem deploy(DeploymentTargetEntry deploymentTarget, try (FileInputStream fis = new FileInputStream(manifest)) { KubernetesList list = Serialization.unmarshalAsList(fis); - distinct(list.getItems()).forEach(i -> { - if (KNATIVE.equals(deploymentTarget.getName().toLowerCase())) { - client.resource(i).inNamespace(namespace).deletingExisting().createOrReplace(); - } else { - client.resource(i).inNamespace(namespace).createOrReplace(); + list.getItems().stream().filter(distinctByResourceKey()).forEach(i -> { + final var r = client.resource(i).inNamespace(namespace); + if (shouldDeleteExisting(deploymentTarget, i)) { + r.delete(); + r.waitUntilCondition(Objects::isNull, 10, TimeUnit.SECONDS); } + r.createOrReplace(); log.info("Applied: " + i.getKind() + " " + i.getMetadata().getName() + "."); }); @@ -221,13 +218,15 @@ private void printExposeInformation(KubernetesClient client, KubernetesList list } } - public static Predicate distictByResourceKey() { + private static boolean shouldDeleteExisting(DeploymentTargetEntry deploymentTarget, HasMetadata resource) { + return KNATIVE.equalsIgnoreCase(deploymentTarget.getName()) + || resource instanceof Service + || (Objects.equals("v1", resource.getApiVersion()) && Objects.equals("Service", resource.getKind())); + } + + private static Predicate distinctByResourceKey() { Map seen = new ConcurrentHashMap<>(); return t -> seen.putIfAbsent(t.getApiVersion() + "/" + t.getKind() + ":" + t.getMetadata().getName(), Boolean.TRUE) == null; } - - private static Collection distinct(Collection resources) { - return resources.stream().filter(distictByResourceKey()).collect(Collectors.toList()); - } } From 57d2f7cfd67c7690b7aba46b24360c43573fa52d Mon Sep 17 00:00:00 2001 From: Martin Kouba Date: Tue, 31 Aug 2021 12:50:18 +0200 Subject: [PATCH 020/138] Codestarts - gRPC - add index.html - resolves #19642 --- .../main/resources/META-INF/resources/index.entry.qute.html | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/grpc-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/grpc-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/grpc-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html new file mode 100644 index 00000000000000..0317faba622636 --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/grpc-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html @@ -0,0 +1,3 @@ +{#include index-entry} +{#body}This codestart implements a simple gRPC service that can be tested in the Dev UI (available in dev mode only). +{/include} \ No newline at end of file From 48b365f64a1cef35cffc627186e7e6ee9df47d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Tue, 6 Jul 2021 17:51:48 +0200 Subject: [PATCH 021/138] Liquibase MongoDB extension Fixes #18009, #9801 --- .github/native-tests.json | 2 +- bom/application/pom.xml | 16 + .../java/io/quarkus/deployment/Feature.java | 1 + devtools/bom-descriptor-json/pom.xml | 13 + docs/pom.xml | 13 + .../liquibase-mongodb/deployment/pom.xml | 48 +++ .../deployment/LiquibaseProcessor.java | 325 ++++++++++++++++++ extensions/liquibase-mongodb/pom.xml | 22 ++ extensions/liquibase-mongodb/runtime/pom.xml | 71 ++++ .../liquibase/LiquibaseMongodbFactory.java | 95 +++++ .../LiquibaseMongodbBuildTimeConfig.java | 16 + .../runtime/LiquibaseMongodbConfig.java | 68 ++++ .../runtime/LiquibaseMongodbRecorder.java | 63 ++++ .../runtime/graal/SubstituteStringUtil.java | 37 ++ .../resources/META-INF/quarkus-extension.yaml | 11 + extensions/pom.xml | 1 + integration-tests/liquibase-mongodb/pom.xml | 106 ++++++ .../quarkus/it/liquibase/mongodb/Fruit.java | 8 + .../it/liquibase/mongodb/FruitResource.java | 33 ++ .../src/main/resources/application.properties | 4 + .../main/resources/liquibase/changelog.xml | 23 ++ .../liquibase/mongodb/FruitResourceTest.java | 51 +++ integration-tests/pom.xml | 1 + 23 files changed, 1027 insertions(+), 1 deletion(-) create mode 100644 extensions/liquibase-mongodb/deployment/pom.xml create mode 100644 extensions/liquibase-mongodb/deployment/src/main/java/io/quarkus/liquibase/mongodb/deployment/LiquibaseProcessor.java create mode 100644 extensions/liquibase-mongodb/pom.xml create mode 100644 extensions/liquibase-mongodb/runtime/pom.xml create mode 100644 extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/LiquibaseMongodbFactory.java create mode 100644 extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbBuildTimeConfig.java create mode 100644 extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbConfig.java create mode 100644 extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbRecorder.java create mode 100644 extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStringUtil.java create mode 100644 extensions/liquibase-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml create mode 100644 integration-tests/liquibase-mongodb/pom.xml create mode 100644 integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/Fruit.java create mode 100644 integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/FruitResource.java create mode 100644 integration-tests/liquibase-mongodb/src/main/resources/application.properties create mode 100644 integration-tests/liquibase-mongodb/src/main/resources/liquibase/changelog.xml create mode 100644 integration-tests/liquibase-mongodb/src/test/java/io/quarkus/it/liquibase/mongodb/FruitResourceTest.java diff --git a/.github/native-tests.json b/.github/native-tests.json index fb363a4eaa1110..e0b017c8e9c6cd 100644 --- a/.github/native-tests.json +++ b/.github/native-tests.json @@ -21,7 +21,7 @@ { "category": "Data3", "timeout": 70, - "test-modules": "flyway, hibernate-orm-panache, hibernate-orm-panache-kotlin, hibernate-orm-envers, liquibase", + "test-modules": "flyway, hibernate-orm-panache, hibernate-orm-panache-kotlin, hibernate-orm-envers, liquibase, liquibase-mongodb", "os-name": "ubuntu-latest" }, { diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 5a28a7cab7d310..ebfe0a06a2c6f1 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -159,6 +159,7 @@ 7.14.0 1.0.9 4.4.3 + 4.4.3 1.29 6.0.0 4.3.4 @@ -818,6 +819,16 @@ quarkus-liquibase-deployment ${project.version} + + io.quarkus + quarkus-liquibase-mongodb + ${project.version} + + + io.quarkus + quarkus-liquibase-mongodb-deployment + ${project.version} + io.quarkus quarkus-hibernate-orm @@ -5061,6 +5072,11 @@ + + org.liquibase.ext + liquibase-mongodb + ${liquibase-mongodb.version} + org.yaml snakeyaml diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Feature.java b/core/deployment/src/main/java/io/quarkus/deployment/Feature.java index 6ec6eeb0eba48b..4abf8590c92bff 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/Feature.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/Feature.java @@ -62,6 +62,7 @@ public enum Feature { KUBERNETES, KUBERNETES_CLIENT, LIQUIBASE, + LIQUIBASE_MONGODB, LOGGING_GELF, MAILER, MICROMETER, diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml index d18fd370ada258..00fe839c0311f9 100644 --- a/devtools/bom-descriptor-json/pom.xml +++ b/devtools/bom-descriptor-json/pom.xml @@ -1332,6 +1332,19 @@ + + io.quarkus + quarkus-liquibase-mongodb + ${project.version} + pom + test + + + * + * + + + io.quarkus quarkus-logging-gelf diff --git a/docs/pom.xml b/docs/pom.xml index 0b26767dec399e..4b4dc0cf1b9968 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -1293,6 +1293,19 @@ + + io.quarkus + quarkus-liquibase-mongodb-deployment + ${project.version} + pom + test + + + * + * + + + io.quarkus quarkus-logging-gelf-deployment diff --git a/extensions/liquibase-mongodb/deployment/pom.xml b/extensions/liquibase-mongodb/deployment/pom.xml new file mode 100644 index 00000000000000..6cac71b48c6cd6 --- /dev/null +++ b/extensions/liquibase-mongodb/deployment/pom.xml @@ -0,0 +1,48 @@ + + + + quarkus-liquibase-mongodb-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-liquibase-mongodb-deployment + Quarkus - Liquibase MongoDB - Deployment + + + + io.quarkus + quarkus-liquibase-mongodb + + + io.quarkus + quarkus-mongodb-client-deployment + + + + io.quarkus + quarkus-junit5-internal + test + + + + + + + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + ${project.version} + + + + + + + diff --git a/extensions/liquibase-mongodb/deployment/src/main/java/io/quarkus/liquibase/mongodb/deployment/LiquibaseProcessor.java b/extensions/liquibase-mongodb/deployment/src/main/java/io/quarkus/liquibase/mongodb/deployment/LiquibaseProcessor.java new file mode 100644 index 00000000000000..ec9ddc2a910ded --- /dev/null +++ b/extensions/liquibase-mongodb/deployment/src/main/java/io/quarkus/liquibase/mongodb/deployment/LiquibaseProcessor.java @@ -0,0 +1,325 @@ +package io.quarkus.liquibase.mongodb.deployment; + +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; + +import java.io.IOException; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Stream; + +import javax.enterprise.context.ApplicationScoped; + +import org.jboss.jandex.AnnotationInstance; +import org.jboss.jandex.AnnotationTarget; +import org.jboss.jandex.DotName; +import org.jboss.logging.Logger; + +import io.quarkus.arc.deployment.SyntheticBeanBuildItem; +import io.quarkus.arc.deployment.SyntheticBeansRuntimeInitBuildItem; +import io.quarkus.deployment.Feature; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Consume; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.ServiceStartBuildItem; +import io.quarkus.deployment.builditem.SystemPropertyBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem; +import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; +import io.quarkus.deployment.util.ServiceUtil; +import io.quarkus.liquibase.LiquibaseMongodbFactory; +import io.quarkus.liquibase.runtime.LiquibaseMongodbBuildTimeConfig; +import io.quarkus.liquibase.runtime.LiquibaseMongodbConfig; +import io.quarkus.liquibase.runtime.LiquibaseMongodbRecorder; +import io.quarkus.mongodb.runtime.MongodbConfig; +import liquibase.change.Change; +import liquibase.change.DatabaseChangeProperty; +import liquibase.change.core.CreateProcedureChange; +import liquibase.change.core.CreateViewChange; +import liquibase.change.core.LoadDataChange; +import liquibase.change.core.SQLFileChange; +import liquibase.changelog.ChangeLogParameters; +import liquibase.changelog.ChangeSet; +import liquibase.changelog.DatabaseChangeLog; +import liquibase.exception.LiquibaseException; +import liquibase.parser.ChangeLogParser; +import liquibase.parser.ChangeLogParserFactory; +import liquibase.resource.ClassLoaderResourceAccessor; + +class LiquibaseProcessor { + + private static final Logger LOGGER = Logger.getLogger(LiquibaseProcessor.class); + + private static final String LIQUIBASE_BEAN_NAME_PREFIX = "liquibase_"; + + private static final DotName DATABASE_CHANGE_PROPERTY = DotName.createSimple(DatabaseChangeProperty.class.getName()); + + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(Feature.LIQUIBASE_MONGODB); + } + + @BuildStep + public SystemPropertyBuildItem disableHub() { + // Don't block app startup with prompt: + // Do you want to see this operation's report in Liquibase Hub, which improves team collaboration? + // If so, enter your email. If not, enter [N] to no longer be prompted, or [S] to skip for now, but ask again next time (default "S"): + return new SystemPropertyBuildItem("liquibase.hub.mode", "off"); + } + + @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class) + @Record(STATIC_INIT) + void nativeImageConfiguration( + LiquibaseMongodbRecorder recorder, + LiquibaseMongodbBuildTimeConfig liquibaseBuildConfig, + CombinedIndexBuildItem combinedIndex, + BuildProducer reflective, + BuildProducer resource, + BuildProducer services, + BuildProducer runtimeInitialized, + BuildProducer resourceBundle) { + + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem(liquibase.diff.compare.CompareControl.class.getName())); + + reflective.produce(new ReflectiveClassBuildItem(false, true, false, + liquibase.change.AbstractSQLChange.class.getName(), + liquibase.database.jvm.JdbcConnection.class.getName())); + + reflective.produce(new ReflectiveClassBuildItem(true, true, true, + liquibase.parser.ChangeLogParserCofiguration.class.getName(), + liquibase.hub.HubServiceFactory.class.getName(), + liquibase.logging.core.DefaultLoggerConfiguration.class.getName(), + liquibase.configuration.GlobalConfiguration.class.getName(), + com.datical.liquibase.ext.config.LiquibaseProConfiguration.class.getName(), + liquibase.license.LicenseServiceFactory.class.getName(), + liquibase.executor.ExecutorService.class.getName(), + liquibase.change.ChangeFactory.class.getName(), + liquibase.logging.core.LogServiceFactory.class.getName(), + liquibase.logging.LogFactory.class.getName(), + liquibase.change.ColumnConfig.class.getName(), + liquibase.change.AddColumnConfig.class.getName(), + liquibase.change.core.LoadDataColumnConfig.class.getName(), + liquibase.sql.visitor.PrependSqlVisitor.class.getName(), + liquibase.sql.visitor.ReplaceSqlVisitor.class.getName(), + liquibase.sql.visitor.AppendSqlVisitor.class.getName(), + liquibase.sql.visitor.RegExpReplaceSqlVisitor.class.getName())); + + reflective.produce(new ReflectiveClassBuildItem(false, false, true, + liquibase.change.ConstraintsConfig.class.getName())); + + // register classes marked with @DatabaseChangeProperty for reflection + Set classesMarkedWithDatabaseChangeProperty = new HashSet<>(); + for (AnnotationInstance databaseChangePropertyInstance : combinedIndex.getIndex() + .getAnnotations(DATABASE_CHANGE_PROPERTY)) { + // the annotation is only supported on methods but let's be safe + AnnotationTarget annotationTarget = databaseChangePropertyInstance.target(); + if (annotationTarget.kind() == AnnotationTarget.Kind.METHOD) { + classesMarkedWithDatabaseChangeProperty.add(annotationTarget.asMethod().declaringClass().name().toString()); + } + } + reflective.produce( + new ReflectiveClassBuildItem(true, true, true, classesMarkedWithDatabaseChangeProperty.toArray(new String[0]))); + + resource.produce( + new NativeImageResourceBuildItem(getChangeLogs(liquibaseBuildConfig).toArray(new String[0]))); + + Stream.of(liquibase.change.Change.class, + liquibase.changelog.ChangeLogHistoryService.class, + liquibase.command.LiquibaseCommand.class, + liquibase.database.Database.class, + liquibase.database.DatabaseConnection.class, + liquibase.datatype.LiquibaseDataType.class, + liquibase.diff.compare.DatabaseObjectComparator.class, + liquibase.diff.DiffGenerator.class, + liquibase.diff.output.changelog.ChangeGenerator.class, + liquibase.executor.Executor.class, + liquibase.license.LicenseService.class, + liquibase.lockservice.LockService.class, + liquibase.logging.LogService.class, + liquibase.parser.ChangeLogParser.class, + liquibase.parser.NamespaceDetails.class, + liquibase.parser.SnapshotParser.class, + liquibase.precondition.Precondition.class, + liquibase.serializer.ChangeLogSerializer.class, + liquibase.serializer.SnapshotSerializer.class, + liquibase.servicelocator.ServiceLocator.class, + liquibase.snapshot.SnapshotGenerator.class, + liquibase.sqlgenerator.SqlGenerator.class, + liquibase.structure.DatabaseObject.class, + liquibase.hub.HubService.class) + .forEach(t -> addService(services, reflective, t, false)); + + // Register Precondition services, and the implementation class for reflection while also registering fields for reflection + addService(services, reflective, liquibase.precondition.Precondition.class, true); + + // liquibase XSD + resource.produce(new NativeImageResourceBuildItem( + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.7.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.10.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.0.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd", + "www.liquibase.org/xml/ns/pro/liquibase-pro-3.8.xsd", + "www.liquibase.org/xml/ns/pro/liquibase-pro-3.9.xsd", + "www.liquibase.org/xml/ns/pro/liquibase-pro-3.10.xsd", + "www.liquibase.org/xml/ns/pro/liquibase-pro-4.0.xsd", + "www.liquibase.org/xml/ns/pro/liquibase-pro-4.1.xsd", + "liquibase.build.properties")); + + // liquibase resource bundles + resourceBundle.produce(new NativeImageResourceBundleBuildItem("liquibase/i18n/liquibase-core")); + } + + private void addService(BuildProducer services, + BuildProducer reflective, Class serviceClass, + boolean shouldRegisterFieldForReflection) { + try { + String service = "META-INF/services/" + serviceClass.getName(); + Set implementations = ServiceUtil.classNamesNamedIn(Thread.currentThread().getContextClassLoader(), + service); + services.produce(new ServiceProviderBuildItem(serviceClass.getName(), implementations.toArray(new String[0]))); + + reflective.produce(new ReflectiveClassBuildItem(true, true, shouldRegisterFieldForReflection, + implementations.toArray(new String[0]))); + } catch (IOException ex) { + throw new IllegalStateException(ex); + } + } + + @BuildStep + @Record(ExecutionTime.RUNTIME_INIT) + void createBeans(LiquibaseMongodbRecorder recorder, + LiquibaseMongodbConfig liquibaseMongodbConfig, + LiquibaseMongodbBuildTimeConfig liquibaseMongodbBuildTimeConfig, + MongodbConfig mongodbConfig, + BuildProducer syntheticBeanBuildItemBuildProducer) { + + SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem + .configure(LiquibaseMongodbFactory.class) + .scope(ApplicationScoped.class) // this is what the existing code does, but it doesn't seem reasonable + .setRuntimeInit() + .unremovable() + .supplier(recorder.liquibaseSupplier(liquibaseMongodbConfig, liquibaseMongodbBuildTimeConfig, mongodbConfig)); + + syntheticBeanBuildItemBuildProducer.produce(configurator.done()); + } + + @BuildStep + @Record(ExecutionTime.RUNTIME_INIT) + @Consume(SyntheticBeansRuntimeInitBuildItem.class) + ServiceStartBuildItem startLiquibase(LiquibaseMongodbRecorder recorder) { + // will actually run the actions at runtime + recorder.doStartActions(); + + return new ServiceStartBuildItem("liquibase-mongodb"); + } + + /** + * Collect the configured changeLog file for the default and all named datasources. + *

    + * A {@link LinkedHashSet} is used to avoid duplications. + */ + private List getChangeLogs(LiquibaseMongodbBuildTimeConfig liquibaseBuildConfig) { + ChangeLogParameters changeLogParameters = new ChangeLogParameters(); + ClassLoaderResourceAccessor classLoaderResourceAccessor = new ClassLoaderResourceAccessor( + Thread.currentThread().getContextClassLoader()); + + ChangeLogParserFactory changeLogParserFactory = ChangeLogParserFactory.getInstance(); + + Set resources = new LinkedHashSet<>(); + + resources.addAll(findAllChangeLogFiles(liquibaseBuildConfig.changeLog, changeLogParserFactory, + classLoaderResourceAccessor, changeLogParameters)); + + LOGGER.debugf("Liquibase changeLogs: %s", resources); + + return new ArrayList<>(resources); + } + + /** + * Finds all resource files for the given change log file + */ + private Set findAllChangeLogFiles(String file, ChangeLogParserFactory changeLogParserFactory, + ClassLoaderResourceAccessor classLoaderResourceAccessor, + ChangeLogParameters changeLogParameters) { + try { + ChangeLogParser parser = changeLogParserFactory.getParser(file, classLoaderResourceAccessor); + DatabaseChangeLog changelog = parser.parse(file, changeLogParameters, classLoaderResourceAccessor); + + if (changelog != null) { + Set result = new LinkedHashSet<>(); + // get all changeSet files + for (ChangeSet changeSet : changelog.getChangeSets()) { + result.add(changeSet.getFilePath()); + + changeSet.getChanges().stream() + .map(change -> extractChangeFile(change, changeSet.getFilePath())) + .forEach(changeFile -> changeFile.ifPresent(result::add)); + + // get all parents of the changeSet + DatabaseChangeLog parent = changeSet.getChangeLog(); + while (parent != null) { + result.add(parent.getFilePath()); + parent = parent.getParentChangeLog(); + } + } + result.add(changelog.getFilePath()); + return result; + } + } catch (LiquibaseException ex) { + throw new IllegalStateException(ex); + } + return Collections.emptySet(); + } + + private Optional extractChangeFile(Change change, String changeSetFilePath) { + String path = null; + Boolean relative = null; + if (change instanceof LoadDataChange) { + LoadDataChange loadDataChange = (LoadDataChange) change; + path = loadDataChange.getFile(); + relative = loadDataChange.isRelativeToChangelogFile(); + } else if (change instanceof SQLFileChange) { + SQLFileChange sqlFileChange = (SQLFileChange) change; + path = sqlFileChange.getPath(); + relative = sqlFileChange.isRelativeToChangelogFile(); + } else if (change instanceof CreateProcedureChange) { + CreateProcedureChange createProcedureChange = (CreateProcedureChange) change; + path = createProcedureChange.getPath(); + relative = createProcedureChange.isRelativeToChangelogFile(); + } else if (change instanceof CreateViewChange) { + CreateViewChange createViewChange = (CreateViewChange) change; + path = createViewChange.getPath(); + relative = createViewChange.getRelativeToChangelogFile(); + } + + // unrelated change or change does not reference a file (e.g. inline view) + if (path == null) { + return Optional.empty(); + } + // absolute file path or changeSet has no file path + if (relative == null || !relative || changeSetFilePath == null) { + return Optional.of(path); + } + + // relative file path needs to be resolved against changeSetFilePath + // notes: ClassLoaderResourceAccessor does not provide a suitable method and CLRA.getFinalPath() is not visible + return Optional.of(Paths.get(changeSetFilePath).resolveSibling(path).toString().replace('\\', '/')); + } +} diff --git a/extensions/liquibase-mongodb/pom.xml b/extensions/liquibase-mongodb/pom.xml new file mode 100644 index 00000000000000..f9432f43440cb1 --- /dev/null +++ b/extensions/liquibase-mongodb/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-extensions-parent + io.quarkus + 999-SNAPSHOT + ../pom.xml + + 4.0.0 + + quarkus-liquibase-mongodb-parent + Quarkus - Liquibase MongoDB + pom + + + runtime + deployment + + + \ No newline at end of file diff --git a/extensions/liquibase-mongodb/runtime/pom.xml b/extensions/liquibase-mongodb/runtime/pom.xml new file mode 100644 index 00000000000000..e027988136da56 --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/pom.xml @@ -0,0 +1,71 @@ + + + + quarkus-liquibase-mongodb-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-liquibase-mongodb + Quarkus - Liquibase MongoDB - Runtime + Handle your MongoDB schema migrations with Liquibase + + + io.quarkus + quarkus-mongodb-client + + + org.liquibase + liquibase-core + + + org.yaml + snakeyaml + + + org.liquibase.ext + liquibase-mongodb + + + org.graalvm.nativeimage + svm + provided + + + + + io.quarkus + quarkus-junit5-internal + test + + + + + + + io.quarkus + quarkus-bootstrap-maven-plugin + + + io.quarkus.liquibase.mongodb + + + + + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + ${project.version} + + + + + + + diff --git a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/LiquibaseMongodbFactory.java b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/LiquibaseMongodbFactory.java new file mode 100644 index 00000000000000..5369cfdad6b3bf --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/LiquibaseMongodbFactory.java @@ -0,0 +1,95 @@ +package io.quarkus.liquibase; + +import java.util.Map; +import java.util.regex.Pattern; + +import io.quarkus.liquibase.runtime.LiquibaseMongodbBuildTimeConfig; +import io.quarkus.liquibase.runtime.LiquibaseMongodbConfig; +import io.quarkus.mongodb.runtime.MongoClientConfig; +import liquibase.Contexts; +import liquibase.LabelExpression; +import liquibase.Liquibase; +import liquibase.database.Database; +import liquibase.database.DatabaseFactory; +import liquibase.resource.ClassLoaderResourceAccessor; +import liquibase.resource.ResourceAccessor; + +public class LiquibaseMongodbFactory { + + private final MongoClientConfig mongoClientConfig; + private final LiquibaseMongodbConfig liquibaseMongodbConfig; + private final LiquibaseMongodbBuildTimeConfig liquibaseMongodbBuildTimeConfig; + + //connection-string format, see https://docs.mongodb.com/manual/reference/connection-string/ + Pattern HAS_DB = Pattern.compile("(mongodb|mongodb\\+srv)://[^/]*/.*"); + + public LiquibaseMongodbFactory(LiquibaseMongodbConfig config, + LiquibaseMongodbBuildTimeConfig liquibaseMongodbBuildTimeConfig, MongoClientConfig mongoClientConfig) { + this.liquibaseMongodbConfig = config; + this.liquibaseMongodbBuildTimeConfig = liquibaseMongodbBuildTimeConfig; + this.mongoClientConfig = mongoClientConfig; + } + + public Liquibase createLiquibase() { + try { + ResourceAccessor resourceAccessor = new ClassLoaderResourceAccessor(Thread.currentThread().getContextClassLoader()); + String connectionString = this.mongoClientConfig.connectionString.orElse("mongodb://localhost:27017"); + if (!HAS_DB.matcher(connectionString).matches()) { + connectionString += "/" + this.mongoClientConfig.database.orElseThrow( + () -> new IllegalArgumentException( + "Config property 'quarkus.mongodb.database' must be defined when no database " + + "exist in the connection string")); + } + Database database = DatabaseFactory.getInstance().openDatabase(connectionString, + this.mongoClientConfig.credentials.username.orElse(null), + this.mongoClientConfig.credentials.password.orElse(null), + null, resourceAccessor); + + ; + if (database != null) { + liquibaseMongodbConfig.liquibaseCatalogName.ifPresent(database::setLiquibaseCatalogName); + liquibaseMongodbConfig.liquibaseSchemaName.ifPresent(database::setLiquibaseSchemaName); + liquibaseMongodbConfig.liquibaseTablespaceName.ifPresent(database::setLiquibaseTablespaceName); + + if (liquibaseMongodbConfig.defaultCatalogName.isPresent()) { + database.setDefaultCatalogName(liquibaseMongodbConfig.defaultCatalogName.get()); + } + if (liquibaseMongodbConfig.defaultSchemaName.isPresent()) { + database.setDefaultSchemaName(liquibaseMongodbConfig.defaultSchemaName.get()); + } + } + Liquibase liquibase = new Liquibase(liquibaseMongodbBuildTimeConfig.changeLog, resourceAccessor, database); + + for (Map.Entry entry : liquibaseMongodbConfig.changeLogParameters.entrySet()) { + liquibase.getChangeLogParameters().set(entry.getKey(), entry.getValue()); + } + + return liquibase; + + } catch (Exception ex) { + throw new IllegalStateException(ex); + } + } + + public LiquibaseMongodbConfig getConfiguration() { + return liquibaseMongodbConfig; + } + + /** + * Creates the default labels base on the configuration + * + * @return the label expression + */ + public LabelExpression createLabels() { + return new LabelExpression(liquibaseMongodbConfig.labels.orElse(null)); + } + + /** + * Creates the default contexts base on the configuration + * + * @return the contexts + */ + public Contexts createContexts() { + return new Contexts(liquibaseMongodbConfig.contexts.orElse(null)); + } +} diff --git a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbBuildTimeConfig.java b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbBuildTimeConfig.java new file mode 100644 index 00000000000000..9bd5432a0f75e2 --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbBuildTimeConfig.java @@ -0,0 +1,16 @@ +package io.quarkus.liquibase.runtime; + +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; + +/** + * The liquibase configuration + */ +@ConfigRoot(name = "liquibase-mongodb", phase = ConfigPhase.BUILD_TIME) +public class LiquibaseMongodbBuildTimeConfig { + + /** + * The change log file + */ + public String changeLog = "db/changeLog.xml"; +} diff --git a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbConfig.java b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbConfig.java new file mode 100644 index 00000000000000..6cab1009c19d7d --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbConfig.java @@ -0,0 +1,68 @@ +package io.quarkus.liquibase.runtime; + +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; + +/** + * The liquibase configuration + */ +@ConfigRoot(name = "liquibase-mongodb", phase = ConfigPhase.RUN_TIME) +public class LiquibaseMongodbConfig { + + /** + * The migrate at start flag + */ + public boolean migrateAtStart = false; + + /** + * The validate on update flag + */ + public boolean validateOnMigrate = true; + + /** + * The clean at start flag + */ + public boolean cleanAtStart = false; + + public Map changeLogParameters = null; + + /** + * The list of contexts + */ + public Optional> contexts = null; + + /** + * The list of labels + */ + public Optional> labels = null; + + /** + * The default catalog name + */ + public Optional defaultCatalogName = Optional.empty(); + + /** + * The default schema name + */ + public Optional defaultSchemaName = Optional.empty(); + + /** + * The liquibase tables catalog name + */ + public Optional liquibaseCatalogName = Optional.empty(); + + /** + * The liquibase tables schema name + */ + public Optional liquibaseSchemaName = Optional.empty(); + + /** + * The liquibase tables tablespace name + */ + public Optional liquibaseTablespaceName = Optional.empty(); + +} diff --git a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbRecorder.java b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbRecorder.java new file mode 100644 index 00000000000000..84759f8ac1e6cd --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbRecorder.java @@ -0,0 +1,63 @@ +package io.quarkus.liquibase.runtime; + +import java.util.function.Supplier; + +import javax.enterprise.inject.Any; +import javax.enterprise.inject.UnsatisfiedResolutionException; + +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableInstance; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.liquibase.LiquibaseMongodbFactory; +import io.quarkus.mongodb.runtime.MongodbConfig; +import io.quarkus.runtime.annotations.Recorder; +import liquibase.Liquibase; + +@Recorder +public class LiquibaseMongodbRecorder { + + public Supplier liquibaseSupplier(LiquibaseMongodbConfig config, + LiquibaseMongodbBuildTimeConfig buildTimeConfig, MongodbConfig mongodbConfig) { + return new Supplier() { + @Override + public LiquibaseMongodbFactory get() { + return new LiquibaseMongodbFactory(config, buildTimeConfig, mongodbConfig.defaultMongoClientConfig); + } + }; + } + + public void doStartActions() { + try { + InjectableInstance liquibaseFactoryInstance = Arc.container() + .select(LiquibaseMongodbFactory.class, Any.Literal.INSTANCE); + if (liquibaseFactoryInstance.isUnsatisfied()) { + return; + } + + for (InstanceHandle liquibaseFactoryHandle : liquibaseFactoryInstance.handles()) { + try { + LiquibaseMongodbFactory liquibaseFactory = liquibaseFactoryHandle.get(); + if (liquibaseFactory.getConfiguration().cleanAtStart) { + try (Liquibase liquibase = liquibaseFactory.createLiquibase()) { + liquibase.dropAll(); + } + } + if (liquibaseFactory.getConfiguration().migrateAtStart) { + if (liquibaseFactory.getConfiguration().validateOnMigrate) { + try (Liquibase liquibase = liquibaseFactory.createLiquibase()) { + liquibase.validate(); + } + } + try (Liquibase liquibase = liquibaseFactory.createLiquibase()) { + liquibase.update(liquibaseFactory.createContexts(), liquibaseFactory.createLabels()); + } + } + } catch (UnsatisfiedResolutionException e) { + //ignore, the DS is not configured + } + } + } catch (Exception e) { + throw new IllegalStateException("Error starting Liquibase", e); + } + } +} diff --git a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStringUtil.java b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStringUtil.java new file mode 100644 index 00000000000000..d4f28a00e8464f --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStringUtil.java @@ -0,0 +1,37 @@ +package io.quarkus.liquibase.runtime.graal; + +import java.security.SecureRandom; + +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.InjectAccessors; +import com.oracle.svm.core.annotate.TargetClass; + +@TargetClass(className = "liquibase.util.StringUtil") +final class SubstituteStringUtil { + + @Alias + @InjectAccessors(SecureRandomAccessors.class) + private static SecureRandom rnd; + + public static final class SecureRandomAccessors { + + private static volatile SecureRandom volatileRandom; + + public static SecureRandom get() { + SecureRandom localVolatileRandom = volatileRandom; + if (localVolatileRandom == null) { + synchronized (SecureRandomAccessors.class) { + localVolatileRandom = volatileRandom; + if (localVolatileRandom == null) { + volatileRandom = localVolatileRandom = new SecureRandom(); + } + } + } + return localVolatileRandom; + } + + public static void set(SecureRandom rnd) { + throw new IllegalStateException("The setter for liquibase.util.StringUtil#rnd shouldn't be called."); + } + } +} diff --git a/extensions/liquibase-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/liquibase-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..8cacc679b79752 --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,11 @@ +--- +artifact: ${project.groupId}:${project.artifactId}:${project.version} +name: "Liquibase MongoDB" +metadata: + keywords: + - "liquibase" + - "mongodb" + - "data" + categories: + - "data" + status: "experimental" \ No newline at end of file diff --git a/extensions/pom.xml b/extensions/pom.xml index 03e4923b78cb8f..d20956728e9eac 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -175,6 +175,7 @@ flyway liquibase + liquibase-mongodb vault diff --git a/integration-tests/liquibase-mongodb/pom.xml b/integration-tests/liquibase-mongodb/pom.xml new file mode 100644 index 00000000000000..dc1d8393d2d02e --- /dev/null +++ b/integration-tests/liquibase-mongodb/pom.xml @@ -0,0 +1,106 @@ + + + + quarkus-integration-tests-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-integration-test-liquibase-mongodb + Quarkus - Integration Tests - Liquibase MongoDB + Module that contains Liquibase MongoDB related tests + + + + io.quarkus + quarkus-liquibase-mongodb + + + io.quarkus + quarkus-mongodb-panache + + + io.quarkus + quarkus-resteasy-jackson + + + + + io.quarkus + quarkus-junit5 + test + + + io.rest-assured + rest-assured + test + + + io.quarkus + quarkus-test-mongodb + test + + + + + io.quarkus + quarkus-liquibase-mongodb-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-mongodb-panache-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-resteasy-jackson-deployment + ${project.version} + pom + test + + + * + * + + + + + + + + + io.quarkus + quarkus-maven-plugin + + + + build + + + + + + + + + \ No newline at end of file diff --git a/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/Fruit.java b/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/Fruit.java new file mode 100644 index 00000000000000..b5d0483404c0e2 --- /dev/null +++ b/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/Fruit.java @@ -0,0 +1,8 @@ +package io.quarkus.it.liquibase.mongodb; + +import io.quarkus.mongodb.panache.PanacheMongoEntity; + +public class Fruit extends PanacheMongoEntity { + public String name; + public String color; +} diff --git a/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/FruitResource.java b/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/FruitResource.java new file mode 100644 index 00000000000000..cdbb0a4efc69c2 --- /dev/null +++ b/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/FruitResource.java @@ -0,0 +1,33 @@ +package io.quarkus.it.liquibase.mongodb; + +import java.util.List; + +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +import org.bson.types.ObjectId; + +@Path("/fruits") +@Produces(MediaType.APPLICATION_JSON) +public class FruitResource { + + @GET + public List list() { + return Fruit.listAll(); + } + + @GET + @Path("/{id}") + public Fruit get(@PathParam("id") String id) { + return Fruit.findById(new ObjectId(id)); + } + + @POST + public void save(Fruit fruit) { + fruit.persist(); + } +} diff --git a/integration-tests/liquibase-mongodb/src/main/resources/application.properties b/integration-tests/liquibase-mongodb/src/main/resources/application.properties new file mode 100644 index 00000000000000..9a40534908c6fb --- /dev/null +++ b/integration-tests/liquibase-mongodb/src/main/resources/application.properties @@ -0,0 +1,4 @@ +quarkus.mongodb.connection-string=mongodb://localhost:27017 +quarkus.mongodb.database=fruits +quarkus.liquibase-mongodb.change-log=liquibase/changelog.xml +quarkus.liquibase-mongodb.migrate-at-start=true \ No newline at end of file diff --git a/integration-tests/liquibase-mongodb/src/main/resources/liquibase/changelog.xml b/integration-tests/liquibase-mongodb/src/main/resources/liquibase/changelog.xml new file mode 100644 index 00000000000000..18bd43e5611b40 --- /dev/null +++ b/integration-tests/liquibase-mongodb/src/main/resources/liquibase/changelog.xml @@ -0,0 +1,23 @@ + + + + + + + + {color: 1} + {name: "colorIdx"} + + + + {"name":"orange", "color": "orange"} + + + + + \ No newline at end of file diff --git a/integration-tests/liquibase-mongodb/src/test/java/io/quarkus/it/liquibase/mongodb/FruitResourceTest.java b/integration-tests/liquibase-mongodb/src/test/java/io/quarkus/it/liquibase/mongodb/FruitResourceTest.java new file mode 100644 index 00000000000000..6f9a203d3ec4fe --- /dev/null +++ b/integration-tests/liquibase-mongodb/src/test/java/io/quarkus/it/liquibase/mongodb/FruitResourceTest.java @@ -0,0 +1,51 @@ +package io.quarkus.it.liquibase.mongodb; + +import static io.restassured.RestAssured.get; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; + +import javax.inject.Inject; + +import org.bson.Document; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; + +import com.mongodb.client.ListIndexesIterable; +import com.mongodb.client.MongoClient; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.junit.QuarkusTest; +import io.quarkus.test.mongodb.MongoTestResource; +import io.restassured.common.mapper.TypeRef; + +@QuarkusTest +@QuarkusTestResource(MongoTestResource.class) +@DisabledOnOs(OS.WINDOWS) +class FruitResourceTest { + + @Inject + MongoClient mongoClient; + + @Test + public void testTheEndpoint() { + // assert that a fruit exist as one has been created in the changelog + List list = get("/fruits").as(new TypeRef>() { + }); + Assertions.assertEquals(1, list.size()); + } + + @Test + public void validateTheIdx() { + // check that the index that the changelog created exist + ListIndexesIterable indexes = mongoClient.getDatabase("fruits").getCollection("Fruit").listIndexes(); + Set names = StreamSupport.stream(indexes.spliterator(), false) + .map(doc -> doc.getString("name")) + .collect(Collectors.toSet()); + Assertions.assertTrue(names.contains("colorIdx")); + } +} diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 85cd285c932c9c..fb683ab4e17823 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -180,6 +180,7 @@ elytron-undertow flyway liquibase + liquibase-mongodb oidc oidc-client oidc-client-reactive From 91433f8fd7bd3a4039180d06a1c6d2715bf30581 Mon Sep 17 00:00:00 2001 From: Robbie Gemmell Date: Tue, 31 Aug 2021 13:08:33 +0100 Subject: [PATCH 022/138] update to proton-j 0.33.9 --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 5a28a7cab7d310..e0edbdb8a77836 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -165,7 +165,7 @@ 4.3.1 1.2.1 2.17.0 - 0.33.8 + 0.33.9 3.14.9 5.1.2 0.1.0 From 20459edf035fc15d0431a336522b6ae2ec61ca45 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Mon, 30 Aug 2021 15:53:35 +0300 Subject: [PATCH 023/138] Allow RESTEasy Reactive to index JAX-RS Resources generated by other extensions --- .../JaxRsResourceIndexBuildItem.java | 23 ++++++ .../ResteasyReactiveCommonProcessor.java | 28 ++++++- .../spi/GeneratedJaxRsResourceBuildItem.java | 26 ++++++ .../GeneratedJaxRsResourceGizmoAdaptor.java | 20 +++++ .../GeneratedJaxRsResourceTest.java | 82 +++++++++++++++++++ 5 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JaxRsResourceIndexBuildItem.java create mode 100644 extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/GeneratedJaxRsResourceBuildItem.java create mode 100644 extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/GeneratedJaxRsResourceGizmoAdaptor.java create mode 100644 extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JaxRsResourceIndexBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JaxRsResourceIndexBuildItem.java new file mode 100644 index 00000000000000..7d69199960335c --- /dev/null +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JaxRsResourceIndexBuildItem.java @@ -0,0 +1,23 @@ +package io.quarkus.resteasy.reactive.common.deployment; + +import org.jboss.jandex.IndexView; + +import io.quarkus.builder.item.SimpleBuildItem; + +/** + * Represents the index that is going to be used to look up JAX-RS Resources. + * This index contains both code that is present on disk at build time, + * and code that is generated by other extensions. + */ +public final class JaxRsResourceIndexBuildItem extends SimpleBuildItem { + + private final IndexView indexView; + + public JaxRsResourceIndexBuildItem(IndexView indexView) { + this.indexView = indexView; + } + + public IndexView getIndexView() { + return indexView; + } +} diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java index 4a8ca5145da6c7..41f0c5d41c517d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java @@ -1,5 +1,7 @@ package io.quarkus.resteasy.reactive.common.deployment; +import java.io.ByteArrayInputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -17,8 +19,10 @@ import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.ClassInfo; +import org.jboss.jandex.CompositeIndex; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; +import org.jboss.jandex.Indexer; import org.jboss.jandex.Type; import org.jboss.resteasy.reactive.common.jaxrs.RuntimeDelegateImpl; import org.jboss.resteasy.reactive.common.model.InterceptorContainer; @@ -36,6 +40,7 @@ import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem; import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem; import io.quarkus.arc.deployment.BeanContainerBuildItem; +import io.quarkus.arc.deployment.GeneratedBeanBuildItem; import io.quarkus.arc.deployment.PreAdditionalBeanBuildTimeConditionBuildItem; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; @@ -48,6 +53,7 @@ import io.quarkus.resteasy.reactive.spi.AbstractInterceptorBuildItem; import io.quarkus.resteasy.reactive.spi.ContainerRequestFilterBuildItem; import io.quarkus.resteasy.reactive.spi.ContainerResponseFilterBuildItem; +import io.quarkus.resteasy.reactive.spi.GeneratedJaxRsResourceBuildItem; import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem; import io.quarkus.resteasy.reactive.spi.MessageBodyReaderOverrideBuildItem; import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem; @@ -212,14 +218,30 @@ private boolean namePresent(Set nameBindingNames, Set globalName return false; } + @BuildStep + JaxRsResourceIndexBuildItem resourceIndex(CombinedIndexBuildItem combinedIndex, + List generatedJaxRsResources, + BuildProducer generatedBeansProducer) throws IOException { + if (generatedJaxRsResources.isEmpty()) { + return new JaxRsResourceIndexBuildItem(combinedIndex.getComputingIndex()); + } + + Indexer indexer = new Indexer(); + for (GeneratedJaxRsResourceBuildItem generatedJaxRsResource : generatedJaxRsResources) { + indexer.index(new ByteArrayInputStream(generatedJaxRsResource.getData())); + generatedBeansProducer + .produce(new GeneratedBeanBuildItem(generatedJaxRsResource.getName(), generatedJaxRsResource.getData())); + } + return new JaxRsResourceIndexBuildItem(CompositeIndex.create(combinedIndex.getComputingIndex(), indexer.complete())); + } + @BuildStep void scanResources( - // TODO: We need to use this index instead of BeanArchiveIndexBuildItem to avoid build cycles. It it OK? - CombinedIndexBuildItem combinedIndexBuildItem, + JaxRsResourceIndexBuildItem jaxRsResourceIndexBuildItem, BuildProducer annotationsTransformerBuildItemBuildProducer, BuildProducer resourceScanningResultBuildItemBuildProducer) { - ResourceScanningResult res = ResteasyReactiveScanner.scanResources(combinedIndexBuildItem.getComputingIndex()); + ResourceScanningResult res = ResteasyReactiveScanner.scanResources(jaxRsResourceIndexBuildItem.getIndexView()); if (res == null) { return; } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/GeneratedJaxRsResourceBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/GeneratedJaxRsResourceBuildItem.java new file mode 100644 index 00000000000000..3c8bb89853e846 --- /dev/null +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/GeneratedJaxRsResourceBuildItem.java @@ -0,0 +1,26 @@ +package io.quarkus.resteasy.reactive.spi; + +import io.quarkus.builder.item.MultiBuildItem; + +/** + * Represents a JAX-RS resource that is generated. + * Meant to be used by extension that generate JAX-RS resources as part of their build time processing + */ +public final class GeneratedJaxRsResourceBuildItem extends MultiBuildItem { + + private final String name; + private final byte[] data; + + public GeneratedJaxRsResourceBuildItem(String name, byte[] data) { + this.name = name; + this.data = data; + } + + public String getName() { + return name; + } + + public byte[] getData() { + return data; + } +} diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/GeneratedJaxRsResourceGizmoAdaptor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/GeneratedJaxRsResourceGizmoAdaptor.java new file mode 100644 index 00000000000000..331150eeb0b841 --- /dev/null +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/GeneratedJaxRsResourceGizmoAdaptor.java @@ -0,0 +1,20 @@ +package io.quarkus.resteasy.reactive.server.deployment; + +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.resteasy.reactive.spi.GeneratedJaxRsResourceBuildItem; + +public class GeneratedJaxRsResourceGizmoAdaptor implements ClassOutput { + + private final BuildProducer classOutput; + + public GeneratedJaxRsResourceGizmoAdaptor(BuildProducer classOutput) { + this.classOutput = classOutput; + } + + @Override + public void write(String className, byte[] bytes) { + classOutput.produce(new GeneratedJaxRsResourceBuildItem(className, bytes)); + } + +} diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java new file mode 100644 index 00000000000000..a5c97b442f7120 --- /dev/null +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java @@ -0,0 +1,82 @@ +package io.quarkus.resteasy.reactive.server.test.generatedresource; + +import static io.restassured.RestAssured.when; + +import java.util.function.Consumer; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; + +import org.hamcrest.Matchers; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.builder.BuildChainBuilder; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.resteasy.reactive.server.deployment.GeneratedJaxRsResourceGizmoAdaptor; +import io.quarkus.resteasy.reactive.spi.GeneratedJaxRsResourceBuildItem; +import io.quarkus.test.QuarkusUnitTest; + +public class GeneratedJaxRsResourceTest { + + @RegisterExtension + static QuarkusUnitTest runner = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(HelloResource.class)) + .addBuildChainCustomizer(buildCustomizer()); + + @Test + public void testRestPath() { + when().get("/hello").then().statusCode(200).body(Matchers.is("hello")); + when().get("/test").then().statusCode(200).body(Matchers.is("test")); + } + + protected static Consumer buildCustomizer() { + return new Consumer<>() { + /** + * This represents the extension that generates a JAX-RS resource like: + * + * 

    +             * {@code
+             *      @Path("/test')
+             *      public class TestResource {
+             *
+             *          @GET
+             *          public String test() {
+             *              return "test";
+             *          }
+             *      }
+             * }
+             *
    + */ + @Override + public void accept(BuildChainBuilder builder) { + builder.addBuildStep(context -> { + BuildProducer producer = context::produce; + ClassOutput classOutput = new GeneratedJaxRsResourceGizmoAdaptor(producer); + try (ClassCreator classCreator = ClassCreator.builder() + .classOutput(classOutput).className("com.example.TestResource") + .build()) { + classCreator.addAnnotation(Path.class).addValue("value", "test"); + MethodCreator methodCreator = classCreator.getMethodCreator("test", String.class); + methodCreator.addAnnotation(GET.class); + methodCreator.returnValue(methodCreator.load("test")); + } + }).produces(GeneratedJaxRsResourceBuildItem.class).build(); + } + }; + } + + @Path("hello") + public static class HelloResource { + + @GET + public String hello() { + return "hello"; + } + } +} From dd6a5f483345570e5affeb089def23f871aa3954 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Tue, 31 Aug 2021 09:15:14 +0300 Subject: [PATCH 024/138] Support non-parameterized List method param for Query Param RESTEasy Classic supports this, so let's remain compatible --- .../test/simple/RawListQueryParamTest.java | 56 +++++++++++++++++++ .../common/processor/EndpointIndexer.java | 7 +++ 2 files changed, 63 insertions(+) create mode 100644 extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java new file mode 100644 index 00000000000000..3fb6ae3effba1b --- /dev/null +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java @@ -0,0 +1,56 @@ +package io.quarkus.resteasy.reactive.server.test.simple; + +import java.util.List; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; + +import org.hamcrest.Matchers; +import org.jboss.resteasy.reactive.RestQuery; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.QuarkusUnitTest; +import io.restassured.RestAssured; + +public class RawListQueryParamTest { + + @RegisterExtension + static QuarkusUnitTest test = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .addClass(HelloResource.class)); + + @Test + public void noQueryParams() { + RestAssured.get("/hello") + .then().statusCode(200).body(Matchers.equalTo("hello world")); + } + + @Test + public void singleQueryParam() { + RestAssured.get("/hello?name=foo") + .then().statusCode(200).body(Matchers.equalTo("hello foo")); + } + + @Test + public void multipleQueryParams() { + RestAssured.get("/hello?name=foo&name=bar") + .then().statusCode(200).body(Matchers.equalTo("hello foo,bar")); + } + + @Path("hello") + public static class HelloResource { + + @GET + @SuppressWarnings({ "rawtypes", "unchecked" }) + public String hello(@RestQuery("name") List names) { + if (names.isEmpty()) { + return "hello world"; + } + return "hello " + String.join(",", names); + } + + } +} diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java index 0ed75c29ce9afb..7620df556c91d9 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java @@ -1052,6 +1052,13 @@ && isContextType(paramType.asClassType())) { elementType = paramType.name().toString(); handleLocalDateParam(builder); typeHandled = true; + } else if (paramType.name().equals(LIST) && (type == ParameterType.QUERY)) { // RESTEasy Classic handles the non-generic List type + elementType = String.class.getName(); + typeHandled = true; + builder.setSingle(false); + if (convertible) { + handleListParam(existingConverters, errorLocation, hasRuntimeConverters, builder, elementType); + } } if (!typeHandled) { From 036125c872a35b374947746522c7cf065d1dd439 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Tue, 31 Aug 2021 17:12:58 +0300 Subject: [PATCH 025/138] Ensure that Violation DTO class is registered in native --- .../deployment/HibernateValidatorProcessor.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java index b854dcada8f552..7c0363ef1a5f77 100644 --- a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java +++ b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java @@ -67,6 +67,7 @@ import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem; import io.quarkus.deployment.builditem.ShutdownContextBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageConfigBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveFieldBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveMethodBuildItem; import io.quarkus.deployment.logging.LogCleanupFilterBuildItem; @@ -349,9 +350,13 @@ NativeImageConfigBuildItem nativeImageConfig() { } @BuildStep - ExceptionMapperBuildItem mapper() { - return new ExceptionMapperBuildItem(ResteasyReactiveViolationExceptionMapper.class.getName(), - ValidationException.class.getName(), Priorities.USER + 1, true); + void exceptionMapper(BuildProducer exceptionMapperProducer, + BuildProducer reflectiveClassProducer) { + exceptionMapperProducer.produce(new ExceptionMapperBuildItem(ResteasyReactiveViolationExceptionMapper.class.getName(), + ValidationException.class.getName(), Priorities.USER + 1, true)); + reflectiveClassProducer.produce( + new ReflectiveClassBuildItem(true, true, ResteasyReactiveViolationExceptionMapper.ViolationReport.class, + ResteasyReactiveViolationExceptionMapper.ViolationReport.Violation.class)); } private static void contributeBuiltinConstraints(Set builtinConstraints, From 6e50ff2a3871e05fce057363c607071600910633 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Tue, 31 Aug 2021 14:59:25 +0300 Subject: [PATCH 026/138] Remove query parameters UriInfo#getAbsolutePath in RESTEasy Reactive This is mentioned by the method's Javadoc, even though the TCK doesn't test it --- .../test/resource/basic/UriInfoTest.java | 19 +++++++++++++++++- .../resource/GetAbsolutePathResource.java | 20 +++++++++++++++++++ .../reactive/server/jaxrs/UriInfoImpl.java | 8 +++++++- 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GetAbsolutePathResource.java diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java index fa6194b91bb728..6357946c627c04 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java @@ -20,6 +20,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.GetAbsolutePathResource; import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.UriInfoEncodedQueryResource; import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.UriInfoEncodedTemplateResource; import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.UriInfoEscapedMatrParamResource; @@ -54,7 +55,7 @@ public JavaArchive get() { war.addClasses(UriInfoSimpleResource.class, UriInfoEncodedQueryResource.class, UriInfoQueryParamsResource.class, UriInfoSimpleSingletonResource.class, UriInfoEncodedTemplateResource.class, UriInfoEscapedMatrParamResource.class, - UriInfoEncodedTemplateResource.class); + UriInfoEncodedTemplateResource.class, GetAbsolutePathResource.class); return war; } }); @@ -167,4 +168,20 @@ private static void basicTest(String path, String testName) throws Exception { public void testQueryParamsMutability() throws Exception { basicTest("/queryParams?a=a,b", "UriInfoQueryParamsResource"); } + + @Test + @DisplayName("Test Get Absolute Path") + public void testGetAbsolutePath() throws Exception { + doTestGetAbsolutePath("/absolutePath", "unset"); + doTestGetAbsolutePath("/absolutePath?dummy=1234", "1234"); + doTestGetAbsolutePath("/absolutePath?foo=bar&dummy=1234", "1234"); + } + + private void doTestGetAbsolutePath(String path, String expectedDummyHeader) { + String absolutePathHeader = RestAssured.get(path) + .then() + .statusCode(200) + .header("dummy", expectedDummyHeader).extract().header("absolutePath"); + org.assertj.core.api.Assertions.assertThat(absolutePathHeader).endsWith("/absolutePath"); + } } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GetAbsolutePathResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GetAbsolutePathResource.java new file mode 100644 index 00000000000000..b35f1bd895ada0 --- /dev/null +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GetAbsolutePathResource.java @@ -0,0 +1,20 @@ +package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriInfo; + +@Path("absolutePath") +public class GetAbsolutePathResource { + + @GET + public Response response(@QueryParam("dummy") String dummy, @Context UriInfo uriInfo) { + return Response.ok() + .header("absolutePath", uriInfo.getAbsolutePath().toString()) + .header("dummy", dummy == null ? "unset" : dummy) + .build(); + } +} diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java index 5daaa95dca5758..13295cdd4c374f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java @@ -90,7 +90,13 @@ public UriBuilder getRequestUriBuilder() { public URI getAbsolutePath() { try { // TCK says normalized - return new URI(currentRequest.getAbsoluteURI()).normalize(); + String effectiveURI = currentRequest.getAbsoluteURI(); + int queryParamsIndex = effectiveURI.indexOf('?'); + if (queryParamsIndex > 0) { + // the spec says that getAbsolutePath() does not contain query parameters + effectiveURI = effectiveURI.substring(0, queryParamsIndex); + } + return new URI(effectiveURI).normalize(); } catch (URISyntaxException e) { throw new RuntimeException(e); } From 2103bc8550a1792bef0b02710602ce279516bf74 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Tue, 31 Aug 2021 12:22:59 +0300 Subject: [PATCH 027/138] Fix issue with ResourceInfo injection in response filters --- .../deployment/CustomFilterGenerator.java | 3 +- .../test/customproviders/NoTargetTest.java | 90 +++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/NoTargetTest.java diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomFilterGenerator.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomFilterGenerator.java index b45231b36da205..73f6888dfd6938 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomFilterGenerator.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomFilterGenerator.java @@ -31,6 +31,7 @@ import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.container.ContainerResponseContext; import javax.ws.rs.container.ContainerResponseFilter; +import javax.ws.rs.container.ResourceInfo; import javax.ws.rs.core.Response; import org.jboss.jandex.DotName; @@ -410,7 +411,7 @@ private static ResultHandle getRRReqCtxHandle(MethodCreator filter, ResultHandle private static AssignableResultHandle getResourceInfoHandle(MethodCreator filterMethod, ResultHandle rrReqCtxHandle) { ResultHandle runtimeResourceHandle = GeneratorUtils.runtimeResourceHandle(filterMethod, rrReqCtxHandle); - AssignableResultHandle resourceInfo = filterMethod.createVariable(ResteasyReactiveResourceInfo.class); + AssignableResultHandle resourceInfo = filterMethod.createVariable(ResourceInfo.class); BranchResult ifNullBranch = filterMethod.ifNull(runtimeResourceHandle); ifNullBranch.trueBranch().assign(resourceInfo, ifNullBranch.trueBranch().readStaticField( FieldDescriptor.of(SimpleResourceInfo.NullValues.class, "INSTANCE", SimpleResourceInfo.NullValues.class))); diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/NoTargetTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/NoTargetTest.java new file mode 100644 index 00000000000000..4d2bb9a21e58dd --- /dev/null +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/NoTargetTest.java @@ -0,0 +1,90 @@ +package io.quarkus.resteasy.reactive.server.test.customproviders; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.io.IOException; +import java.util.function.Supplier; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.container.ContainerRequestContext; +import javax.ws.rs.container.ContainerRequestFilter; +import javax.ws.rs.container.ContainerResponseContext; +import javax.ws.rs.container.PreMatching; +import javax.ws.rs.container.ResourceInfo; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import org.jboss.resteasy.reactive.server.ServerResponseFilter; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.QuarkusUnitTest; +import io.restassured.RestAssured; +import io.restassured.http.Headers; + +public class NoTargetTest { + + @RegisterExtension + static QuarkusUnitTest test = new QuarkusUnitTest() + .setArchiveProducer(new Supplier<>() { + @Override + public JavaArchive get() { + return ShrinkWrap.create(JavaArchive.class) + .addClasses(HelloResource.class, ThrowingPreMatchFilter.class, DummyExceptionMapper.class); + } + }); + + @Path("hello") + public static class HelloResource { + + @GET + public String hello() { + return "hello"; + } + } + + @Test + public void test() { + Headers headers = RestAssured.get("/hello") + .then().statusCode(200).extract().headers(); + assertEquals("mapper", headers.get("source").getValue()); + assertEquals("NullValues", headers.get("resourceInfoClass").getValue()); + } + + public static class CustomResponseFilter { + + @ServerResponseFilter + public void filter(ContainerResponseContext responseContext, ResourceInfo resourceInfo) { + responseContext.getHeaders().add("resourceInfoClass", resourceInfo.getClass().getSimpleName()); + } + } + + @PreMatching + @Provider + public static class ThrowingPreMatchFilter implements ContainerRequestFilter { + + @Override + public void filter(ContainerRequestContext requestContext) throws IOException { + throw new DummyException(); + } + } + + @Provider + public static class DummyExceptionMapper implements ExceptionMapper { + @Override + public Response toResponse(DummyException exception) { + return Response.ok().header("source", "mapper").build(); + } + } + + public static class DummyException extends RuntimeException { + public DummyException() { + super("dummy"); + setStackTrace(new StackTraceElement[0]); + } + } +} From e504dc1e202e61585769b2350d4be8e9bc391035 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Tue, 31 Aug 2021 11:40:56 +0300 Subject: [PATCH 028/138] Use proper type for method comparison in REST Links module --- .../reactive/links/deployment/LinksContainerFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java index 12c0c3eb196e2e..0a28fd73829975 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java @@ -120,7 +120,7 @@ private boolean isSameMethod(MethodInfo resourceMethodInfo, ResourceMethod resou List parameterTypes = resourceMethodInfo.parameters(); MethodParameter[] parameters = resourceMethod.getParameters(); for (int i = 0; i < parameters.length; i++) { - if (!parameterTypes.get(i).name().equals(DotName.createSimple(parameters[i].type))) { + if (!parameterTypes.get(i).name().equals(DotName.createSimple(parameters[i].declaredType))) { return false; } } From d5c9cbe5a6b854e5cacf88c3a68b4c046a136919 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Tue, 31 Aug 2021 18:05:23 +0300 Subject: [PATCH 029/138] Add reflection registration for REST links module --- .../rest/data/panache/deployment/RestDataProcessor.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java index 5b9ae46ff75d09..32031f065ab66e 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java @@ -12,6 +12,7 @@ import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import io.quarkus.gizmo.ClassOutput; import io.quarkus.jackson.spi.JacksonModuleBuildItem; @@ -31,6 +32,11 @@ public class RestDataProcessor { + @BuildStep + ReflectiveClassBuildItem registerReflection() { + return new ReflectiveClassBuildItem(true, true, HalLink.class); + } + @BuildStep void implementResources(CombinedIndexBuildItem index, List resourceBuildItems, List resourcePropertiesBuildItems, Capabilities capabilities, From 67912b455bb1308c5b34e269d43f52190b3dd2e8 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Tue, 31 Aug 2021 16:39:16 +0300 Subject: [PATCH 030/138] Fix Jackson serialization issue in Panache REST Data Before this change the custom serializer would not take the registered Jackson modules into account --- .../hal/HalEntityWrapperJacksonSerializer.java | 17 +++++++---------- .../runtime/hal/AbstractSerializersTest.java | 14 +++++++++++--- .../runtime/hal/JacksonSerializersTest.java | 7 +++++++ .../runtime/hal/JsonbSerializersTest.java | 7 ++++++- .../data/panache/runtime/hal/PublishedBook.java | 13 +++++++++++++ 5 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/PublishedBook.java diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/hal/HalEntityWrapperJacksonSerializer.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/hal/HalEntityWrapperJacksonSerializer.java index b0c31d39d09c01..8efc74b8b5d833 100644 --- a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/hal/HalEntityWrapperJacksonSerializer.java +++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/hal/HalEntityWrapperJacksonSerializer.java @@ -32,22 +32,19 @@ public void serialize(HalEntityWrapper wrapper, JsonGenerator generator, Seriali for (BeanPropertyDefinition property : getPropertyDefinitions(serializers, wrapper.getEntity().getClass())) { AnnotatedMember accessor = property.getAccessor(); if (accessor != null) { - writeValue(property.getName(), accessor.getValue(wrapper.getEntity()), generator); + Object value = accessor.getValue(wrapper.getEntity()); + generator.writeFieldName(property.getName()); + if (value == null) { + generator.writeNull(); + } else { + serializers.findValueSerializer(value.getClass()).serialize(value, generator, serializers); + } } } writeLinks(wrapper.getEntity(), generator); generator.writeEndObject(); } - private void writeValue(String name, Object value, JsonGenerator generator) throws IOException { - generator.writeFieldName(name); - if (value == null) { - generator.writeNull(); - } else { - generator.writeObject(value); - } - } - private void writeLinks(Object entity, JsonGenerator generator) throws IOException { Map links = linksExtractor.getLinks(entity); generator.writeFieldName("_links"); diff --git a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/AbstractSerializersTest.java b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/AbstractSerializersTest.java index 59ab3f35e74cde..88ae8efea84d26 100644 --- a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/AbstractSerializersTest.java +++ b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/AbstractSerializersTest.java @@ -17,7 +17,9 @@ abstract class AbstractSerializersTest { @Test void shouldSerializeOneBook() { - Book book = new Book(1, "Black Swan"); + int id = 1; + String title = "Black Swan"; + Book book = usePublishedBook() ? new PublishedBook(id, title) : new Book(id, title); JsonReader jsonReader = Json.createReader(new StringReader(toJson(new HalEntityWrapper(book)))); assertBook(book, jsonReader.readObject()); @@ -25,7 +27,9 @@ void shouldSerializeOneBook() { @Test void shouldSerializeOneBookWithNullName() { - Book book = new Book(1, null); + int id = 1; + String title = null; + Book book = usePublishedBook() ? new PublishedBook(id, title) : new Book(id, title); JsonReader jsonReader = Json.createReader(new StringReader(toJson(new HalEntityWrapper(book)))); assertBook(book, jsonReader.readObject()); @@ -33,7 +37,9 @@ void shouldSerializeOneBookWithNullName() { @Test void shouldSerializeCollectionOfBooks() { - Book book = new Book(1, "Black Swan"); + int id = 1; + String title = "Black Swan"; + Book book = usePublishedBook() ? new PublishedBook(id, title) : new Book(id, title); HalCollectionWrapper wrapper = new HalCollectionWrapper(Collections.singleton(book), Book.class, "books"); JsonReader jsonReader = Json.createReader(new StringReader(toJson(wrapper))); JsonObject collectionJson = jsonReader.readObject(); @@ -60,4 +66,6 @@ private void assertBook(Book book, JsonObject bookJson) { assertThat(bookLinksJson.getJsonObject("list").getString("href")).isEqualTo("/books"); assertThat(bookLinksJson.getJsonObject("add").getString("href")).isEqualTo("/books"); } + + protected abstract boolean usePublishedBook(); } diff --git a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JacksonSerializersTest.java b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JacksonSerializersTest.java index cdab327d344746..2b444463d25a5f 100644 --- a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JacksonSerializersTest.java +++ b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JacksonSerializersTest.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; class JacksonSerializersTest extends AbstractSerializersTest { @@ -18,6 +19,7 @@ void setup() { module.addSerializer(HalCollectionWrapper.class, new HalCollectionWrapperJacksonSerializer(new BookHalLinksProvider())); objectMapper.registerModule(module); + objectMapper.registerModule(new JavaTimeModule()); } @Override @@ -28,4 +30,9 @@ String toJson(Object object) { throw new RuntimeException(e); } } + + @Override + protected boolean usePublishedBook() { + return true; + } } diff --git a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JsonbSerializersTest.java b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JsonbSerializersTest.java index ae87e78a65e0cc..5884f3b5894c73 100644 --- a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JsonbSerializersTest.java +++ b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JsonbSerializersTest.java @@ -22,4 +22,9 @@ void setup() { String toJson(Object object) { return jsonb.toJson(object); } -} \ No newline at end of file + + @Override + protected boolean usePublishedBook() { + return false; + } +} diff --git a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/PublishedBook.java b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/PublishedBook.java new file mode 100644 index 00000000000000..38ff69b5463d1c --- /dev/null +++ b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/PublishedBook.java @@ -0,0 +1,13 @@ +package io.quarkus.rest.data.panache.runtime.hal; + +import java.time.LocalDate; +import java.time.Month; + +public class PublishedBook extends Book { + + public LocalDate publicationDate = LocalDate.of(2021, Month.AUGUST, 31); + + public PublishedBook(long id, String name) { + super(id, name); + } +} From 149bf56e1083f48e30d15307eedf4c979bfadd7d Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Tue, 31 Aug 2021 09:32:37 +0300 Subject: [PATCH 031/138] Port rest-data-panache to RESTEasy Reactive Resolves: #19771 --- .../io/quarkus/deployment/Capability.java | 3 ++ .../deployment/pom.xml | 2 +- .../HibernateOrmPanacheRestProcessor.java | 10 ++-- .../runtime/pom.xml | 4 ++ .../deployment/MongoPanacheRestProcessor.java | 10 ++-- .../rest-data-panache/deployment/pom.xml | 4 +- .../panache/deployment/RestDataProcessor.java | 20 +++----- .../methods/StandardMethodImplementor.java | 17 +++++-- .../panache/rest-data-panache/runtime/pom.xml | 12 +---- .../resource/ResourceLinksProvider.java | 48 +++++++++++-------- .../runtime/pom.xml | 6 +++ .../runtime/pom.xml | 6 +++ .../links/deployment/LinksProcessor.java | 6 +-- .../links/runtime/RestLinksProviderImpl.java | 11 +++-- .../spring-data-rest/deployment/pom.xml | 2 +- .../deployment/SpringDataRestProcessor.java | 10 ++-- extensions/spring-data-rest/runtime/pom.xml | 4 ++ .../hibernate-orm-rest-data-panache/pom.xml | 4 +- .../HibernateOrmRestDataPanacheTest.java | 8 ++-- .../mongodb-rest-data-panache/pom.xml | 4 +- integration-tests/spring-data-rest/pom.xml | 4 +- .../spring/data/rest/SpringDataRestTest.java | 8 ++-- 22 files changed, 120 insertions(+), 83 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Capability.java b/core/deployment/src/main/java/io/quarkus/deployment/Capability.java index 88e2c041f9afcd..ad466141e02ac1 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/Capability.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/Capability.java @@ -50,6 +50,9 @@ public interface Capability { String RESTEASY_MUTINY = RESTEASY + ".mutiny"; String RESTEASY_REACTIVE = RESTEASY + ".reactive"; + String RESTEASY_REACTIVE_JSON = RESTEASY_REACTIVE + ".json"; + String RESTEASY_REACTIVE_JSON_JACKSON = RESTEASY_REACTIVE_JSON + ".jackson"; + String RESTEASY_REACTIVE_JSON_JSONB = RESTEASY_REACTIVE_JSON + ".jsonb"; String JWT = QUARKUS_PREFIX + "jwt"; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml b/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml index 0a23562bece626..da7f91a34c697e 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml @@ -37,7 +37,7 @@     io.quarkus - quarkus-resteasy-jsonb-deployment + quarkus-resteasy-reactive-jsonb-deployment test diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java index 5af71d2b4b5112..72c049a936f071 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java @@ -5,6 +5,8 @@ import java.lang.reflect.Modifier; import java.util.List; +import javax.ws.rs.Priorities; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; @@ -23,9 +25,10 @@ import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource; import io.quarkus.hibernate.orm.rest.data.panache.runtime.RestDataPanacheExceptionMapper; import io.quarkus.hibernate.orm.rest.data.panache.runtime.jta.TransactionalUpdateExecutor; +import io.quarkus.rest.data.panache.RestDataPanacheException; import io.quarkus.rest.data.panache.deployment.ResourceMetadata; import io.quarkus.rest.data.panache.deployment.RestDataResourceBuildItem; -import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem; +import io.quarkus.resteasy.reactive.spi.ExceptionMapperBuildItem; class HibernateOrmPanacheRestProcessor { @@ -41,8 +44,9 @@ FeatureBuildItem feature() { } @BuildStep - ResteasyJaxrsProviderBuildItem registerRestDataPanacheExceptionMapper() { - return new ResteasyJaxrsProviderBuildItem(RestDataPanacheExceptionMapper.class.getName()); + ExceptionMapperBuildItem registerRestDataPanacheExceptionMapper() { + return new ExceptionMapperBuildItem(RestDataPanacheExceptionMapper.class.getName(), + RestDataPanacheException.class.getName(), Priorities.USER + 100, false); } @BuildStep diff --git a/extensions/panache/hibernate-orm-rest-data-panache/runtime/pom.xml b/extensions/panache/hibernate-orm-rest-data-panache/runtime/pom.xml index 64b292a742ffe1..b0aa7a2a9e871d 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/runtime/pom.xml +++ b/extensions/panache/hibernate-orm-rest-data-panache/runtime/pom.xml @@ -22,6 +22,10 @@ io.quarkus quarkus-hibernate-orm-panache + + jakarta.validation + jakarta.validation-api + diff --git a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java index 684a70d9ca9a2f..f2764201458b79 100644 --- a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java +++ b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java @@ -5,6 +5,8 @@ import java.lang.reflect.Modifier; import java.util.List; +import javax.ws.rs.Priorities; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; @@ -27,9 +29,10 @@ import io.quarkus.mongodb.rest.data.panache.PanacheMongoRepositoryResource; import io.quarkus.mongodb.rest.data.panache.runtime.NoopUpdateExecutor; import io.quarkus.mongodb.rest.data.panache.runtime.RestDataPanacheExceptionMapper; +import io.quarkus.rest.data.panache.RestDataPanacheException; import io.quarkus.rest.data.panache.deployment.ResourceMetadata; import io.quarkus.rest.data.panache.deployment.RestDataResourceBuildItem; -import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem; +import io.quarkus.resteasy.reactive.spi.ExceptionMapperBuildItem; class MongoPanacheRestProcessor { @@ -45,8 +48,9 @@ FeatureBuildItem feature() { } @BuildStep - ResteasyJaxrsProviderBuildItem registerRestDataPanacheExceptionMapper() { - return new ResteasyJaxrsProviderBuildItem(RestDataPanacheExceptionMapper.class.getName()); + ExceptionMapperBuildItem registerRestDataPanacheExceptionMapper() { + return new ExceptionMapperBuildItem(RestDataPanacheExceptionMapper.class.getName(), + RestDataPanacheException.class.getName(), Priorities.USER + 100, false); } @BuildStep diff --git a/extensions/panache/rest-data-panache/deployment/pom.xml b/extensions/panache/rest-data-panache/deployment/pom.xml index d3b0d7ec113a8a..56e8cd354bce5e 100644 --- a/extensions/panache/rest-data-panache/deployment/pom.xml +++ b/extensions/panache/rest-data-panache/deployment/pom.xml @@ -23,7 +23,7 @@ io.quarkus - quarkus-resteasy-deployment + quarkus-resteasy-reactive-links-deployment io.quarkus @@ -66,4 +66,4 @@ - \ No newline at end of file + diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java index 32031f065ab66e..4a26a76f87d24f 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java @@ -3,17 +3,12 @@ import java.util.Arrays; import java.util.List; -import org.jboss.resteasy.links.impl.EL; - -import io.quarkus.arc.deployment.GeneratedBeanBuildItem; -import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor; import io.quarkus.deployment.Capabilities; import io.quarkus.deployment.Capability; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import io.quarkus.gizmo.ClassOutput; import io.quarkus.jackson.spi.JacksonModuleBuildItem; import io.quarkus.jsonb.spi.JsonbSerializerBuildItem; @@ -29,6 +24,8 @@ import io.quarkus.rest.data.panache.runtime.hal.HalLink; import io.quarkus.rest.data.panache.runtime.hal.HalLinkJacksonSerializer; import io.quarkus.rest.data.panache.runtime.hal.HalLinkJsonbSerializer; +import io.quarkus.resteasy.reactive.server.deployment.GeneratedJaxRsResourceGizmoAdaptor; +import io.quarkus.resteasy.reactive.spi.GeneratedJaxRsResourceBuildItem; public class RestDataProcessor { @@ -40,8 +37,8 @@ ReflectiveClassBuildItem registerReflection() { @BuildStep void implementResources(CombinedIndexBuildItem index, List resourceBuildItems, List resourcePropertiesBuildItems, Capabilities capabilities, - BuildProducer implementationsProducer) { - ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(implementationsProducer); + BuildProducer implementationsProducer) { + ClassOutput classOutput = new GeneratedJaxRsResourceGizmoAdaptor(implementationsProducer); JaxRsResourceImplementor jaxRsResourceImplementor = new JaxRsResourceImplementor(hasValidatorCapability(capabilities)); ResourcePropertiesProvider resourcePropertiesProvider = new ResourcePropertiesProvider(index.getIndex()); @@ -77,11 +74,6 @@ JsonbSerializerBuildItem registerJsonbSerializers() { HalLinkJsonbSerializer.class.getName())); } - @BuildStep - RuntimeInitializedClassBuildItem el() { - return new RuntimeInitializedClassBuildItem(EL.class.getCanonicalName()); - } - private ResourceProperties getResourceProperties(ResourcePropertiesProvider resourcePropertiesProvider, ResourceMetadata resourceMetadata, List resourcePropertiesBuildItems) { for (ResourcePropertiesBuildItem resourcePropertiesBuildItem : resourcePropertiesBuildItems) { @@ -98,7 +90,7 @@ private boolean hasValidatorCapability(Capabilities capabilities) { } private boolean hasHalCapability(Capabilities capabilities) { - return capabilities.isPresent(Capability.RESTEASY_JSON_JSONB) - || capabilities.isPresent(Capability.RESTEASY_JSON_JACKSON); + return capabilities.isPresent(Capability.RESTEASY_REACTIVE_JSON_JSONB) + || capabilities.isPresent(Capability.RESTEASY_REACTIVE_JSON_JACKSON); } } diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java index bc2c937f65c195..eef6fd4c1602dc 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java @@ -12,7 +12,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; -import org.jboss.resteasy.links.LinkResource; +import org.jboss.logging.Logger; import io.quarkus.gizmo.AnnotatedElement; import io.quarkus.gizmo.AnnotationCreator; @@ -25,12 +25,15 @@ import io.quarkus.rest.data.panache.deployment.ResourceMetadata; import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties; import io.quarkus.rest.data.panache.runtime.sort.SortQueryParamValidator; +import io.quarkus.resteasy.reactive.links.RestLink; /** * A standard JAX-RS method implementor. */ public abstract class StandardMethodImplementor implements MethodImplementor { + private static final Logger LOGGER = Logger.getLogger(StandardMethodImplementor.class); + /** * Implement exposed JAX-RS method. */ @@ -78,9 +81,15 @@ protected void addDeleteAnnotation(AnnotatedElement element) { } protected void addLinksAnnotation(AnnotatedElement element, String entityClassName, String rel) { - AnnotationCreator linkResource = element.addAnnotation(LinkResource.class); - linkResource.addValue("entityClassName", entityClassName); - linkResource.addValue("rel", rel); + AnnotationCreator linkResource = element.addAnnotation(RestLink.class); + Class entityClass; + try { + entityClass = Thread.currentThread().getContextClassLoader().loadClass(entityClassName); + linkResource.addValue("entityType", entityClass); + linkResource.addValue("rel", rel); + } catch (ClassNotFoundException e) { + LOGGER.error("Unable to create links for entity: '" + entityClassName + "'", e); + } } protected void addPathAnnotation(AnnotatedElement element, String value) { diff --git a/extensions/panache/rest-data-panache/runtime/pom.xml b/extensions/panache/rest-data-panache/runtime/pom.xml index 9183fc75e140ce..b6666464f792c8 100644 --- a/extensions/panache/rest-data-panache/runtime/pom.xml +++ b/extensions/panache/rest-data-panache/runtime/pom.xml @@ -19,17 +19,7 @@ io.quarkus - quarkus-resteasy - - - org.jboss.resteasy - resteasy-links - - - jakarta.activation - jakarta.activation-api - - + quarkus-resteasy-reactive-links io.quarkus diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/resource/ResourceLinksProvider.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/resource/ResourceLinksProvider.java index 7712a422385feb..fcc202f939842f 100644 --- a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/resource/ResourceLinksProvider.java +++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/resource/ResourceLinksProvider.java @@ -1,41 +1,51 @@ package io.quarkus.rest.data.panache.runtime.resource; +import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.jboss.resteasy.links.LinksProvider; -import org.jboss.resteasy.links.RESTServiceDiscovery; +import javax.ws.rs.core.Link; + +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.resteasy.reactive.links.RestLinksProvider; public final class ResourceLinksProvider { private static final String SELF_REF = "self"; public Map getClassLinks(Class className) { - RESTServiceDiscovery links = LinksProvider - .getClassLinksProvider() - .getLinks(className, Thread.currentThread().getContextClassLoader()); - return linksToMap(links); + return linksToMap(restLinksProvider().getTypeLinks(className)); } public Map getInstanceLinks(Object instance) { - RESTServiceDiscovery links = LinksProvider - .getObjectLinksProvider() - .getLinks(instance, Thread.currentThread().getContextClassLoader()); - return linksToMap(links); + return linksToMap(restLinksProvider().getInstanceLinks(instance)); } public String getSelfLink(Object instance) { - RESTServiceDiscovery.AtomLink link = LinksProvider.getObjectLinksProvider() - .getLinks(instance, Thread.currentThread().getContextClassLoader()) - .getLinkForRel(SELF_REF); - return link == null ? null : link.getHref(); + Collection links = restLinksProvider().getInstanceLinks(instance); + for (Link link : links) { + if (SELF_REF.equals(link.getRel())) { + return link.getUri().toString(); + } + } + return null; + } + + private RestLinksProvider restLinksProvider() { + InstanceHandle instance = Arc.container().instance(RestLinksProvider.class); + if (instance.isAvailable()) { + return instance.get(); + } + throw new IllegalStateException("Invalid use of '" + this.getClass().getName() + + "'. No request scope bean found for type '" + ResourceLinksProvider.class.getName() + "'"); } - private Map linksToMap(RESTServiceDiscovery serviceDiscovery) { - Map links = new HashMap<>(serviceDiscovery.size()); - for (RESTServiceDiscovery.AtomLink atomLink : serviceDiscovery) { - links.put(atomLink.getRel(), atomLink.getHref()); + private Map linksToMap(Collection links) { + Map result = new HashMap<>(); + for (Link link : links) { + result.put(link.getRel(), link.getUri().toString()); } - return links; + return result; } } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/pom.xml index 4810c69ea7cd47..bf22e85e0524c2 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/pom.xml +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/pom.xml @@ -29,6 +29,12 @@ io.quarkus quarkus-bootstrap-maven-plugin + + + io.quarkus.rest.jackson + io.quarkus.resteasy.reactive.json.jackson + + maven-compiler-plugin diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/pom.xml index fe85ce1a97913e..0032cb13da00d9 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/pom.xml +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/pom.xml @@ -29,6 +29,12 @@ io.quarkus quarkus-bootstrap-maven-plugin + + + io.quarkus.rest.jsonb + io.quarkus.resteasy.reactive.json.jsonb + + maven-compiler-plugin diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksProcessor.java index 3f8983032c57e2..c3733000d26f11 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksProcessor.java @@ -18,10 +18,10 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem; -import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.GeneratedClassBuildItem; import io.quarkus.gizmo.ClassOutput; +import io.quarkus.resteasy.reactive.common.deployment.JaxRsResourceIndexBuildItem; import io.quarkus.resteasy.reactive.links.RestLinksResponseFilter; import io.quarkus.resteasy.reactive.links.runtime.GetterAccessorsContainer; import io.quarkus.resteasy.reactive.links.runtime.GetterAccessorsContainerRecorder; @@ -44,13 +44,13 @@ void feature(BuildProducer feature) { @BuildStep @Record(STATIC_INIT) - void initializeLinksProvider(CombinedIndexBuildItem indexBuildItem, + void initializeLinksProvider(JaxRsResourceIndexBuildItem indexBuildItem, ResteasyReactiveDeploymentInfoBuildItem deploymentInfoBuildItem, BuildProducer bytecodeTransformersProducer, BuildProducer generatedClassesProducer, GetterAccessorsContainerRecorder getterAccessorsContainerRecorder, LinksProviderRecorder linksProviderRecorder) { - IndexView index = indexBuildItem.getIndex(); + IndexView index = indexBuildItem.getIndexView(); ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClassesProducer, true); // Initialize links container diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderImpl.java index 7a0354d4a6d74e..8960e382906d8d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderImpl.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderImpl.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedList; import java.util.List; import javax.ws.rs.core.Link; @@ -34,8 +33,9 @@ static void setGetterAccessorsContainer(GetterAccessorsContainer getterAccessors public Collection getTypeLinks(Class elementType) { verifyInit(); - List links = new LinkedList<>(); - for (LinkInfo linkInfo : linksContainer.getForClass(elementType)) { + List linkInfoList = linksContainer.getForClass(elementType); + List links = new ArrayList<>(linkInfoList.size()); + for (LinkInfo linkInfo : linkInfoList) { if (linkInfo.getPathParameters().size() == 0) { links.add(Link.fromUriBuilder(uriInfo.getBaseUriBuilder().path(linkInfo.getPath())) .rel(linkInfo.getRel()) @@ -49,8 +49,9 @@ public Collection getTypeLinks(Class elementType) { public Collection getInstanceLinks(T instance) { verifyInit(); - List links = new LinkedList<>(); - for (LinkInfo linkInfo : linksContainer.getForClass(instance.getClass())) { + List linkInfoList = linksContainer.getForClass(instance.getClass()); + List links = new ArrayList<>(linkInfoList.size()); + for (LinkInfo linkInfo : linkInfoList) { links.add(Link.fromUriBuilder(uriInfo.getBaseUriBuilder().path(linkInfo.getPath())) .rel(linkInfo.getRel()) .build(getPathParameterValues(linkInfo, instance))); diff --git a/extensions/spring-data-rest/deployment/pom.xml b/extensions/spring-data-rest/deployment/pom.xml index e3abeaec086897..cab1280cca1534 100644 --- a/extensions/spring-data-rest/deployment/pom.xml +++ b/extensions/spring-data-rest/deployment/pom.xml @@ -38,7 +38,7 @@ io.quarkus - quarkus-resteasy-jsonb-deployment + quarkus-resteasy-reactive-jsonb-deployment test diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java index 52c7b52114d217..16037fb3ef9428 100644 --- a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java +++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java @@ -7,6 +7,8 @@ import java.util.LinkedList; import java.util.List; +import javax.ws.rs.Priorities; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; @@ -24,10 +26,11 @@ import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.gizmo.ClassOutput; +import io.quarkus.rest.data.panache.RestDataPanacheException; import io.quarkus.rest.data.panache.deployment.ResourceMetadata; import io.quarkus.rest.data.panache.deployment.RestDataResourceBuildItem; import io.quarkus.rest.data.panache.deployment.properties.ResourcePropertiesBuildItem; -import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem; +import io.quarkus.resteasy.reactive.spi.ExceptionMapperBuildItem; import io.quarkus.spring.data.rest.deployment.crud.CrudMethodsImplementor; import io.quarkus.spring.data.rest.deployment.crud.CrudPropertiesProvider; import io.quarkus.spring.data.rest.deployment.paging.PagingAndSortingMethodsImplementor; @@ -55,8 +58,9 @@ FeatureBuildItem feature() { } @BuildStep - ResteasyJaxrsProviderBuildItem registerRestDataPanacheExceptionMapper() { - return new ResteasyJaxrsProviderBuildItem(RestDataPanacheExceptionMapper.class.getName()); + ExceptionMapperBuildItem registerRestDataPanacheExceptionMapper() { + return new ExceptionMapperBuildItem(RestDataPanacheExceptionMapper.class.getName(), + RestDataPanacheException.class.getName(), Priorities.USER + 100, false); } @BuildStep diff --git a/extensions/spring-data-rest/runtime/pom.xml b/extensions/spring-data-rest/runtime/pom.xml index f1c159c2fb303e..e812673dd80d45 100644 --- a/extensions/spring-data-rest/runtime/pom.xml +++ b/extensions/spring-data-rest/runtime/pom.xml @@ -27,6 +27,10 @@ io.quarkus quarkus-spring-data-rest-api + + jakarta.validation + jakarta.validation-api + diff --git a/integration-tests/hibernate-orm-rest-data-panache/pom.xml b/integration-tests/hibernate-orm-rest-data-panache/pom.xml index 6811ac56be68d3..08bb5e9971b5a1 100644 --- a/integration-tests/hibernate-orm-rest-data-panache/pom.xml +++ b/integration-tests/hibernate-orm-rest-data-panache/pom.xml @@ -23,7 +23,7 @@ io.quarkus - quarkus-resteasy-jackson + quarkus-resteasy-reactive-jackson io.quarkus @@ -79,7 +79,7 @@ io.quarkus - quarkus-resteasy-jackson-deployment + quarkus-resteasy-reactive-jackson-deployment ${project.version} pom test diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java b/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java index 656972dd443dd0..5b84ebf1678168 100644 --- a/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java +++ b/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java @@ -237,8 +237,8 @@ void shouldNotCreateBookWithBlankTitle() { .and().body(book.toString()) .when().post("/books") .then().statusCode(400) - .and().body("parameterViolations[0].path", equalTo("add.arg0.title")) - .and().body("parameterViolations[0].message", equalTo("must not be blank")); + .and().body("violations[0].field", equalTo("add.arg0.title")) + .and().body("violations[0].message", equalTo("must not be blank")); } @Test @@ -307,7 +307,7 @@ void shouldNotUpdateBookWithBlankTitle() { .and().body(book.toString()) .when().put("/books/" + CRIME_AND_PUNISHMENT_ID) .then().statusCode(400) - .and().body("parameterViolations[0].path", equalTo("update.arg1.title")) - .and().body("parameterViolations[0].message", equalTo("must not be blank")); + .and().body("violations[0].field", equalTo("update.arg1.title")) + .and().body("violations[0].message", equalTo("must not be blank")); } } diff --git a/integration-tests/mongodb-rest-data-panache/pom.xml b/integration-tests/mongodb-rest-data-panache/pom.xml index 089a5ffe772bd8..b116d479fa6a60 100644 --- a/integration-tests/mongodb-rest-data-panache/pom.xml +++ b/integration-tests/mongodb-rest-data-panache/pom.xml @@ -19,7 +19,7 @@ io.quarkus - quarkus-resteasy-jackson + quarkus-resteasy-reactive-jackson @@ -63,7 +63,7 @@ io.quarkus - quarkus-resteasy-jackson-deployment + quarkus-resteasy-reactive-jackson-deployment ${project.version} pom test diff --git a/integration-tests/spring-data-rest/pom.xml b/integration-tests/spring-data-rest/pom.xml index 918a7937951ba8..92aeab84a27624 100644 --- a/integration-tests/spring-data-rest/pom.xml +++ b/integration-tests/spring-data-rest/pom.xml @@ -23,7 +23,7 @@ io.quarkus - quarkus-resteasy-jackson + quarkus-resteasy-reactive-jackson io.quarkus @@ -79,7 +79,7 @@ io.quarkus - quarkus-resteasy-jackson-deployment + quarkus-resteasy-reactive-jackson-deployment ${project.version} pom test diff --git a/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java index 0a5325c28e8a7c..09820bae7a5f12 100644 --- a/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java +++ b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java @@ -172,8 +172,8 @@ void shouldNotCreateBookWithBlankTitle() { .and().body(book.toString()) .when().post("/books") .then().statusCode(400) - .and().body("parameterViolations[0].path", equalTo("add.arg0.title")) - .and().body("parameterViolations[0].message", equalTo("must not be blank")); + .and().body("violations[0].field", equalTo("add.arg0.title")) + .and().body("violations[0].message", equalTo("must not be blank")); } @Test @@ -242,7 +242,7 @@ void shouldNotUpdateBookWithBlankTitle() { .and().body(book.toString()) .when().put("/books/" + CRIME_AND_PUNISHMENT_ID) .then().statusCode(400) - .and().body("parameterViolations[0].path", equalTo("update.arg1.title")) - .and().body("parameterViolations[0].message", equalTo("must not be blank")); + .and().body("violations[0].field", equalTo("update.arg1.title")) + .and().body("violations[0].message", equalTo("must not be blank")); } } From f36724b75ffcedc4c8c7cdb05a2c449c2cd58080 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Wed, 25 Aug 2021 13:17:53 +0300 Subject: [PATCH 032/138] Add the ability for extensions to exclude GraalVM config from jars Resolves: #17482 --- .../nativeimage/ExcludeConfigBuildItem.java | 41 +++++++++++++++++++ .../pkg/steps/NativeImageBuildStep.java | 20 ++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ExcludeConfigBuildItem.java diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ExcludeConfigBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ExcludeConfigBuildItem.java new file mode 100644 index 00000000000000..fc6e88f8116f88 --- /dev/null +++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ExcludeConfigBuildItem.java @@ -0,0 +1,41 @@ +package io.quarkus.deployment.builditem.nativeimage; + +import io.quarkus.builder.item.MultiBuildItem; + +/** + * A build item that allows extension to configure the native-image compiler to effectively + * ignore certain configuration files in specific jars. + * + * The {@code jarFile} property specifies the name of the jar file or a regular expression that can be used to + * match multiple jar files. + * Matching jar files using regular expressions should be done as a last resort. + * + * The {@code resourceName} property specifies the name of the resource file or a regular expression that can be used to + * match multiple resource files. + * For the match to work, the resources need to be part of the matched jar file(s) (see {@code jarFile}). + * Matching resource files using regular expressions should be done as a last resort. + * + * See https://github.com/oracle/graal/pull/3179 for more details. + */ +public final class ExcludeConfigBuildItem extends MultiBuildItem { + + private final String jarFile; + private final String resourceName; + + public ExcludeConfigBuildItem(String jarFile, String resourceName) { + this.jarFile = jarFile; + this.resourceName = resourceName; + } + + public ExcludeConfigBuildItem(String jarFile) { + this(jarFile, "META-INF/native-image/native-image.properties"); + } + + public String getJarFile() { + return jarFile; + } + + public String getResourceName() { + return resourceName; + } +} diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java index 2210a067887cbe..e1dba7ed6f7e9b 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java @@ -26,6 +26,7 @@ import io.quarkus.bootstrap.model.AppDependency; import io.quarkus.bootstrap.util.IoUtils; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.nativeimage.ExcludeConfigBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageSecurityProviderBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem; import io.quarkus.deployment.pkg.NativeConfig; @@ -81,7 +82,8 @@ ArtifactResultBuildItem nativeSourcesResult(NativeConfig nativeConfig, NativeImageSourceJarBuildItem nativeImageSourceJarBuildItem, OutputTargetBuildItem outputTargetBuildItem, PackageConfig packageConfig, - List nativeImageProperties) { + List nativeImageProperties, + List excludeConfigs) { Path outputDir; try { @@ -100,6 +102,7 @@ ArtifactResultBuildItem nativeSourcesResult(NativeConfig nativeConfig, .setNativeConfig(nativeConfig) .setOutputTargetBuildItem(outputTargetBuildItem) .setNativeImageProperties(nativeImageProperties) + .setExcludeConfigs(excludeConfigs) .setOutputDir(outputDir) .setRunnerJarName(runnerJar.getFileName().toString()) // the path to native-image is not known now, it is only known at the time the native-sources will be consumed @@ -130,6 +133,7 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa PackageConfig packageConfig, CurateOutcomeBuildItem curateOutcomeBuildItem, List nativeImageProperties, + List excludeConfigs, List nativeImageSecurityProviders, Optional processInheritIODisabled) { if (nativeConfig.debug.enabled) { @@ -187,6 +191,7 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa .setNativeConfig(nativeConfig) .setOutputTargetBuildItem(outputTargetBuildItem) .setNativeImageProperties(nativeImageProperties) + .setExcludeConfigs(excludeConfigs) .setNativeImageSecurityProviders(nativeImageSecurityProviders) .setOutputDir(outputDir) .setRunnerJarName(runnerJarName) @@ -477,6 +482,7 @@ static class Builder { private NativeConfig nativeConfig; private OutputTargetBuildItem outputTargetBuildItem; private List nativeImageProperties; + private List excludeConfigs; private List nativeImageSecurityProviders; private Path outputDir; private String runnerJarName; @@ -500,6 +506,11 @@ public Builder setNativeImageProperties(List return this; } + public Builder setExcludeConfigs(List excludeConfigs) { + this.excludeConfigs = excludeConfigs; + return this; + } + public Builder setNativeImageSecurityProviders( List nativeImageSecurityProviders) { this.nativeImageSecurityProviders = nativeImageSecurityProviders; @@ -700,6 +711,13 @@ public NativeImageInvokerInfo build() { .collect(Collectors.joining(",")); nativeImageArgs.add("-H:AdditionalSecurityProviders=" + additionalSecurityProviders); } + + // --exclude-config options + for (ExcludeConfigBuildItem excludeConfig : excludeConfigs) { + nativeImageArgs.add("--exclude-config"); + nativeImageArgs.add(excludeConfig.getJarFile()); + nativeImageArgs.add(excludeConfig.getResourceName()); + } } nativeImageArgs.add(nativeImageName); From 58e48e0594f43992a89209826da98348f41ac84e Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Tue, 31 Aug 2021 17:23:08 +0100 Subject: [PATCH 033/138] Make sure the --exclude-config arguments precede the -jar arguments --- .../builditem/nativeimage/ExcludeConfigBuildItem.java | 2 +- .../quarkus/deployment/pkg/steps/NativeImageBuildStep.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ExcludeConfigBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ExcludeConfigBuildItem.java index fc6e88f8116f88..8c2cf955c26392 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ExcludeConfigBuildItem.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ExcludeConfigBuildItem.java @@ -28,7 +28,7 @@ public ExcludeConfigBuildItem(String jarFile, String resourceName) { } public ExcludeConfigBuildItem(String jarFile) { - this(jarFile, "META-INF/native-image/native-image.properties"); + this(jarFile, "/META-INF/native-image/native-image\\.properties"); } public String getJarFile() { diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java index e1dba7ed6f7e9b..2236dd642d26b0 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java @@ -595,8 +595,6 @@ public NativeImageInvokerInfo build() { "-H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime"); //the default collection policy results in full GC's 50% of the time nativeImageArgs.add("-H:+JNI"); nativeImageArgs.add("-H:+AllowFoldMethods"); - nativeImageArgs.add("-jar"); - nativeImageArgs.add(runnerJarName); if (nativeConfig.enableFallbackImages) { nativeImageArgs.add("-H:FallbackThreshold=5"); @@ -722,6 +720,10 @@ public NativeImageInvokerInfo build() { nativeImageArgs.add(nativeImageName); + //Make sure to have the -jar as last one, as it otherwise breaks "--exclude-config" + nativeImageArgs.add("-jar"); + nativeImageArgs.add(runnerJarName); + return new NativeImageInvokerInfo(nativeImageArgs); } From e4d2bcfe681928e87e7309bb3a5c7c9c6d35ef7a Mon Sep 17 00:00:00 2001 From: Sergey Beryozkin Date: Mon, 30 Aug 2021 19:07:03 +0100 Subject: [PATCH 034/138] Update OIDC TokenStateManager to return Uni --- .../security-openid-connect-multitenancy.adoc | 34 +- ...ity-openid-connect-web-authentication.adoc | 53 +++ .../oidc/test/CodeFlowDevModeTestCase.java | 10 + .../oidc/test/CustomTokenStateManager.java | 19 +- .../quarkus/oidc/test/ProtectedResource.java | 6 + .../resources/application-dev-mode.properties | 1 + .../io/quarkus/oidc/TenantConfigResolver.java | 10 +- .../io/quarkus/oidc/TokenStateManager.java | 125 ++++++- .../runtime/CodeAuthenticationMechanism.java | 344 ++++++++++++------ .../runtime/DefaultTokenStateManager.java | 16 +- 10 files changed, 470 insertions(+), 148 deletions(-) diff --git a/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc b/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc index 0fa38d53ae5df0..614f14aa451afd 100644 --- a/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc +++ b/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc @@ -318,7 +318,9 @@ This interface allows you to dynamically create tenant configurations at runtime package io.quarkus.it.keycloak; import javax.enterprise.context.ApplicationScoped; +import java.util.function.Supplier; +import io.smallrye.mutiny.Uni; import io.quarkus.oidc.OidcTenantConfig; import io.quarkus.oidc.TenantConfigResolver; import io.vertx.ext.web.RoutingContext; @@ -327,7 +329,7 @@ import io.vertx.ext.web.RoutingContext; public class CustomTenantConfigResolver implements TenantConfigResolver { @Override - public OidcTenantConfig resolve(RoutingContext context) { + public Uni resolve(RoutingContext context, TenantConfigResolver.TenantConfigRequestContext requestContext) { String path = context.request().path(); String[] parts = path.split("/"); @@ -337,24 +339,30 @@ public class CustomTenantConfigResolver implements TenantConfigResolver { } if ("tenant-c".equals(parts[1])) { - OidcTenantConfig config = new OidcTenantConfig(); + // Do 'return requestContext.runBlocking(createTenantConfig());' + // if a blocking call is required to create a tenant config + return Uni.createFromItem(createTenantConfig()); + } + + // resolve to default tenant configuration + return null; + } - config.setTenantId("tenant-c"); - config.setAuthServerUrl("http://localhost:8180/auth/realms/tenant-c"); - config.setClientId("multi-tenant-client"); - OidcTenantConfig.Credentials credentials = new OidcTenantConfig.Credentials(); + private Supplier createTenantConfig() { + final OidcTenantConfig config = new OidcTenantConfig(); - credentials.setSecret("my-secret"); + config.setTenantId("tenant-c"); + config.setAuthServerUrl("http://localhost:8180/auth/realms/tenant-c"); + config.setClientId("multi-tenant-client"); + OidcTenantConfig.Credentials credentials = new OidcTenantConfig.Credentials(); - config.setCredentials(credentials); + credentials.setSecret("my-secret"); - // any other setting support by the quarkus-oidc extension + config.setCredentials(credentials); - return config; - } + // any other setting support by the quarkus-oidc extension - // resolve to default tenant configuration - return null; + return () -> config; } } ---- diff --git a/docs/src/main/asciidoc/security-openid-connect-web-authentication.adoc b/docs/src/main/asciidoc/security-openid-connect-web-authentication.adoc index ec0c6ea9578f65..a2f0fe5df9c6e0 100644 --- a/docs/src/main/asciidoc/security-openid-connect-web-authentication.adoc +++ b/docs/src/main/asciidoc/security-openid-connect-web-authentication.adoc @@ -469,6 +469,59 @@ In such cases, you can use `quarkus.oidc.token-state-manager.split-tokens=true` Register your own `io.quarkus.oidc.TokenStateManager' implementation as an `@ApplicationScoped` CDI bean if you need to customize the way the tokens are associated with the session cookie. For example, you may want to keep the tokens in a database and have only a database pointer stored in a session cookie. Note though that it may present some challenges in making the tokens available across multiple microservices nodes. +Here is a simple example: + +[source, java] +---- +package io.quarkus.oidc.test; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; + +import io.quarkus.arc.AlternativePriority; +import io.quarkus.oidc.AuthorizationCodeTokens; +import io.quarkus.oidc.OidcTenantConfig; +import io.quarkus.oidc.TokenStateManager; +import io.quarkus.oidc.runtime.DefaultTokenStateManager; +import io.smallrye.mutiny.Uni; +import io.vertx.ext.web.RoutingContext; + +@ApplicationScoped +@AlternativePriority(1) +public class CustomTokenStateManager implements TokenStateManager { + + @Inject + DefaultTokenStateManager tokenStateManager; + + @Override + public Uni createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig, + AuthorizationCodeTokens sessionContent, TokenStateManager.CreateTokenStateRequestContext requestContext) { + return tokenStateManager.createTokenState(routingContext, oidcConfig, sessionContent, requestContext) + .map(t -> (t + "|custom")); + } + + @Override + public Uni getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, + String tokenState, TokenStateManager.GetTokensRequestContext requestContext) { + if (!tokenState.endsWith("|custom")) { + throw new IllegalStateException(); + } + String defaultState = tokenState.substring(0, tokenState.length() - 7); + return tokenStateManager.getTokens(routingContext, oidcConfig, defaultState, requestContext); + } + + @Override + public Uni deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState, + TokenStateManager.DeleteTokensRequestContext requestContext) { + if (!tokenState.endsWith("|custom")) { + throw new IllegalStateException(); + } + String defaultState = tokenState.substring(0, tokenState.length() - 7); + return tokenStateManager.deleteTokens(routingContext, oidcConfig, defaultState, requestContext); + } +} +---- + == Listening to important authentication events One can register `@ApplicationScoped` bean which will observe important OIDC authentication events. The listener will be updated when a user has logged in for the first time or re-authenticated, as well as when the session has been refreshed. More events may be reported in the future. For example: diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java index 1d55d0df736eea..ed0704e02aae7e 100644 --- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java +++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java @@ -1,10 +1,12 @@ package io.quarkus.oidc.test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; +import java.net.URI; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -14,6 +16,8 @@ import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.SilentCssErrorHandler; import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.WebRequest; +import com.gargoylesoftware.htmlunit.WebResponse; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; @@ -87,6 +91,12 @@ public void testAccessAndRefreshTokenInjectionDevMode() throws IOException, Inte assertEquals("custom", page.getWebClient().getCookieManager().getCookie("q_session").getValue().split("\\|")[3]); + webClient.getOptions().setRedirectEnabled(false); + WebResponse webResponse = webClient + .loadWebResponse(new WebRequest(URI.create("http://localhost:8080/protected/logout").toURL())); + assertEquals(302, webResponse.getStatusCode()); + assertNull(webClient.getCookieManager().getCookie("q_session")); + webClient.getCookieManager().clearCookies(); } } diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java index 220d89e1ff0edc..4a57c25770a12b 100644 --- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java +++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java @@ -8,6 +8,7 @@ import io.quarkus.oidc.OidcTenantConfig; import io.quarkus.oidc.TokenStateManager; import io.quarkus.oidc.runtime.DefaultTokenStateManager; +import io.smallrye.mutiny.Uni; import io.vertx.ext.web.RoutingContext; @ApplicationScoped @@ -18,25 +19,29 @@ public class CustomTokenStateManager implements TokenStateManager { DefaultTokenStateManager tokenStateManager; @Override - public String createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig, - AuthorizationCodeTokens sessionContent) { - return tokenStateManager.createTokenState(routingContext, oidcConfig, sessionContent) + "|custom"; + public Uni createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig, + AuthorizationCodeTokens sessionContent, TokenStateManager.CreateTokenStateRequestContext requestContext) { + return tokenStateManager.createTokenState(routingContext, oidcConfig, sessionContent, requestContext) + .map(t -> (t + "|custom")); } @Override - public AuthorizationCodeTokens getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, - String tokenState) { + public Uni getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, + String tokenState, TokenStateManager.GetTokensRequestContext requestContext) { if (!tokenState.endsWith("|custom")) { throw new IllegalStateException(); } String defaultState = tokenState.substring(0, tokenState.length() - 7); - return tokenStateManager.getTokens(routingContext, oidcConfig, defaultState); + return tokenStateManager.getTokens(routingContext, oidcConfig, defaultState, requestContext); } @Override - public void deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState) { + public Uni deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState, + TokenStateManager.DeleteTokensRequestContext requestContext) { if (!tokenState.endsWith("|custom")) { throw new IllegalStateException(); } + String defaultState = tokenState.substring(0, tokenState.length() - 7); + return tokenStateManager.deleteTokens(routingContext, oidcConfig, defaultState, requestContext); } } diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/ProtectedResource.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/ProtectedResource.java index fa87a328bd5c83..9c1c73e03987bc 100644 --- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/ProtectedResource.java +++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/ProtectedResource.java @@ -28,4 +28,10 @@ public String getName() { public String getTenantName(@PathParam("id") String tenantId) { return tenantId + ":" + idToken.getName(); } + + @GET + @Path("logout") + public void logout() { + throw new RuntimeException("Logout must be handled by CodeAuthenticationMechanism"); + } } diff --git a/extensions/oidc/deployment/src/test/resources/application-dev-mode.properties b/extensions/oidc/deployment/src/test/resources/application-dev-mode.properties index 15b1c51e72f529..ee7c873dd6e01f 100644 --- a/extensions/oidc/deployment/src/test/resources/application-dev-mode.properties +++ b/extensions/oidc/deployment/src/test/resources/application-dev-mode.properties @@ -5,6 +5,7 @@ quarkus.oidc.client-id=client-dev quarkus.oidc.credentials.client-secret.provider.name=vault-secret-provider quarkus.oidc.credentials.client-secret.provider.key=secret-from-vault quarkus.oidc.application-type=web-app +quarkus.oidc.logout.path=/protected/logout quarkus.log.category."com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleSheet".level=FATAL diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TenantConfigResolver.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TenantConfigResolver.java index c0f9143cef2f97..59fa463895eed0 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TenantConfigResolver.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TenantConfigResolver.java @@ -21,10 +21,12 @@ public interface TenantConfigResolver { * * @param context the routing context * @return the tenant configuration. If {@code null}, indicates that the default configuration/tenant should be chosen + * + * @deprecated Use {@link #resolve(RoutingContext, TenantConfigRequestContext))} instead. */ @Deprecated default OidcTenantConfig resolve(RoutingContext context) { - throw new UnsupportedOperationException("resolve not implemented"); + throw new UnsupportedOperationException("resolve is not implemented"); } /** @@ -39,10 +41,10 @@ default Uni resolve(RoutingContext routingContext, TenantConfi } /** - * A context object that can be used to run blocking tasks + * A context object that can be used to run blocking tasks. *

    - * Blocking config providers should used this context object to run blocking tasks, to prevent excessive and - * unnecessary delegation to thread pools + * Blocking {@code TenantConfigResolver} providers should use this context object to run blocking tasks, to prevent + * excessive and unnecessary delegation to thread pools. */ interface TenantConfigRequestContext { diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenStateManager.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenStateManager.java index 94cf60539cc73b..ecda06f10e225e 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenStateManager.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenStateManager.java @@ -1,5 +1,8 @@ package io.quarkus.oidc; +import java.util.function.Supplier; + +import io.smallrye.mutiny.Uni; import io.vertx.ext.web.RoutingContext; /** @@ -13,9 +16,125 @@ */ public interface TokenStateManager { - String createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig, AuthorizationCodeTokens tokens); + /** + * Convert the authorization code flow tokens into a token state. + * + * @param routingContext the request context + * @param oidcConfig the tenant configuration + * @param tokens the authorization code flow tokens + * + * @return the token state + * + * @deprecated Use + * {@link #createTokenState(RoutingContext, OidcTenantConfig, AuthorizationCodeTokens, CreateTokenStateRequestContext)} + * + */ + @Deprecated + default String createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig, + AuthorizationCodeTokens tokens) { + throw new UnsupportedOperationException("createTokenState is not implemented"); + } + + /** + * Convert the authorization code flow tokens into a token state. + * + * @param routingContext the request context + * @param oidcConfig the tenant configuration + * @param tokens the authorization code flow tokens + * @param requestContext the request context + * + * @return the token state + */ + default Uni createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig, + AuthorizationCodeTokens tokens, CreateTokenStateRequestContext requestContext) { + return Uni.createFrom().item(createTokenState(routingContext, oidcConfig, tokens)); + } + + /** + * Convert the token state into the authorization code flow tokens. + * + * @param routingContext the request context + * @param oidcConfig the tenant configuration + * @param tokens the token state + * + * @return the authorization code flow tokens + * + * @deprecated Use {@link #getTokens(RoutingContext, OidcTenantConfig, String, GetTokensRequestContext)} instead. + */ + @Deprecated + default AuthorizationCodeTokens getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState) { + throw new UnsupportedOperationException("getTokens is not implemented"); + } + + /** + * Convert the token state into the authorization code flow tokens. + * + * @param routingContext the request context + * @param oidcConfig the tenant configuration + * @param tokens the token state + * @param requestContext the request context + * + * @return the authorization code flow tokens + */ + default Uni getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, + String tokenState, GetTokensRequestContext requestContext) { + return Uni.createFrom().item(getTokens(routingContext, oidcConfig, tokenState)); + } + + /** + * Delete the token state. + * + * @param routingContext the request context + * @param oidcConfig the tenant configuration + * @param tokens the token state + * + * @deprecated Use {@link #deleteTokens(RoutingContext, OidcTenantConfig, String, DeleteTokensRequestContext)} instead + */ + @Deprecated + default void deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState) { + throw new UnsupportedOperationException("deleteTokens is not implemented"); + } + + /** + * Delete the token state. + * + * @param routingContext the request context + * @param oidcConfig the tenant configuration + * @param tokens the token state + */ + default Uni deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState, + DeleteTokensRequestContext requestContext) { + deleteTokens(routingContext, oidcConfig, tokenState); + return Uni.createFrom().voidItem(); + } + + /** + * A context object that can be used to create a token state by running a blocking task. + *

    + * Blocking providers should use this context to prevent excessive and unnecessary delegation to thread pools. + */ + interface CreateTokenStateRequestContext { + + Uni runBlocking(Supplier function); + } + + /** + * A context object that can be used to convert the token state to the tokens by running a blocking task. + *

    + * Blocking providers should use this context to prevent excessive and unnecessary delegation to thread pools. + */ + interface GetTokensRequestContext { + + Uni runBlocking(Supplier function); + } - AuthorizationCodeTokens getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState); + /** + * A context object that can be used to delete the token state by running a blocking task. + *

    + * Blocking providers should use this context to prevent excessive and unnecessary delegation to thread pools. + */ + interface DeleteTokensRequestContext { - void deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState); + Uni runBlocking(Supplier function); + } } diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java index cb4bb8ccd77016..8e6e5e656fa491 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java @@ -10,7 +10,9 @@ import java.util.Optional; import java.util.UUID; import java.util.function.BiFunction; +import java.util.function.Consumer; import java.util.function.Function; +import java.util.function.Supplier; import java.util.regex.Pattern; import org.jboss.logging.Logger; @@ -23,8 +25,11 @@ import io.quarkus.oidc.OidcTenantConfig; import io.quarkus.oidc.OidcTenantConfig.Authentication; import io.quarkus.oidc.SecurityEvent; +import io.quarkus.oidc.TokenStateManager; import io.quarkus.oidc.common.runtime.OidcCommonUtils; import io.quarkus.oidc.common.runtime.OidcConstants; +import io.quarkus.runtime.BlockingOperationControl; +import io.quarkus.runtime.ExecutorRecorder; import io.quarkus.security.AuthenticationCompletionException; import io.quarkus.security.AuthenticationFailedException; import io.quarkus.security.AuthenticationRedirectException; @@ -32,6 +37,7 @@ import io.quarkus.security.identity.SecurityIdentity; import io.quarkus.vertx.http.runtime.security.ChallengeData; import io.smallrye.mutiny.Uni; +import io.smallrye.mutiny.subscription.UniEmitter; import io.vertx.core.http.Cookie; import io.vertx.core.http.HttpHeaders; import io.vertx.core.http.impl.CookieImpl; @@ -47,12 +53,17 @@ public class CodeAuthenticationMechanism extends AbstractOidcAuthenticationMecha static final Pattern COOKIE_PATTERN = Pattern.compile("\\" + COOKIE_DELIM); static final String SESSION_COOKIE_NAME = "q_session"; static final String SESSION_MAX_AGE_PARAM = "session-max-age"; + static final Uni VOID_UNI = Uni.createFrom().voidItem(); private static final Logger LOG = Logger.getLogger(CodeAuthenticationMechanism.class); private static final String STATE_COOKIE_NAME = "q_auth"; private static final String POST_LOGOUT_COOKIE_NAME = "q_post_logout"; + private final CreateTokenStateRequestContext createTokenStateRequestContext = new CreateTokenStateRequestContext(); + private final GetTokensRequestContext getTokenStateRequestContext = new GetTokensRequestContext(); + private final DeleteTokensRequestContext deleteTokensRequestContext = new DeleteTokensRequestContext(); + public Uni authenticate(RoutingContext context, IdentityProviderManager identityProviderManager) { return resolver.resolveConfig(context).chain(new Function>() { @@ -96,51 +107,60 @@ private Uni reAuthenticate(Cookie sessionCookie, IdentityProviderManager identityProviderManager, TenantConfigContext configContext) { - AuthorizationCodeTokens session = resolver.getTokenStateManager().getTokens(context, configContext.oidcConfig, - sessionCookie.getValue()); - - context.put(OidcConstants.ACCESS_TOKEN_VALUE, session.getAccessToken()); - context.put(AuthorizationCodeTokens.class.getName(), session); - return authenticate(identityProviderManager, context, new IdTokenCredential(session.getIdToken(), context)) - .map(new Function() { - @Override - public SecurityIdentity apply(SecurityIdentity identity) { - if (isLogout(context, configContext)) { - fireEvent(SecurityEvent.Type.OIDC_LOGOUT_RP_INITIATED, identity); - throw redirectToLogoutEndpoint(context, configContext, session.getIdToken()); - } - return identity; - } - }).onFailure().recoverWithUni(new Function>() { + return resolver.getTokenStateManager().getTokens(context, configContext.oidcConfig, + sessionCookie.getValue(), getTokenStateRequestContext) + .chain(new Function>() { @Override - public Uni apply(Throwable t) { - if (t instanceof AuthenticationRedirectException) { - throw (AuthenticationRedirectException) t; - } + public Uni apply(AuthorizationCodeTokens session) { + context.put(OidcConstants.ACCESS_TOKEN_VALUE, session.getAccessToken()); + context.put(AuthorizationCodeTokens.class.getName(), session); + return authenticate(identityProviderManager, context, + new IdTokenCredential(session.getIdToken(), context)) + .call(new Function>() { + @Override + public Uni apply(SecurityIdentity identity) { + if (isLogout(context, configContext)) { + fireEvent(SecurityEvent.Type.OIDC_LOGOUT_RP_INITIATED, identity); + return buildLogoutRedirectUriUni(context, configContext, + session.getIdToken()); + } + return VOID_UNI; + } + }).onFailure() + .recoverWithUni(new Function>() { + @Override + public Uni apply(Throwable t) { + if (t instanceof AuthenticationRedirectException) { + throw (AuthenticationRedirectException) t; + } - if (!(t instanceof TokenAutoRefreshException)) { - boolean expired = (t.getCause() instanceof InvalidJwtException) - && ((InvalidJwtException) t.getCause()).hasErrorCode(ErrorCodes.EXPIRED); + if (!(t instanceof TokenAutoRefreshException)) { + boolean expired = (t.getCause() instanceof InvalidJwtException) + && ((InvalidJwtException) t.getCause()) + .hasErrorCode(ErrorCodes.EXPIRED); - if (!expired) { - LOG.debugf("Authentication failure: %s", t.getCause()); - throw new AuthenticationCompletionException(t.getCause()); - } - if (!configContext.oidcConfig.token.refreshExpired) { - LOG.debug("Token has expired, token refresh is not allowed"); - throw new AuthenticationCompletionException(t.getCause()); - } - LOG.debug("Token has expired, trying to refresh it"); - return refreshSecurityIdentity(configContext, session.getRefreshToken(), context, - identityProviderManager, false, null); - } else { - return refreshSecurityIdentity(configContext, session.getRefreshToken(), context, - identityProviderManager, true, - ((TokenAutoRefreshException) t).getSecurityIdentity()); - } + if (!expired) { + LOG.debugf("Authentication failure: %s", t.getCause()); + throw new AuthenticationCompletionException(t.getCause()); + } + if (!configContext.oidcConfig.token.refreshExpired) { + LOG.debug("Token has expired, token refresh is not allowed"); + throw new AuthenticationCompletionException(t.getCause()); + } + LOG.debug("Token has expired, trying to refresh it"); + return refreshSecurityIdentity(configContext, session.getRefreshToken(), + context, + identityProviderManager, false, null); + } else { + return refreshSecurityIdentity(configContext, session.getRefreshToken(), + context, + identityProviderManager, true, + ((TokenAutoRefreshException) t).getSecurityIdentity()); + } + } + }); } }); - } private boolean isJavaScript(RoutingContext context) { @@ -168,54 +188,63 @@ public Uni apply(TenantConfigContext tenantContext) { } public Uni getChallengeInternal(RoutingContext context, TenantConfigContext configContext) { - removeCookie(context, configContext, getSessionCookieName(configContext.oidcConfig)); - - if (!shouldAutoRedirect(configContext, context)) { - // If the client (usually an SPA) wants to handle the redirect manually, then - // return status code 499 and WWW-Authenticate header with the 'OIDC' value. - return Uni.createFrom().item(new ChallengeData(499, "WWW-Authenticate", "OIDC")); - } - - StringBuilder codeFlowParams = new StringBuilder(); - - // response_type - codeFlowParams.append(OidcConstants.CODE_FLOW_RESPONSE_TYPE).append(EQ).append(OidcConstants.CODE_FLOW_CODE); - - // client_id - codeFlowParams.append(AMP).append(OidcConstants.CLIENT_ID).append(EQ) - .append(OidcCommonUtils.urlEncode(configContext.oidcConfig.clientId.get())); - - // scope - List scopes = new ArrayList<>(); - scopes.add("openid"); - configContext.oidcConfig.getAuthentication().scopes.ifPresent(scopes::addAll); - codeFlowParams.append(AMP).append(OidcConstants.TOKEN_SCOPE).append(EQ) - .append(OidcCommonUtils.urlEncode(String.join(" ", scopes))); - - // redirect_uri - String redirectPath = getRedirectPath(configContext, context); - String redirectUriParam = buildUri(context, isForceHttps(configContext), redirectPath); - LOG.debugf("Authentication request redirect_uri parameter: %s", redirectUriParam); + return removeSessionCookie(context, configContext, getSessionCookieName(configContext.oidcConfig)) + .chain(new Function>() { - codeFlowParams.append(AMP).append(OidcConstants.CODE_FLOW_REDIRECT_URI).append(EQ) - .append(OidcCommonUtils.urlEncode(redirectUriParam)); + @Override + public Uni apply(Void t) { + if (!shouldAutoRedirect(configContext, context)) { + // If the client (usually an SPA) wants to handle the redirect manually, then + // return status code 499 and WWW-Authenticate header with the 'OIDC' value. + return Uni.createFrom().item(new ChallengeData(499, "WWW-Authenticate", "OIDC")); + } - // state - codeFlowParams.append(AMP).append(OidcConstants.CODE_FLOW_STATE).append(EQ) - .append(generateCodeFlowState(context, configContext, redirectPath)); + StringBuilder codeFlowParams = new StringBuilder(); + + // response_type + codeFlowParams.append(OidcConstants.CODE_FLOW_RESPONSE_TYPE).append(EQ) + .append(OidcConstants.CODE_FLOW_CODE); + + // client_id + codeFlowParams.append(AMP).append(OidcConstants.CLIENT_ID).append(EQ) + .append(OidcCommonUtils.urlEncode(configContext.oidcConfig.clientId.get())); + + // scope + List scopes = new ArrayList<>(); + scopes.add("openid"); + configContext.oidcConfig.getAuthentication().scopes.ifPresent(scopes::addAll); + codeFlowParams.append(AMP).append(OidcConstants.TOKEN_SCOPE).append(EQ) + .append(OidcCommonUtils.urlEncode(String.join(" ", scopes))); + + // redirect_uri + String redirectPath = getRedirectPath(configContext, context); + String redirectUriParam = buildUri(context, isForceHttps(configContext), redirectPath); + LOG.debugf("Authentication request redirect_uri parameter: %s", redirectUriParam); + + codeFlowParams.append(AMP).append(OidcConstants.CODE_FLOW_REDIRECT_URI).append(EQ) + .append(OidcCommonUtils.urlEncode(redirectUriParam)); + + // state + codeFlowParams.append(AMP).append(OidcConstants.CODE_FLOW_STATE).append(EQ) + .append(generateCodeFlowState(context, configContext, redirectPath)); + + // extra redirect parameters, see https://openid.net/specs/openid-connect-core-1_0.html#AuthRequests + if (configContext.oidcConfig.authentication.getExtraParams() != null) { + for (Map.Entry entry : configContext.oidcConfig.authentication.getExtraParams() + .entrySet()) { + codeFlowParams.append(AMP).append(entry.getKey()).append(EQ) + .append(OidcCommonUtils.urlEncode(entry.getValue())); + } + } - // extra redirect parameters, see https://openid.net/specs/openid-connect-core-1_0.html#AuthRequests - if (configContext.oidcConfig.authentication.getExtraParams() != null) { - for (Map.Entry entry : configContext.oidcConfig.authentication.getExtraParams().entrySet()) { - codeFlowParams.append(AMP).append(entry.getKey()).append(EQ) - .append(OidcCommonUtils.urlEncode(entry.getValue())); - } - } + String authorizationURL = configContext.provider.getMetadata().getAuthorizationUri() + "?" + + codeFlowParams.toString(); - String authorizationURL = configContext.provider.getMetadata().getAuthorizationUri() + "?" + codeFlowParams.toString(); + return Uni.createFrom().item(new ChallengeData(HttpResponseStatus.FOUND.code(), HttpHeaders.LOCATION, + authorizationURL)); + } - return Uni.createFrom().item(new ChallengeData(HttpResponseStatus.FOUND.code(), HttpHeaders.LOCATION, - authorizationURL)); + }); } private Uni performCodeFlow(IdentityProviderManager identityProviderManager, @@ -278,12 +307,16 @@ public Uni apply(final AuthorizationCodeTokens tokens, final T return authenticate(identityProviderManager, context, new IdTokenCredential(tokens.getIdToken(), context)) + .call(new Function>() { + @Override + public Uni apply(SecurityIdentity identity) { + return processSuccessfulAuthentication(context, configContext, + tokens, identity); + } + }) .map(new Function() { @Override public SecurityIdentity apply(SecurityIdentity identity) { - processSuccessfulAuthentication(context, configContext, - tokens, identity); - boolean removeRedirectParams = configContext.oidcConfig.authentication .isRemoveRedirectParameters(); if (removeRedirectParams || finalUserPath != null @@ -325,31 +358,48 @@ public Throwable apply(Throwable tInner) { } - private void processSuccessfulAuthentication(RoutingContext context, + private Uni processSuccessfulAuthentication(RoutingContext context, TenantConfigContext configContext, AuthorizationCodeTokens tokens, SecurityIdentity securityIdentity) { - removeCookie(context, configContext, getSessionCookieName(configContext.oidcConfig)); + return removeSessionCookie(context, configContext, getSessionCookieName(configContext.oidcConfig)) + .chain(new Function>() { - JsonObject idToken = OidcUtils.decodeJwtContent(tokens.getIdToken()); + @Override + public Uni apply(Void t) { + JsonObject idToken = OidcUtils.decodeJwtContent(tokens.getIdToken()); - if (!idToken.containsKey("exp") || !idToken.containsKey("iat")) { - LOG.debug("ID Token is required to contain 'exp' and 'iat' claims"); - throw new AuthenticationCompletionException(); - } - long maxAge = idToken.getLong("exp") - idToken.getLong("iat"); - if (configContext.oidcConfig.token.lifespanGrace.isPresent()) { - maxAge += configContext.oidcConfig.token.lifespanGrace.getAsInt(); - } - if (configContext.oidcConfig.token.refreshExpired) { - maxAge += configContext.oidcConfig.authentication.sessionAgeExtension.getSeconds(); - } - context.put(SESSION_MAX_AGE_PARAM, maxAge); - String cookieValue = resolver.getTokenStateManager() - .createTokenState(context, configContext.oidcConfig, tokens); - createCookie(context, configContext.oidcConfig, getSessionCookieName(configContext.oidcConfig), cookieValue, maxAge); + if (!idToken.containsKey("exp") || !idToken.containsKey("iat")) { + LOG.debug("ID Token is required to contain 'exp' and 'iat' claims"); + throw new AuthenticationCompletionException(); + } + long maxAge = idToken.getLong("exp") - idToken.getLong("iat"); + if (configContext.oidcConfig.token.lifespanGrace.isPresent()) { + maxAge += configContext.oidcConfig.token.lifespanGrace.getAsInt(); + } + if (configContext.oidcConfig.token.refreshExpired) { + maxAge += configContext.oidcConfig.authentication.sessionAgeExtension.getSeconds(); + } + final long sessionMaxAge = maxAge; + context.put(SESSION_MAX_AGE_PARAM, maxAge); + return resolver.getTokenStateManager() + .createTokenState(context, configContext.oidcConfig, tokens, createTokenStateRequestContext) + .map(new Function() { + + @Override + public Void apply(String cookieValue) { + createCookie(context, configContext.oidcConfig, + getSessionCookieName(configContext.oidcConfig), + cookieValue, sessionMaxAge); + fireEvent(SecurityEvent.Type.OIDC_LOGIN, securityIdentity); + return null; + } + + }); + } + + }); - fireEvent(SecurityEvent.Type.OIDC_LOGIN, securityIdentity); } private void fireEvent(SecurityEvent.Type eventType, SecurityIdentity securityIdentity) { @@ -441,14 +491,24 @@ private String buildUri(RoutingContext context, boolean forceHttps, String autho .toString(); } - private void removeCookie(RoutingContext context, TenantConfigContext configContext, String cookieName) { + private Uni removeSessionCookie(RoutingContext context, TenantConfigContext configContext, String cookieName) { + String cookieValue = removeCookie(context, configContext, cookieName); + if (cookieValue != null) { + return resolver.getTokenStateManager().deleteTokens(context, configContext.oidcConfig, cookieValue, + deleteTokensRequestContext); + } else { + return VOID_UNI; + } + } + + private String removeCookie(RoutingContext context, TenantConfigContext configContext, String cookieName) { ServerCookie cookie = (ServerCookie) context.cookieMap().get(cookieName); + String cookieValue = null; if (cookie != null) { - if (SESSION_COOKIE_NAME.equals(cookieName)) { - resolver.getTokenStateManager().deleteTokens(context, configContext.oidcConfig, cookie.getValue()); - } + cookieValue = cookie.getValue(); removeCookie(context, cookie, configContext.oidcConfig); } + return cookieValue; } static void removeCookie(RoutingContext context, ServerCookie cookie, OidcTenantConfig oidcConfig) { @@ -500,12 +560,17 @@ public Uni apply(final AuthorizationCodeTokens tokens, final T return authenticate(identityProviderManager, context, new IdTokenCredential(tokens.getIdToken(), context)) - .map(new Function() { + .call(new Function>() { @Override - public SecurityIdentity apply(SecurityIdentity identity) { + public Uni apply(SecurityIdentity identity) { // after a successful refresh, rebuild the identity and update the cookie - processSuccessfulAuthentication(context, configContext, + return processSuccessfulAuthentication(context, configContext, tokens, identity); + } + }) + .map(new Function() { + @Override + public SecurityIdentity apply(SecurityIdentity identity) { fireEvent(autoRefresh ? SecurityEvent.Type.OIDC_SESSION_REFRESHED : SecurityEvent.Type.OIDC_SESSION_EXPIRED_AND_REFRESHED, identity); @@ -555,10 +620,15 @@ private boolean isForceHttps(TenantConfigContext configContext) { return configContext.oidcConfig.authentication.forceRedirectHttpsScheme; } - private AuthenticationRedirectException redirectToLogoutEndpoint(RoutingContext context, TenantConfigContext configContext, + private Uni buildLogoutRedirectUriUni(RoutingContext context, TenantConfigContext configContext, String idToken) { - removeCookie(context, configContext, getSessionCookieName(configContext.oidcConfig)); - return new AuthenticationRedirectException(buildLogoutRedirectUri(configContext, idToken, context)); + return removeSessionCookie(context, configContext, getSessionCookieName(configContext.oidcConfig)) + .map(new Function() { + @Override + public Void apply(Void t) { + throw new AuthenticationRedirectException(buildLogoutRedirectUri(configContext, idToken, context)); + } + }); } private static String getStateCookieName(TenantConfigContext configContext) { @@ -580,4 +650,48 @@ static String getCookieSuffix(String tenantId) { return !"Default".equals(tenantId) ? "_" + tenantId : ""; } + private static class CreateTokenStateRequestContext extends BlockingTaskRunner + implements TokenStateManager.CreateTokenStateRequestContext { + } + + private static class GetTokensRequestContext extends BlockingTaskRunner + implements TokenStateManager.GetTokensRequestContext { + } + + private static class DeleteTokensRequestContext extends BlockingTaskRunner + implements TokenStateManager.DeleteTokensRequestContext { + } + + private static class BlockingTaskRunner { + public Uni runBlocking(Supplier function) { + return Uni.createFrom().deferred(new Supplier>() { + @Override + public Uni get() { + if (BlockingOperationControl.isBlockingAllowed()) { + try { + return Uni.createFrom().item(function.get()); + } catch (Throwable t) { + return Uni.createFrom().failure(t); + } + } else { + return Uni.createFrom().emitter(new Consumer>() { + @Override + public void accept(UniEmitter uniEmitter) { + ExecutorRecorder.getCurrent().execute(new Runnable() { + @Override + public void run() { + try { + uniEmitter.complete(function.get()); + } catch (Throwable t) { + uniEmitter.fail(t); + } + } + }); + } + }); + } + } + }); + } + } } diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java index 2b0a951258c24a..b5f05b044882dd 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java @@ -5,6 +5,7 @@ import io.quarkus.oidc.AuthorizationCodeTokens; import io.quarkus.oidc.OidcTenantConfig; import io.quarkus.oidc.TokenStateManager; +import io.smallrye.mutiny.Uni; import io.vertx.core.http.Cookie; import io.vertx.core.http.impl.ServerCookie; import io.vertx.ext.web.RoutingContext; @@ -16,8 +17,8 @@ public class DefaultTokenStateManager implements TokenStateManager { private static final String SESSION_RT_COOKIE_NAME = CodeAuthenticationMechanism.SESSION_COOKIE_NAME + "_rt"; @Override - public String createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig, - AuthorizationCodeTokens tokens) { + public Uni createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig, + AuthorizationCodeTokens tokens, TokenStateManager.CreateTokenStateRequestContext requestContext) { StringBuilder sb = new StringBuilder(); sb.append(tokens.getIdToken()); if (oidcConfig.tokenStateManager.strategy == OidcTenantConfig.TokenStateManager.Strategy.KEEP_ALL_TOKENS) { @@ -56,11 +57,12 @@ public String createTokenState(RoutingContext routingContext, OidcTenantConfig o } } } - return sb.toString(); + return Uni.createFrom().item(sb.toString()); } @Override - public AuthorizationCodeTokens getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState) { + public Uni getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState, + TokenStateManager.GetTokensRequestContext requestContext) { String[] tokens = CodeAuthenticationMechanism.COOKIE_PATTERN.split(tokenState); String idToken = tokens[0]; @@ -91,17 +93,19 @@ public AuthorizationCodeTokens getTokens(RoutingContext routingContext, OidcTena } } - return new AuthorizationCodeTokens(idToken, accessToken, refreshToken); + return Uni.createFrom().item(new AuthorizationCodeTokens(idToken, accessToken, refreshToken)); } @Override - public void deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState) { + public Uni deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState, + TokenStateManager.DeleteTokensRequestContext requestContext) { if (oidcConfig.tokenStateManager.splitTokens) { CodeAuthenticationMechanism.removeCookie(routingContext, getAccessTokenCookie(routingContext, oidcConfig), oidcConfig); CodeAuthenticationMechanism.removeCookie(routingContext, getRefreshTokenCookie(routingContext, oidcConfig), oidcConfig); } + return CodeAuthenticationMechanism.VOID_UNI; } private static ServerCookie getAccessTokenCookie(RoutingContext routingContext, OidcTenantConfig oidcConfig) { From 2d9e9dc35b0074035df6093a8e7c05b3fb861f03 Mon Sep 17 00:00:00 2001 From: Clement Escoffier Date: Tue, 31 Aug 2021 19:53:29 +0200 Subject: [PATCH 035/138] Update Vert.x version to 4.1.3 and Mutiny bindings to 2.13.0 --- bom/application/pom.xml | 6 +++--- independent-projects/resteasy-reactive/pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 5a28a7cab7d310..907bf88c6cf231 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -53,7 +53,7 @@ 1.2.0 1.0.13 2.6.0 - 2.12.0 + 2.13.0 3.9.1 1.2.1 1.3.5 @@ -109,7 +109,7 @@ 1.16.1.Final 1.8.7.Final 3.4.2.Final - 4.1.2 + 4.1.3 4.5.13 4.4.14 4.1.4 @@ -131,7 +131,7 @@ 12.1.7.Final 4.4.1.Final 2.9.2 - 4.1.65.Final + 4.1.67.Final 1.0.3 3.4.2.Final 1.0.0 diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml index 2aed06eaa2350e..f43d16df34780d 100644 --- a/independent-projects/resteasy-reactive/pom.xml +++ b/independent-projects/resteasy-reactive/pom.xml @@ -52,7 +52,7 @@ 1.1.6 1.0.0 1.6.0 - 4.1.2 + 4.1.3 4.4.0 1.0.0.Final 2.0.0.Final From 6ac8ad3884bfee5915c42f14b0bb7bfff8d30baf Mon Sep 17 00:00:00 2001 From: Falko Modler Date: Tue, 31 Aug 2021 21:11:43 +0200 Subject: [PATCH 036/138] Fix NoSuchElementException on `@Before/AfterAll` with TestInfo Fixes #19800 --- .../it/main/QuarkusTestCallbacksTestCase.java | 21 +++++++++++++++++++ .../test/junit/QuarkusTestExtension.java | 6 ++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java index af121205b21c2a..80983c0f53bc08 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java @@ -3,6 +3,7 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -11,7 +12,9 @@ import java.lang.annotation.Target; import java.lang.reflect.Method; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -27,6 +30,22 @@ @QuarkusTest public class QuarkusTestCallbacksTestCase { + @BeforeAll + static void beforeAllWithTestInfo(TestInfo testInfo) { + checkBeforeOrAfterAllTestInfo(testInfo); + } + + @AfterAll + static void afterAllWithTestInfo(TestInfo testInfo) { + checkBeforeOrAfterAllTestInfo(testInfo); + } + + private static void checkBeforeOrAfterAllTestInfo(TestInfo testInfo) { + assertNotNull(testInfo); + assertEquals(QuarkusTestCallbacksTestCase.class, testInfo.getTestClass().get()); + assertFalse(testInfo.getTestMethod().isPresent()); + } + @BeforeEach void beforeEachWithTestInfo(TestInfo testInfo) throws NoSuchMethodException { checkBeforeOrAfterEachTestInfo(testInfo, "beforeEachWithTestInfo"); @@ -43,6 +62,7 @@ private void checkBeforeOrAfterEachTestInfo(TestInfo testInfo, String unexpected assertNotEquals(testMethodName, QuarkusTestCallbacksTestCase.class.getDeclaredMethod(unexpectedMethodName, TestInfo.class)); assertTrue(testMethodName.startsWith("test")); + assertEquals(QuarkusTestCallbacksTestCase.class, testInfo.getTestClass().get()); } @Test @@ -66,6 +86,7 @@ public void testInfoTestCase(TestInfo testInfo) throws NoSuchMethodException { Method testMethod = testInfo.getTestMethod().get(); assertEquals(testMethod, QuarkusTestCallbacksTestCase.class.getDeclaredMethod("testInfoTestCase", TestInfo.class)); assertEquals(1, testMethod.getAnnotationsByType(TestAnnotation.class).length); + assertEquals(QuarkusTestCallbacksTestCase.class, testInfo.getTestClass().get()); } @Target({ METHOD }) diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java index deb9fc5f555409..edc69c08052312 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java @@ -1039,9 +1039,11 @@ private Object runExtensionMethod(ReflectiveInvocationContext invocation cloneRequired = false; } else if (TestInfo.class.isAssignableFrom(theclass)) { TestInfo info = (TestInfo) arg; - Method newTestMethod = determineTCCLExtensionMethod(info.getTestMethod().get(), testClassFromTCCL); + Method newTestMethod = info.getTestMethod().isPresent() + ? determineTCCLExtensionMethod(info.getTestMethod().get(), testClassFromTCCL) + : null; replacement = new TestInfoImpl(info.getDisplayName(), info.getTags(), Optional.of(testClassFromTCCL), - Optional.of(newTestMethod)); + Optional.ofNullable(newTestMethod)); } else if (clonePattern.matcher(className).matches()) { cloneRequired = true; } else { From f78e00ace9d9696cdebd499817a7cb70023ccd55 Mon Sep 17 00:00:00 2001 From: Erin Schnabel Date: Tue, 31 Aug 2021 15:16:11 -0400 Subject: [PATCH 037/138] CLI: docs and help for -P --- .../quarkus/cli/common/TargetQuarkusVersionGroup.java | 11 +++++++++-- docs/src/main/asciidoc/cli-tooling.adoc | 6 +++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/devtools/cli/src/main/java/io/quarkus/cli/common/TargetQuarkusVersionGroup.java b/devtools/cli/src/main/java/io/quarkus/cli/common/TargetQuarkusVersionGroup.java index 5e3b2a1254a620..7444fd2418a984 100644 --- a/devtools/cli/src/main/java/io/quarkus/cli/common/TargetQuarkusVersionGroup.java +++ b/devtools/cli/src/main/java/io/quarkus/cli/common/TargetQuarkusVersionGroup.java @@ -8,6 +8,8 @@ import picocli.CommandLine.Model.CommandSpec; public class TargetQuarkusVersionGroup { + final static String FULL_EXAMPLE = ToolsConstants.DEFAULT_PLATFORM_BOM_GROUP_ID + ":" + + ToolsConstants.DEFAULT_PLATFORM_BOM_ARTIFACT_ID + ":2.2.0.Final"; StreamCoords streamCoords = null; String validStream = null; @@ -18,7 +20,7 @@ public class TargetQuarkusVersionGroup { CommandSpec spec; @CommandLine.Option(paramLabel = "platformKey:streamId", names = { "-S", - "--stream" }, description = "A target stream, for example:%n io.quarkus.platform:999-SNAPSHOT%n io.quarkus.platform:2.0") + "--stream" }, description = "A target stream, for example:%n io.quarkus.platform:2.0") void setStream(String stream) { stream = stream.trim(); if (!stream.isEmpty()) { @@ -34,7 +36,12 @@ void setStream(String stream) { } @CommandLine.Option(paramLabel = "groupId:artifactId:version", names = { "-P", - "--platform-bom" }, description = "A specific Quarkus platform BOM, for example:%n io.quarkus:quarkus-bom:2.0.0.Final") + "--platform-bom" }, description = "A specific Quarkus platform BOM, for example:%n" + + " " + FULL_EXAMPLE + "%n" + + " io.quarkus::999-SNAPSHOT" + + " 2.2.0.Final%n" + + "Default groupId: " + ToolsConstants.DEFAULT_PLATFORM_BOM_GROUP_ID + "%n" + + "Default artifactId: " + ToolsConstants.DEFAULT_PLATFORM_BOM_ARTIFACT_ID + "%n") void setPlatformBom(String bom) { bom = bom.replaceFirst("^::", "").trim(); if (!bom.isEmpty()) { diff --git a/docs/src/main/asciidoc/cli-tooling.adoc b/docs/src/main/asciidoc/cli-tooling.adoc index e2a39ca3599599..c6ef10ea64b003 100644 --- a/docs/src/main/asciidoc/cli-tooling.adoc +++ b/docs/src/main/asciidoc/cli-tooling.adoc @@ -173,12 +173,12 @@ Both `quarkus create` and `quarkus extension list` allow you to explicitly speci 1. Specify a specific Platform Release BOM + -A https://quarkus.io/guides/platform#quarkus-platform-bom[Quarkus Platform release BOM] is identified by `groupId:artifactId:version` (GAV) coordinates. When specifying a platform release BOM, you may use empty segments to fallback to default values (groupId: `io.quarkus`, artifactId: `quarkus-bom`, version: cli version). If you specify only one segment (no `:`), it is assumed to be a version. +A https://quarkus.io/guides/platform#quarkus-platform-bom[Quarkus Platform release BOM] is identified by `groupId:artifactId:version` (GAV) coordinates. When specifying a platform release BOM, you may use empty segments to fallback to default values (shown with `quarkus create app --help`). If you specify only one segment (no `:`), it is assumed to be a version. + For example: + -- Given the `2.0.0.Final` version of the CLI, specifying `-P :quarkus-bom:` is equivalent to `-P io.quarkus.platform:quarkus-bom:2.0.0.Final`. -- Specifying `-P 999-SNAPSHOT` is equivalent to `-P io.quarkus:quarkus-bom:999-SNAPSHOT` +- With the `2.0.0.Final` version of the CLI, specifying `-P :quarkus-bom:` is equivalent to `-P io.quarkus:quarkus-bom:2.0.0.Final`. Specifying `-P 999-SNAPSHOT` is equivalent to `-P io.quarkus:quarkus-bom:999-SNAPSHOT`. +- With the `2.1.0.Final` version of the CLI, `io.quarkus.platform` is the default group id. Specifying `-P :quarkus-bom:` is equivalent to `-P io.quarkus.platform:quarkus-bom:2.1.0.Final`. Note that you need to specify the group id to work with a snapshot, e.g `-P io.quarkus::999-SNAPSHOT` is equivalent to `-P io.quarkus:quarkus-bom:999-SNAPSHOT`. + Note: default values are subject to change. Using the `--dry-run` option will show you the computed value. From d0d2d57c686ea156c03eb7ea865ebb6be70ed6d2 Mon Sep 17 00:00:00 2001 From: Guillaume Le Floch Date: Tue, 31 Aug 2021 21:49:53 +0200 Subject: [PATCH 038/138] Do not propagate java compiler argument in kotlin compilation provider --- .../java/io/quarkus/gradle/QuarkusPlugin.java | 3 ++- .../io/quarkus/gradle/tasks/QuarkusDev.java | 8 +++++- .../build.gradle | 26 +++++++++++++++++++ .../gradle.properties | 4 +++ .../settings.gradle | 18 +++++++++++++ .../main/kotlin/org/acme/GreetingResource.kt | 16 ++++++++++++ ...sicKotlinApplicationModuleDevModeTest.java | 26 +++++++++++++++++++ 7 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 integration-tests/gradle/src/main/resources/basic-kotlin-application-project/build.gradle create mode 100644 integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties create mode 100644 integration-tests/gradle/src/main/resources/basic-kotlin-application-project/settings.gradle create mode 100644 integration-tests/gradle/src/main/resources/basic-kotlin-application-project/src/main/kotlin/org/acme/GreetingResource.kt create mode 100644 integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/BasicKotlinApplicationModuleDevModeTest.java diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java index 0130082fdd6756..fb1b6b8618a331 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java @@ -121,7 +121,7 @@ private void registerTasks(Project project, QuarkusPluginExtension quarkusExt) { Task quarkusBuild = tasks.create(QUARKUS_BUILD_TASK_NAME, QuarkusBuild.class); quarkusBuild.dependsOn(quarkusGenerateCode); - Task quarkusDev = tasks.create(QUARKUS_DEV_TASK_NAME, QuarkusDev.class); + QuarkusDev quarkusDev = tasks.create(QUARKUS_DEV_TASK_NAME, QuarkusDev.class); Task quarkusRemoteDev = tasks.create(QUARKUS_REMOTE_DEV_TASK_NAME, QuarkusRemoteDev.class); Task quarkusTest = tasks.create(QUARKUS_TEST_TASK_NAME, QuarkusTest.class); tasks.create(QUARKUS_TEST_CONFIG_TASK_NAME, QuarkusTestConfig.class); @@ -233,6 +233,7 @@ public void execute(Task test) { }); project.getPlugins().withId("org.jetbrains.kotlin.jvm", plugin -> { + quarkusDev.shouldPropagateJavaCompilerArgs(false); tasks.getByName("compileKotlin").dependsOn(quarkusGenerateCode); tasks.getByName("compileTestKotlin").dependsOn(quarkusGenerateCodeTests); }); diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java index 3c050bb07db45e..f28c8bca01aa56 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java @@ -74,6 +74,8 @@ public class QuarkusDev extends QuarkusTask { private List compilerArgs = new LinkedList<>(); + private boolean shouldPropagateJavaCompilerArgs = true; + @Inject public QuarkusDev() { super("Development mode: enables hot deployment with background compilation"); @@ -303,7 +305,7 @@ private QuarkusDevModeLauncher newLauncher() throws Exception { builder.targetJavaVersion(javaPluginConvention.getTargetCompatibility().toString()); } - if (getCompilerArgs().isEmpty()) { + if (getCompilerArgs().isEmpty() && shouldPropagateJavaCompilerArgs) { getJavaCompileTask() .map(compileTask -> compileTask.getOptions().getCompilerArgs()) .ifPresent(builder::compilerOptions); @@ -571,4 +573,8 @@ private void addToClassPaths(GradleDevModeLauncher.Builder classPathManifest, Fi classPathManifest.classpathEntry(file); } } + + public void shouldPropagateJavaCompilerArgs(boolean shouldPropagateJavaCompilerArgs) { + this.shouldPropagateJavaCompilerArgs = shouldPropagateJavaCompilerArgs; + } } diff --git a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/build.gradle b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/build.gradle new file mode 100644 index 00000000000000..6a3efd26bb298e --- /dev/null +++ b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/build.gradle @@ -0,0 +1,26 @@ +plugins { + id 'org.jetbrains.kotlin.jvm' + id 'io.quarkus' +} + +repositories { + if (System.properties.containsKey('maven.repo.local')) { + maven { + url System.properties.get('maven.repo.local') + } + } else { + mavenLocal() + } + mavenCentral() +} + +dependencies { + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' + implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") + implementation 'io.quarkus:quarkus-resteasy' + implementation 'io.quarkus:quarkus-kotlin' +} + +compileJava { + options.compilerArgs << '-parameters' +} diff --git a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties new file mode 100644 index 00000000000000..15d78eaf882e51 --- /dev/null +++ b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties @@ -0,0 +1,4 @@ +kotlinVersion=1.5.30 + +quarkusPlatformArtifactId=quarkus-bom +quarkusPlatformGroupId=io.quarkus diff --git a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/settings.gradle b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/settings.gradle new file mode 100644 index 00000000000000..fb99dc799e1e2f --- /dev/null +++ b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/settings.gradle @@ -0,0 +1,18 @@ +pluginManagement { + repositories { + if (System.properties.containsKey('maven.repo.local')) { + maven { + url System.properties.get('maven.repo.local') + } + } else { + mavenLocal() + } + mavenCentral() + gradlePluginPortal() + } + plugins { + id 'io.quarkus' version "${quarkusPluginVersion}" + id 'org.jetbrains.kotlin.jvm' version "${kotlinVersion}" + } +} +rootProject.name='code-with-quarkus' diff --git a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/src/main/kotlin/org/acme/GreetingResource.kt b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/src/main/kotlin/org/acme/GreetingResource.kt new file mode 100644 index 00000000000000..7634ba14219048 --- /dev/null +++ b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/src/main/kotlin/org/acme/GreetingResource.kt @@ -0,0 +1,16 @@ +package org.acme + +import javax.ws.rs.GET +import javax.ws.rs.Path +import javax.ws.rs.Produces +import javax.ws.rs.core.MediaType + +@Path("/hello") +class GreetingResource { + + @GET + @Produces(MediaType.TEXT_PLAIN) + fun hello(): String { + return "hello" + } +} \ No newline at end of file diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/BasicKotlinApplicationModuleDevModeTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/BasicKotlinApplicationModuleDevModeTest.java new file mode 100644 index 00000000000000..a98c32842b24b9 --- /dev/null +++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/BasicKotlinApplicationModuleDevModeTest.java @@ -0,0 +1,26 @@ +package io.quarkus.gradle.devmode; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.UUID; + +import com.google.common.collect.ImmutableMap; + +public class BasicKotlinApplicationModuleDevModeTest extends QuarkusDevGradleTestBase { + + @Override + protected String projectDirectoryName() { + return "basic-kotlin-application-project"; + } + + @Override + protected void testDevMode() throws Exception { + assertThat(getHttpResponse("/hello")).contains("hello"); + + final String uuid = UUID.randomUUID().toString(); + replace("src/main/kotlin/org/acme/GreetingResource.kt", + ImmutableMap.of("return \"hello\"", "return \"" + uuid + "\"")); + + assertUpdatedResponseContains("/hello", uuid); + } +} From d9963fc7f5739e455b1ab7b336ec43bf01bbdb13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Aug 2021 21:08:59 +0000 Subject: [PATCH 039/138] Bump awssdk.version from 2.17.30 to 2.17.31 Bumps `awssdk.version` from 2.17.30 to 2.17.31. Updates `software.amazon.awssdk:bom` from 2.17.30 to 2.17.31 - [Release notes](https://github.com/aws/aws-sdk-java-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java-v2/compare/2.17.30...2.17.31) Updates `apache-client` from 2.17.30 to 2.17.31 --- updated-dependencies: - dependency-name: software.amazon.awssdk:bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:apache-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index ebfe0a06a2c6f1..ddc2796f3ad246 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -145,7 +145,7 @@ 3.10.0 1.6 2.9.1 - 2.17.30 + 2.17.31 2.40.0 1.4.2 1.5.30 From fb4c1cbb92ad588bd48cec3d07a223ddfec73a91 Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Tue, 17 Aug 2021 09:36:14 +1000 Subject: [PATCH 040/138] Add some substitutions for Brotli and Zstd --- extensions/vertx-http/runtime/pom.xml | 5 + .../HttpContentCompressorSubstitutions.java | 115 ++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/graal/HttpContentCompressorSubstitutions.java diff --git a/extensions/vertx-http/runtime/pom.xml b/extensions/vertx-http/runtime/pom.xml index a1f7c667077d84..fabcf3c34282df 100644 --- a/extensions/vertx-http/runtime/pom.xml +++ b/extensions/vertx-http/runtime/pom.xml @@ -53,6 +53,11 @@ + + org.graalvm.nativeimage + svm + provided + org.junit.jupiter diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/graal/HttpContentCompressorSubstitutions.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/graal/HttpContentCompressorSubstitutions.java new file mode 100644 index 00000000000000..37dac442fbcf17 --- /dev/null +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/graal/HttpContentCompressorSubstitutions.java @@ -0,0 +1,115 @@ +package io.quarkus.vertx.http.runtime.graal; + +import static io.netty.handler.codec.http.HttpHeaderValues.DEFLATE; +import static io.netty.handler.codec.http.HttpHeaderValues.GZIP; +import static io.netty.handler.codec.http.HttpHeaderValues.X_DEFLATE; +import static io.netty.handler.codec.http.HttpHeaderValues.X_GZIP; + +import java.util.function.BooleanSupplier; + +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.embedded.EmbeddedChannel; +import io.netty.handler.codec.compression.ZlibWrapper; +import io.netty.handler.codec.http2.CompressorHttp2ConnectionEncoder; +import io.netty.handler.codec.http2.Http2Exception; + +public class HttpContentCompressorSubstitutions { + + @TargetClass(className = "io.netty.handler.codec.compression.ZstdEncoder", onlyWith = IsZstdAbsent.class) + public static final class ZstdEncoderFactorySubstitution { + + @Substitute + protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, ByteBuf msg, boolean preferDirect) throws Exception { + throw new UnsupportedOperationException(); + } + + @Substitute + protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) { + throw new UnsupportedOperationException(); + } + + @Substitute + public void flush(final ChannelHandlerContext ctx) { + throw new UnsupportedOperationException(); + } + } + + @TargetClass(className = "io.netty.handler.codec.compression.BrotliEncoder", onlyWith = IsBrotliAbsent.class) + public static final class BrEncoderFactorySubstitution { + + @Substitute + protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, ByteBuf msg, boolean preferDirect) throws Exception { + throw new UnsupportedOperationException(); + } + + @Substitute + protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) { + throw new UnsupportedOperationException(); + } + } + + @TargetClass(CompressorHttp2ConnectionEncoder.class) + public static final class CompressorHttp2ConnectionSubstitute { + + @Substitute + protected EmbeddedChannel newContentCompressor(ChannelHandlerContext ctx, CharSequence contentEncoding) + throws Http2Exception { + if (GZIP.contentEqualsIgnoreCase(contentEncoding) || X_GZIP.contentEqualsIgnoreCase(contentEncoding)) { + return newCompressionChannel(ctx, ZlibWrapper.GZIP); + } + if (DEFLATE.contentEqualsIgnoreCase(contentEncoding) || X_DEFLATE.contentEqualsIgnoreCase(contentEncoding)) { + return newCompressionChannel(ctx, ZlibWrapper.ZLIB); + } + // 'identity' or unsupported + return null; + } + + @Alias + private EmbeddedChannel newCompressionChannel(final ChannelHandlerContext ctx, ZlibWrapper wrapper) { + throw new UnsupportedOperationException(); + } + } + + public static class IsZstdAbsent implements BooleanSupplier { + + private boolean zstdAbsent; + + public IsZstdAbsent() { + try { + Class.forName("com.github.luben.zstd.Zstd"); + zstdAbsent = false; + } catch (ClassNotFoundException e) { + zstdAbsent = true; + } + } + + @Override + public boolean getAsBoolean() { + return zstdAbsent; + } + } + + public static class IsBrotliAbsent implements BooleanSupplier { + + private boolean brotliAbsent; + + public IsBrotliAbsent() { + try { + Class.forName("com.aayushatharva.brotli4j.encoder.Encoder"); + brotliAbsent = false; + } catch (ClassNotFoundException e) { + brotliAbsent = true; + } + } + + @Override + public boolean getAsBoolean() { + return brotliAbsent; + } + } +} From a3d5b90cc5fbe17ae79864c0f3868369715d8d46 Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Wed, 1 Sep 2021 09:28:47 +1000 Subject: [PATCH 041/138] Fix some tests the broke due to default change The max attribute size changed in vert.x --- ...anDefaultFormAttributeMultipartFormInputTest.java | 8 +++++++- .../TooLargeFormAttributeMultipartFormInputTest.java | 12 ++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java index 5489e49172b3f6..225943678fa69e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java @@ -39,7 +39,7 @@ public JavaArchive get() { return ShrinkWrap.create(JavaArchive.class) .addClasses(Resource.class, Data.class) .addAsResource(new StringAsset( - "quarkus.http.limits.max-form-attribute-size=4K"), + "quarkus.http.limits.max-form-attribute-size=120K"), "application.properties"); } }); @@ -49,6 +49,12 @@ public JavaArchive get() { @Test public void test() throws IOException { String fileContents = new String(Files.readAllBytes(FILE.toPath()), StandardCharsets.UTF_8); + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < 10; ++i) { + sb.append(fileContents); + } + fileContents = sb.toString(); + Assertions.assertTrue(fileContents.length() > HttpServerOptions.DEFAULT_MAX_FORM_ATTRIBUTE_SIZE); given() .multiPart("text", fileContents) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java index 6699beab8c705d..ef3d7553191684 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java @@ -66,9 +66,13 @@ public void clearDirectory() { @Test public void test() throws IOException { - String formAttrSourceFileContents = new String(Files.readAllBytes(FORM_ATTR_SOURCE_FILE.toPath()), - StandardCharsets.UTF_8); - Assertions.assertTrue(formAttrSourceFileContents.length() > HttpServerOptions.DEFAULT_MAX_FORM_ATTRIBUTE_SIZE); + String fileContents = new String(Files.readAllBytes(FORM_ATTR_SOURCE_FILE.toPath()), StandardCharsets.UTF_8); + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < 10; ++i) { + sb.append(fileContents); + } + fileContents = sb.toString(); + Assertions.assertTrue(fileContents.length() > HttpServerOptions.DEFAULT_MAX_FORM_ATTRIBUTE_SIZE); given() .multiPart("active", "true") .multiPart("num", "25") @@ -76,7 +80,7 @@ public void test() throws IOException { .multiPart("htmlFile", HTML_FILE, "text/html") .multiPart("xmlFile", XML_FILE, "text/xml") .multiPart("txtFile", TXT_FILE, "text/plain") - .multiPart("name", formAttrSourceFileContents) + .multiPart("name", fileContents) .accept("text/plain") .when() .post("/test") From 9e43b968fa0ecb2fec53890118c61be838b408d2 Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Wed, 1 Sep 2021 08:43:24 +1000 Subject: [PATCH 042/138] Don't rely on vert.x for CT tests --- bom/application/pom.xml | 7 - .../ContinuousTestingSharedStateListener.java | 93 +++++++++ .../dev/testing/TestTracingProcessor.java | 5 + .../ContinuousTestingSharedStateManager.java | 150 ++++++++++++++ .../ContinuousTestingWebsocketListener.java | 108 ---------- .../elytron-security-jdbc/deployment/pom.xml | 6 - .../jdbc/CustomRoleDecoderDevModeTest.java | 4 +- extensions/hibernate-orm/deployment/pom.xml | 6 - .../orm/HibernateHotReloadTestCase.java | 4 +- .../opentelemetry/deployment/pom.xml | 6 - .../OpenTelemetryContinuousTestingTest.java | 4 +- .../deployment/OpenTelemetryDevModeTest.java | 2 +- .../deployment/pom.xml | 6 - ...aDevServicesContinuousTestingTestCase.java | 2 +- ...tinuousTestingWorkingAppPropsTestCase.java | 2 +- extensions/vertx-http/deployment/pom.xml | 11 -- ...ontinuousTestingWebSocketTestListener.java | 107 ---------- .../devmode/tests/TestsProcessor.java | 2 - .../ContinuousTestingTestUtils.java | 53 ----- .../testrunner/QuarkusTestTypeTestCase.java | 3 +- ...tChangeTrackingWhenStartFailsTestCase.java | 3 +- .../TestFailingBeforeAllTestCase.java | 3 +- .../testrunner/TestRunnerSmokeTestCase.java | 3 +- .../http/testrunner/UnitTestTypeTestCase.java | 3 +- .../brokenonly/TestBrokenOnlyTestCase.java | 4 +- .../includes/ExcludePatternTestCase.java | 4 +- .../includes/IncludePatternTestCase.java | 4 +- .../params/TestParameterizedTestCase.java | 4 +- .../testrunner/tags/ExcludeTagsTestCase.java | 4 +- .../testrunner/tags/IncludeTagsTestCase.java | 4 +- .../ContinuousTestWebSocketHandler.java | 8 +- .../runtime/devmode/DevConsoleRecorder.java | 7 +- test-framework/junit5-internal/pom.xml | 4 + .../test/ContinuousTestingTestUtils.java | 185 ++++++++++++++++++ 34 files changed, 476 insertions(+), 345 deletions(-) create mode 100644 core/deployment/src/main/java/io/quarkus/deployment/dev/testing/ContinuousTestingSharedStateListener.java create mode 100644 core/devmode-spi/src/main/java/io/quarkus/dev/testing/ContinuousTestingSharedStateManager.java delete mode 100644 core/devmode-spi/src/main/java/io/quarkus/dev/testing/ContinuousTestingWebsocketListener.java delete mode 100644 extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ContinuousTestingWebSocketTestListener.java delete mode 100644 extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/ContinuousTestingTestUtils.java create mode 100644 test-framework/junit5-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java diff --git a/bom/application/pom.xml b/bom/application/pom.xml index f1c39ced2103be..5cf1616cc82f10 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -1540,13 +1540,6 @@ quarkus-vertx-http-deployment ${project.version} - - io.quarkus - quarkus-vertx-http-deployment - ${project.version} - test-jar - test - io.quarkus quarkus-vertx-web diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/ContinuousTestingSharedStateListener.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/ContinuousTestingSharedStateListener.java new file mode 100644 index 00000000000000..6604230f961b21 --- /dev/null +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/ContinuousTestingSharedStateListener.java @@ -0,0 +1,93 @@ +package io.quarkus.deployment.dev.testing; + +import java.util.function.Consumer; + +import io.quarkus.dev.testing.ContinuousTestingSharedStateManager; + +public class ContinuousTestingSharedStateListener implements TestListener { + + private volatile ContinuousTestingSharedStateManager.State lastState; + + @Override + public void listenerRegistered(TestController testController) { + + } + + @Override + public void testsEnabled() { + if (lastState == null) { + ContinuousTestingSharedStateManager + .setLastState(new ContinuousTestingSharedStateManager.State( + ContinuousTestingSharedStateManager.getLastState().lastRun, true, false, + 0, 0, 0, 0, + 0, 0, 0, ContinuousTestingSharedStateManager.getLastState().isBrokenOnly, + ContinuousTestingSharedStateManager.getLastState().isTestOutput, + ContinuousTestingSharedStateManager.getLastState().isInstrumentationBasedReload, + ContinuousTestingSharedStateManager.getLastState().isLiveReload)); + } else { + ContinuousTestingSharedStateManager + .setLastState(lastState); + } + } + + @Override + public void testsDisabled() { + ContinuousTestingSharedStateManager.setRunning(false); + } + + @Override + public void testRunStarted(Consumer listenerConsumer) { + ContinuousTestingSharedStateManager.setInProgress(true); + listenerConsumer.accept(new TestRunListener() { + + @Override + public void runComplete(TestRunResults testRunResults) { + lastState = new ContinuousTestingSharedStateManager.State(testRunResults.getId(), true, false, + testRunResults.getPassedCount() + + testRunResults.getFailedCount() + + testRunResults.getSkippedCount(), + testRunResults.getPassedCount(), + testRunResults.getFailedCount(), testRunResults.getSkippedCount(), + testRunResults.getCurrentPassedCount(), testRunResults.getCurrentFailedCount(), + testRunResults.getCurrentSkippedCount(), + ContinuousTestingSharedStateManager.getLastState().isBrokenOnly, + ContinuousTestingSharedStateManager.getLastState().isTestOutput, + ContinuousTestingSharedStateManager.getLastState().isInstrumentationBasedReload, + ContinuousTestingSharedStateManager.getLastState().isLiveReload); + ContinuousTestingSharedStateManager.setLastState(lastState); + } + + @Override + public void noTests(TestRunResults results) { + runComplete(results); + } + + @Override + public void runAborted() { + ContinuousTestingSharedStateManager.setInProgress(false); + } + }); + + } + + @Override + public void setBrokenOnly(boolean bo) { + ContinuousTestingSharedStateManager.setBrokenOnly(bo); + } + + @Override + public void setTestOutput(boolean to) { + ContinuousTestingSharedStateManager.setTestOutput(to); + } + + @Override + public void setInstrumentationBasedReload(boolean ibr) { + ContinuousTestingSharedStateManager.setInstrumentationBasedReload(ibr); + } + + @Override + public void setLiveReloadEnabled(boolean lre) { + ContinuousTestingSharedStateManager.setLiveReloadEnabled(lre); + } + +} diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestTracingProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestTracingProcessor.java index 9da423bb4f1bd5..7e2777caaa5e41 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestTracingProcessor.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestTracingProcessor.java @@ -42,6 +42,11 @@ LogCleanupFilterBuildItem handle() { static volatile boolean testingSetup; + @BuildStep + TestListenerBuildItem sharedStateListener() { + return new TestListenerBuildItem(new ContinuousTestingSharedStateListener()); + } + @BuildStep(onlyIf = IsDevelopment.class) @Produce(LogHandlerBuildItem.class) @Produce(TestSetupBuildItem.class) diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/testing/ContinuousTestingSharedStateManager.java b/core/devmode-spi/src/main/java/io/quarkus/dev/testing/ContinuousTestingSharedStateManager.java new file mode 100644 index 00000000000000..cc981b36e9009b --- /dev/null +++ b/core/devmode-spi/src/main/java/io/quarkus/dev/testing/ContinuousTestingSharedStateManager.java @@ -0,0 +1,150 @@ +package io.quarkus.dev.testing; + +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.function.Consumer; + +public class ContinuousTestingSharedStateManager { + + private static final CopyOnWriteArraySet> stateListeners = new CopyOnWriteArraySet<>(); + public static final State INITIAL_STATE = new State(-1, false, false, 0, 0, 0, 0, 0, 0, 0, false, false, false, true); + private static volatile State lastState = INITIAL_STATE; + + public static void addStateListener(Consumer stateListener) { + stateListeners.add(stateListener); + if (lastState != null) { + stateListener.accept(lastState); + } + } + + public static void removeStateListener(Consumer stateListener) { + stateListeners.remove(stateListener); + } + + public static void reset() { + setLastState(INITIAL_STATE); + } + + public static void setLastState(State state) { + lastState = state; + for (var sl : stateListeners) { + sl.accept(state); + } + } + + public static State getLastState() { + return lastState; + } + + public static void setInProgress(boolean inProgress) { + State state = lastState; + if (state != null) { + setLastState( + new State(state.lastRun, state.running, inProgress, state.run, state.passed, state.failed, state.skipped, + state.currentPassed, state.currentFailed, state.currentSkipped, state.isBrokenOnly, + state.isTestOutput, state.isInstrumentationBasedReload, state.isLiveReload)); + } + } + + public static void setRunning(boolean running) { + State state = lastState; + if (state != null) { + setLastState(new State(state.lastRun, running, running && state.inProgress, state.run, state.passed, state.failed, + state.skipped, + state.currentPassed, state.currentFailed, state.currentSkipped, state.isBrokenOnly, state.isTestOutput, + state.isInstrumentationBasedReload, state.isLiveReload)); + } + } + + public static void setBrokenOnly(boolean brokenOnly) { + State state = lastState; + if (state != null) { + setLastState(new State(state.lastRun, state.running, state.inProgress, state.run, state.passed, state.failed, + state.skipped, + state.currentPassed, state.currentFailed, state.currentSkipped, brokenOnly, state.isTestOutput, + state.isInstrumentationBasedReload, state.isLiveReload)); + } + } + + public static void setTestOutput(boolean testOutput) { + State state = lastState; + if (state != null) { + setLastState(new State(state.lastRun, state.running, state.inProgress, state.run, state.passed, state.failed, + state.skipped, + state.currentPassed, state.currentFailed, state.currentSkipped, state.isBrokenOnly, testOutput, + state.isInstrumentationBasedReload, state.isLiveReload)); + } + } + + public static void setInstrumentationBasedReload(boolean instrumentationBasedReload) { + State state = lastState; + if (state != null) { + setLastState(new State(state.lastRun, state.running, state.inProgress, state.run, state.passed, state.failed, + state.skipped, + state.currentPassed, state.currentFailed, state.currentSkipped, state.isBrokenOnly, state.isTestOutput, + instrumentationBasedReload, state.isLiveReload)); + } + } + + public static void setLiveReloadEnabled(boolean liveReload) { + State state = lastState; + if (state != null) { + setLastState(new State(state.lastRun, state.running, state.inProgress, state.run, state.passed, state.failed, + state.skipped, + state.currentPassed, state.currentFailed, state.currentSkipped, state.isBrokenOnly, state.isTestOutput, + state.isInstrumentationBasedReload, liveReload)); + } + } + + public static class State { + public final long lastRun; + public final boolean running; + public final boolean inProgress; + public final long run; + public final long passed; + public final long failed; + public final long skipped; + public final long currentPassed; + public final long currentFailed; + public final long currentSkipped; + public final boolean isBrokenOnly; + public final boolean isTestOutput; + public final boolean isInstrumentationBasedReload; + public final boolean isLiveReload; + + public State(long lastRun, boolean running, boolean inProgress, long run, long passed, long failed, long skipped, + long currentPassed, long currentFailed, long currentSkipped, boolean isBrokenOnly, boolean isTestOutput, + boolean isInstrumentationBasedReload, boolean isLiveReload) { + this.lastRun = lastRun; + this.running = running; + this.inProgress = inProgress; + this.run = run; + this.passed = passed; + this.failed = failed; + this.skipped = skipped; + this.currentPassed = currentPassed; + this.currentFailed = currentFailed; + this.currentSkipped = currentSkipped; + this.isBrokenOnly = isBrokenOnly; + this.isTestOutput = isTestOutput; + this.isInstrumentationBasedReload = isInstrumentationBasedReload; + this.isLiveReload = isLiveReload; + } + + @Override + public String toString() { + return "State{" + + "lastRun=" + lastRun + + ", running=" + running + + ", inProgress=" + inProgress + + ", run=" + run + + ", passed=" + passed + + ", failed=" + failed + + ", skipped=" + skipped + + ", isBrokenOnly=" + isBrokenOnly + + ", isTestOutput=" + isTestOutput + + ", isInstrumentationBasedReload=" + isInstrumentationBasedReload + + ", isLiveReload=" + isLiveReload + + '}'; + } + } +} diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/testing/ContinuousTestingWebsocketListener.java b/core/devmode-spi/src/main/java/io/quarkus/dev/testing/ContinuousTestingWebsocketListener.java deleted file mode 100644 index bc272a58a1db5d..00000000000000 --- a/core/devmode-spi/src/main/java/io/quarkus/dev/testing/ContinuousTestingWebsocketListener.java +++ /dev/null @@ -1,108 +0,0 @@ -package io.quarkus.dev.testing; - -import java.util.function.Consumer; - -//TODO: this is pretty horrible -public class ContinuousTestingWebsocketListener { - - private static Consumer stateListener; - private static volatile State lastState = new State(false, false, 0, 0, 0, 0, false, false, false, true); - - public static Consumer getStateListener() { - return stateListener; - } - - public static void setStateListener(Consumer stateListener) { - ContinuousTestingWebsocketListener.stateListener = stateListener; - if (lastState != null && stateListener != null) { - stateListener.accept(lastState); - } - } - - public static void setLastState(State state) { - lastState = state; - Consumer sl = stateListener; - if (sl != null) { - sl.accept(state); - } - } - - public static State getLastState() { - return lastState; - } - - public static void setInProgress(boolean inProgress) { - State state = lastState; - if (state != null) { - setLastState(new State(state.running, inProgress, state.run, state.passed, state.failed, state.skipped, - state.isBrokenOnly, state.isTestOutput, state.isInstrumentationBasedReload, state.isLiveReload)); - } - } - - public static void setRunning(boolean running) { - State state = lastState; - if (state != null) { - setLastState(new State(running, running && state.inProgress, state.run, state.passed, state.failed, state.skipped, - state.isBrokenOnly, state.isTestOutput, state.isInstrumentationBasedReload, state.isLiveReload)); - } - } - - public static void setBrokenOnly(boolean brokenOnly) { - State state = lastState; - if (state != null) { - setLastState(new State(state.running, state.inProgress, state.run, state.passed, state.failed, state.skipped, - brokenOnly, state.isTestOutput, state.isInstrumentationBasedReload, state.isLiveReload)); - } - } - - public static void setTestOutput(boolean testOutput) { - State state = lastState; - if (state != null) { - setLastState(new State(state.running, state.inProgress, state.run, state.passed, state.failed, state.skipped, - state.isBrokenOnly, testOutput, state.isInstrumentationBasedReload, state.isLiveReload)); - } - } - - public static void setInstrumentationBasedReload(boolean instrumentationBasedReload) { - State state = lastState; - if (state != null) { - setLastState(new State(state.running, state.inProgress, state.run, state.passed, state.failed, state.skipped, - state.isBrokenOnly, state.isTestOutput, instrumentationBasedReload, state.isLiveReload)); - } - } - - public static void setLiveReloadEnabled(boolean liveReload) { - State state = lastState; - if (state != null) { - setLastState(new State(state.running, state.inProgress, state.run, state.passed, state.failed, state.skipped, - state.isBrokenOnly, state.isTestOutput, state.isInstrumentationBasedReload, liveReload)); - } - } - - public static class State { - public final boolean running; - public final boolean inProgress; - public final long run; - public final long passed; - public final long failed; - public final long skipped; - public final boolean isBrokenOnly; - public final boolean isTestOutput; - public final boolean isInstrumentationBasedReload; - public final boolean isLiveReload; - - public State(boolean running, boolean inProgress, long run, long passed, long failed, long skipped, - boolean isBrokenOnly, boolean isTestOutput, boolean isInstrumentationBasedReload, boolean isLiveReload) { - this.running = running; - this.inProgress = inProgress; - this.run = run; - this.passed = passed; - this.failed = failed; - this.skipped = skipped; - this.isBrokenOnly = isBrokenOnly; - this.isTestOutput = isTestOutput; - this.isInstrumentationBasedReload = isInstrumentationBasedReload; - this.isLiveReload = isLiveReload; - } - } -} diff --git a/extensions/elytron-security-jdbc/deployment/pom.xml b/extensions/elytron-security-jdbc/deployment/pom.xml index 0e71187e66be69..44c3c8f921931b 100644 --- a/extensions/elytron-security-jdbc/deployment/pom.xml +++ b/extensions/elytron-security-jdbc/deployment/pom.xml @@ -46,12 +46,6 @@ quarkus-resteasy-deployment test - - io.quarkus - quarkus-vertx-http-deployment - test-jar - test - io.quarkus quarkus-junit5-internal diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderDevModeTest.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderDevModeTest.java index b55a8c75daf900..772ebd49aeecf4 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderDevModeTest.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderDevModeTest.java @@ -13,9 +13,9 @@ import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.deployment.util.FileUtil; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; import io.restassured.RestAssured; //see https://github.com/quarkusio/quarkus/issues/9296 diff --git a/extensions/hibernate-orm/deployment/pom.xml b/extensions/hibernate-orm/deployment/pom.xml index 75cea02da2efea..f1cd0a90c9730d 100644 --- a/extensions/hibernate-orm/deployment/pom.xml +++ b/extensions/hibernate-orm/deployment/pom.xml @@ -87,12 +87,6 @@ quarkus-smallrye-metrics-deployment test - - io.quarkus - quarkus-vertx-http-deployment - test - test-jar - org.awaitility awaitility diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateHotReloadTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateHotReloadTestCase.java index 64a86b95bfe2b1..52c1bb4fb2f018 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateHotReloadTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateHotReloadTestCase.java @@ -11,9 +11,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; import io.restassured.RestAssured; public class HibernateHotReloadTestCase { diff --git a/extensions/opentelemetry/opentelemetry/deployment/pom.xml b/extensions/opentelemetry/opentelemetry/deployment/pom.xml index c066a7c1f65030..f124d4a8646183 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/pom.xml +++ b/extensions/opentelemetry/opentelemetry/deployment/pom.xml @@ -69,12 +69,6 @@ quarkus-resteasy-deployment test - - io.quarkus - quarkus-vertx-http-deployment - test - test-jar - io.quarkus quarkus-smallrye-health-deployment diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryContinuousTestingTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryContinuousTestingTest.java index 8f213de335f5c3..8345afa9615b9e 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryContinuousTestingTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryContinuousTestingTest.java @@ -7,9 +7,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; public class OpenTelemetryContinuousTestingTest { @RegisterExtension diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java index 801673acdb8721..b7dc348682d116 100644 --- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java +++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; import io.restassured.RestAssured; public class OpenTelemetryDevModeTest { diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml b/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml index bcde6e700bec72..8d8bff7aceca62 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml @@ -83,12 +83,6 @@ awaitility test - - io.quarkus - quarkus-vertx-http-deployment - test-jar - test - diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingTestCase.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingTestCase.java index e4a232da8146b0..8387a6674986f5 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingTestCase.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingTestCase.java @@ -9,8 +9,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; public class KafkaDevServicesContinuousTestingTestCase { diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingWorkingAppPropsTestCase.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingWorkingAppPropsTestCase.java index e4fdcca5abe1a2..57c98b27fdf751 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingWorkingAppPropsTestCase.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingWorkingAppPropsTestCase.java @@ -9,8 +9,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; public class KafkaDevServicesContinuousTestingWorkingAppPropsTestCase { diff --git a/extensions/vertx-http/deployment/pom.xml b/extensions/vertx-http/deployment/pom.xml index daa32430e8a055..ed795df314e552 100644 --- a/extensions/vertx-http/deployment/pom.xml +++ b/extensions/vertx-http/deployment/pom.xml @@ -119,17 +119,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - maven-compiler-plugin diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ContinuousTestingWebSocketTestListener.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ContinuousTestingWebSocketTestListener.java deleted file mode 100644 index 2d83492a8186b3..00000000000000 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ContinuousTestingWebSocketTestListener.java +++ /dev/null @@ -1,107 +0,0 @@ -package io.quarkus.vertx.http.deployment.devmode.console; - -import java.util.function.Consumer; - -import org.junit.platform.launcher.TestIdentifier; - -import io.quarkus.deployment.dev.testing.TestController; -import io.quarkus.deployment.dev.testing.TestListener; -import io.quarkus.deployment.dev.testing.TestResult; -import io.quarkus.deployment.dev.testing.TestRunListener; -import io.quarkus.deployment.dev.testing.TestRunResults; -import io.quarkus.dev.testing.ContinuousTestingWebsocketListener; - -public class ContinuousTestingWebSocketTestListener implements TestListener { - - private volatile ContinuousTestingWebsocketListener.State lastState; - - @Override - public void listenerRegistered(TestController testController) { - - } - - @Override - public void testsEnabled() { - if (lastState == null) { - ContinuousTestingWebsocketListener - .setLastState(new ContinuousTestingWebsocketListener.State(true, false, - 0, 0, 0, 0, - ContinuousTestingWebsocketListener.getLastState().isBrokenOnly, - ContinuousTestingWebsocketListener.getLastState().isTestOutput, - ContinuousTestingWebsocketListener.getLastState().isInstrumentationBasedReload, - ContinuousTestingWebsocketListener.getLastState().isLiveReload)); - } else { - ContinuousTestingWebsocketListener - .setLastState(lastState); - } - } - - @Override - public void testsDisabled() { - ContinuousTestingWebsocketListener.setRunning(false); - } - - @Override - public void testRunStarted(Consumer listenerConsumer) { - ContinuousTestingWebsocketListener.setInProgress(true); - listenerConsumer.accept(new TestRunListener() { - @Override - public void runStarted(long toRun) { - - } - - @Override - public void testComplete(TestResult result) { - - } - - @Override - public void runComplete(TestRunResults testRunResults) { - lastState = new ContinuousTestingWebsocketListener.State(true, false, - testRunResults.getPassedCount() + - testRunResults.getFailedCount() + - testRunResults.getSkippedCount(), - testRunResults.getPassedCount(), - testRunResults.getFailedCount(), testRunResults.getSkippedCount(), - ContinuousTestingWebsocketListener.getLastState().isBrokenOnly, - ContinuousTestingWebsocketListener.getLastState().isTestOutput, - ContinuousTestingWebsocketListener.getLastState().isInstrumentationBasedReload, - ContinuousTestingWebsocketListener.getLastState().isLiveReload); - ContinuousTestingWebsocketListener.setLastState( - lastState); - } - - @Override - public void runAborted() { - ContinuousTestingWebsocketListener.setInProgress(false); - } - - @Override - public void testStarted(TestIdentifier testIdentifier, String className) { - - } - }); - - } - - @Override - public void setBrokenOnly(boolean bo) { - ContinuousTestingWebsocketListener.setBrokenOnly(bo); - } - - @Override - public void setTestOutput(boolean to) { - ContinuousTestingWebsocketListener.setTestOutput(to); - } - - @Override - public void setInstrumentationBasedReload(boolean ibr) { - ContinuousTestingWebsocketListener.setInstrumentationBasedReload(ibr); - } - - @Override - public void setLiveReloadEnabled(boolean lre) { - ContinuousTestingWebsocketListener.setLiveReloadEnabled(lre); - } - -} diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java index 6bc93507d3b807..8b58de97ce3ff5 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java @@ -23,7 +23,6 @@ import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem; import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; import io.quarkus.vertx.http.deployment.RouteBuildItem; -import io.quarkus.vertx.http.deployment.devmode.console.ContinuousTestingWebSocketTestListener; import io.quarkus.vertx.http.runtime.devmode.DevConsoleRecorder; import io.quarkus.vertx.http.runtime.devmode.Json; import io.vertx.core.Handler; @@ -61,7 +60,6 @@ public void setupTestRoutes( .route("dev/test") .handler(recorder.continousTestHandler(shutdownContextBuildItem)) .build()); - testListenerBuildItemBuildProducer.produce(new TestListenerBuildItem(new ContinuousTestingWebSocketTestListener())); } } diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/ContinuousTestingTestUtils.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/ContinuousTestingTestUtils.java deleted file mode 100644 index 5ae3209c3dfff3..00000000000000 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/ContinuousTestingTestUtils.java +++ /dev/null @@ -1,53 +0,0 @@ -package io.quarkus.vertx.http.testrunner; - -import java.util.Arrays; -import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; - -import org.awaitility.Awaitility; -import org.awaitility.core.ConditionTimeoutException; - -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; -import io.restassured.RestAssured; - -/** - * Utilities for testing the test runner itself - */ -public class ContinuousTestingTestUtils { - - long runtToWaitFor = 1; - - public TestStatus waitForNextCompletion() { - try { - Awaitility.waitAtMost(1, TimeUnit.MINUTES).pollInterval(50, TimeUnit.MILLISECONDS).until(new Callable() { - @Override - public Boolean call() throws Exception { - TestStatus ts = RestAssured.get("q/dev/io.quarkus.quarkus-vertx-http/tests/status").as(TestStatus.class); - if (ts.getLastRun() > runtToWaitFor) { - throw new RuntimeException( - "Waiting for run " + runtToWaitFor + " but run " + ts.getLastRun() + " has already occurred"); - } - boolean runComplete = ts.getLastRun() == runtToWaitFor; - if (runComplete && ts.getRunning() > 0) { - //there is a small chance of a race, where changes are picked up twice, due to how filesystems work - //this works around it by waiting for the next run - runtToWaitFor = ts.getRunning(); - return false; - } else if (runComplete) { - runtToWaitFor++; - } - return runComplete; - } - }); - } catch (Exception e) { - TestStatus ts = RestAssured.get("q/dev/io.quarkus.quarkus-vertx-http/tests/status").as(TestStatus.class); - throw new ConditionTimeoutException("Failed to wait for test run" + runtToWaitFor + " " + ts); - } - return RestAssured.get("q/dev/io.quarkus.quarkus-vertx-http/tests/status").as(TestStatus.class); - } - - public static String appProperties(String... props) { - return "quarkus.test.continuous-testing=enabled\nquarkus.test.display-test-output=true\nquarkus.test.basic-console=true\nquarkus.test.disable-console-input=true\n" - + String.join("\n", Arrays.asList(props)); - } -} diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/QuarkusTestTypeTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/QuarkusTestTypeTestCase.java index 344e0412ba79be..b1fe0916dc5853 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/QuarkusTestTypeTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/QuarkusTestTypeTestCase.java @@ -9,8 +9,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; public class QuarkusTestTypeTestCase { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestChangeTrackingWhenStartFailsTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestChangeTrackingWhenStartFailsTestCase.java index fd7735b789b0bc..bb9228f8a6c948 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestChangeTrackingWhenStartFailsTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestChangeTrackingWhenStartFailsTestCase.java @@ -10,8 +10,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; public class TestChangeTrackingWhenStartFailsTestCase { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestFailingBeforeAllTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestFailingBeforeAllTestCase.java index f5c74a428b92a4..ce3e1e9f0423b9 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestFailingBeforeAllTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestFailingBeforeAllTestCase.java @@ -9,8 +9,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; public class TestFailingBeforeAllTestCase { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestRunnerSmokeTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestRunnerSmokeTestCase.java index 423c9fe8fceb09..f09ec12148800a 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestRunnerSmokeTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestRunnerSmokeTestCase.java @@ -10,10 +10,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; import io.quarkus.vertx.http.deployment.devmode.tests.ClassResult; import io.quarkus.vertx.http.deployment.devmode.tests.SuiteResult; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; import io.restassured.RestAssured; public class TestRunnerSmokeTestCase { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/UnitTestTypeTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/UnitTestTypeTestCase.java index bf2d3946d51f7e..db944cd60ccaae 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/UnitTestTypeTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/UnitTestTypeTestCase.java @@ -9,8 +9,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; public class UnitTestTypeTestCase { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/TestBrokenOnlyTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/TestBrokenOnlyTestCase.java index e6e48c30f25440..411a751b0a6e6b 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/TestBrokenOnlyTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/TestBrokenOnlyTestCase.java @@ -10,9 +10,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; import io.restassured.RestAssured; public class TestBrokenOnlyTestCase { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/ExcludePatternTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/ExcludePatternTestCase.java index cb9aa737d133e3..aa5b9f6d033286 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/ExcludePatternTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/ExcludePatternTestCase.java @@ -10,9 +10,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; import io.quarkus.vertx.http.testrunner.HelloResource; public class ExcludePatternTestCase { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/IncludePatternTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/IncludePatternTestCase.java index 715800e8597a8b..69bcf14d1e857c 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/IncludePatternTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/IncludePatternTestCase.java @@ -10,9 +10,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; import io.quarkus.vertx.http.testrunner.HelloResource; public class IncludePatternTestCase { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java index f90ef041fdbd47..57c14bc6694f16 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java @@ -10,9 +10,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; public class TestParameterizedTestCase { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/ExcludeTagsTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/ExcludeTagsTestCase.java index b263e5890688f1..f3bdea49bd1ae1 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/ExcludeTagsTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/ExcludeTagsTestCase.java @@ -10,9 +10,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; import io.quarkus.vertx.http.testrunner.HelloResource; public class ExcludeTagsTestCase { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/IncludeTagsTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/IncludeTagsTestCase.java index 15b12b553e4968..8d136c596def60 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/IncludeTagsTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/IncludeTagsTestCase.java @@ -10,9 +10,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; import io.quarkus.vertx.http.testrunner.HelloResource; public class IncludeTagsTestCase { diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ContinuousTestWebSocketHandler.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ContinuousTestWebSocketHandler.java index 683ddf8eafc937..34f37b59bf3f65 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ContinuousTestWebSocketHandler.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ContinuousTestWebSocketHandler.java @@ -8,21 +8,21 @@ import org.jboss.logging.Logger; import io.netty.handler.codec.http.HttpHeaderNames; -import io.quarkus.dev.testing.ContinuousTestingWebsocketListener; +import io.quarkus.dev.testing.ContinuousTestingSharedStateManager; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; import io.vertx.core.http.ServerWebSocket; import io.vertx.ext.web.RoutingContext; public class ContinuousTestWebSocketHandler - implements Handler, Consumer { + implements Handler, Consumer { - private static final Logger log = Logger.getLogger(ContinuousTestingWebsocketListener.class); + private static final Logger log = Logger.getLogger(ContinuousTestingSharedStateManager.class); private static final Set sockets = Collections.newSetFromMap(new ConcurrentHashMap<>()); private static volatile String lastMessage; @Override - public void accept(ContinuousTestingWebsocketListener.State state) { + public void accept(ContinuousTestingSharedStateManager.State state) { Json.JsonObjectBuilder response = Json.object(); response.put("running", state.running); response.put("inProgress", state.inProgress); diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleRecorder.java index ec5126f6b59098..8b2e5cb4ee7558 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleRecorder.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleRecorder.java @@ -15,7 +15,7 @@ import org.jboss.logging.Logger; import io.quarkus.dev.console.DevConsoleManager; -import io.quarkus.dev.testing.ContinuousTestingWebsocketListener; +import io.quarkus.dev.testing.ContinuousTestingSharedStateManager; import io.quarkus.runtime.ShutdownContext; import io.quarkus.runtime.annotations.Recorder; import io.vertx.core.Handler; @@ -48,11 +48,12 @@ public Handler devConsoleHandler(String devConsoleFinalDestinati public Handler continousTestHandler(ShutdownContext context) { ContinuousTestWebSocketHandler handler = new ContinuousTestWebSocketHandler(); - ContinuousTestingWebsocketListener.setStateListener(handler); + ContinuousTestingSharedStateManager.addStateListener(handler); context.addShutdownTask(new Runnable() { @Override public void run() { - ContinuousTestingWebsocketListener.setStateListener(null); + ContinuousTestingSharedStateManager.removeStateListener(handler); + ContinuousTestingSharedStateManager.reset(); } }); diff --git a/test-framework/junit5-internal/pom.xml b/test-framework/junit5-internal/pom.xml index 85c157b718a990..5e3194031627f8 100644 --- a/test-framework/junit5-internal/pom.xml +++ b/test-framework/junit5-internal/pom.xml @@ -55,6 +55,10 @@ io.quarkus quarkus-devtools-utilities + + org.awaitility + awaitility + diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java new file mode 100644 index 00000000000000..3fa5c1c3389e88 --- /dev/null +++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java @@ -0,0 +1,185 @@ +package io.quarkus.test; + +import java.util.Arrays; +import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; + +import org.awaitility.Awaitility; +import org.awaitility.core.ConditionTimeoutException; + +import io.quarkus.dev.testing.ContinuousTestingSharedStateManager; + +/** + * Utilities for testing the test runner itself + */ +public class ContinuousTestingTestUtils { + + long runToWaitFor = 1; + + public TestStatus waitForNextCompletion() { + try { + Awaitility.waitAtMost(1, TimeUnit.MINUTES).pollInterval(50, TimeUnit.MILLISECONDS).until(new Callable() { + @Override + public Boolean call() throws Exception { + ContinuousTestingSharedStateManager.State ts = ContinuousTestingSharedStateManager.getLastState(); + if (ts.lastRun > runToWaitFor) { + throw new RuntimeException( + "Waiting for run " + runToWaitFor + " but run " + ts.lastRun + " has already occurred"); + } + boolean runComplete = ts.lastRun == runToWaitFor; + if (runComplete && ts.inProgress) { + //there is a small chance of a race, where changes are picked up twice, due to how filesystems work + //this works around it by waiting for the next run + runToWaitFor = ts.lastRun; + return false; + } else if (runComplete) { + runToWaitFor++; + } + return runComplete; + } + }); + } catch (Exception e) { + ContinuousTestingSharedStateManager.State ts = ContinuousTestingSharedStateManager.getLastState(); + throw new ConditionTimeoutException("Failed to wait for test run " + runToWaitFor + " " + ts); + } + var s = ContinuousTestingSharedStateManager.getLastState(); + return new TestStatus(s.lastRun, s.running ? s.lastRun + 1 : -1, s.run, s.currentPassed, s.currentFailed, + s.currentSkipped, s.passed, s.failed, s.skipped); + } + + public static String appProperties(String... props) { + return "quarkus.test.continuous-testing=enabled\nquarkus.test.display-test-output=true\nquarkus.test.basic-console=true\nquarkus.test.disable-console-input=true\n" + + String.join("\n", Arrays.asList(props)); + } + + public static class TestStatus { + + private long lastRun; + + private long running; + + private long testsRun = -1; + + private long testsPassed = -1; + + private long testsFailed = -1; + + private long testsSkipped = -1; + + private long totalTestsPassed = -1; + + private long totalTestsFailed = -1; + + private long totalTestsSkipped = -1; + + public TestStatus() { + } + + public TestStatus(long lastRun, long running, long testsRun, long testsPassed, long testsFailed, long testsSkipped, + long totalTestsPassed, long totalTestsFailed, long totalTestsSkipped) { + this.lastRun = lastRun; + this.running = running; + this.testsRun = testsRun; + this.testsPassed = testsPassed; + this.testsFailed = testsFailed; + this.testsSkipped = testsSkipped; + this.totalTestsPassed = totalTestsPassed; + this.totalTestsFailed = totalTestsFailed; + this.totalTestsSkipped = totalTestsSkipped; + + } + + public long getLastRun() { + return lastRun; + } + + public TestStatus setLastRun(long lastRun) { + this.lastRun = lastRun; + return this; + } + + public long getRunning() { + return running; + } + + public TestStatus setRunning(long running) { + this.running = running; + return this; + } + + public long getTestsRun() { + return testsRun; + } + + public TestStatus setTestsRun(long testsRun) { + this.testsRun = testsRun; + return this; + } + + public long getTestsPassed() { + return testsPassed; + } + + public TestStatus setTestsPassed(long testsPassed) { + this.testsPassed = testsPassed; + return this; + } + + public long getTestsFailed() { + return testsFailed; + } + + public TestStatus setTestsFailed(long testsFailed) { + this.testsFailed = testsFailed; + return this; + } + + public long getTestsSkipped() { + return testsSkipped; + } + + public TestStatus setTestsSkipped(long testsSkipped) { + this.testsSkipped = testsSkipped; + return this; + } + + public long getTotalTestsPassed() { + return totalTestsPassed; + } + + public TestStatus setTotalTestsPassed(long totalTestsPassed) { + this.totalTestsPassed = totalTestsPassed; + return this; + } + + public long getTotalTestsFailed() { + return totalTestsFailed; + } + + public TestStatus setTotalTestsFailed(long totalTestsFailed) { + this.totalTestsFailed = totalTestsFailed; + return this; + } + + public long getTotalTestsSkipped() { + return totalTestsSkipped; + } + + public TestStatus setTotalTestsSkipped(long totalTestsSkipped) { + this.totalTestsSkipped = totalTestsSkipped; + return this; + } + + @Override + public String toString() { + return "TestStatus{" + + "lastRun=" + lastRun + + ", running=" + running + + ", testsRun=" + testsRun + + ", testsPassed=" + testsPassed + + ", testsFailed=" + testsFailed + + ", testsSkipped=" + testsSkipped + + '}'; + } + } +} From b1d3c9d961334bd88a61ee91eef59305d5ae3960 Mon Sep 17 00:00:00 2001 From: Clement Escoffier Date: Wed, 1 Sep 2021 08:22:36 +0200 Subject: [PATCH 043/138] Update the status of the mutiny, AMQP connector and gRPC extensions to "stable". --- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/grpc/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/grpc/runtime/src/main/resources/META-INF/quarkus-extension.yaml index ba8a04ffba04bc..2a2f8152e8fe75 100644 --- a/extensions/grpc/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/grpc/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -8,7 +8,7 @@ metadata: - "web" - "serialization" - "reactive" - status: "experimental" + status: "stable" codestart: name: "grpc" languages: diff --git a/extensions/mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 658ebabc08beaf..001d82655819ad 100644 --- a/extensions/mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -10,4 +10,4 @@ metadata: - "Reactor" categories: - "reactive" - status: "preview" \ No newline at end of file + status: "stable" \ No newline at end of file diff --git a/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 8558a6b2a48770..977c0d3ae2981b 100644 --- a/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,7 +9,7 @@ metadata: guide: "https://quarkus.io/guides/amqp" categories: - "messaging" - status: "preview" + status: "stable" config: - "mp.messaging." - "quarkus.reactive-messaging." From e9e3d038646fb74395fd276e9d617c224dddbcdc Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Wed, 1 Sep 2021 08:51:49 +0200 Subject: [PATCH 044/138] Dev UI Config screen render config editor based on type (Fix #19636) Signed-off-by:Phillip Kruger --- .../builditem/ConfigDescriptionBuildItem.java | 21 ++- .../steps/ConfigDescriptionBuildStep.java | 141 +++++++++++++++++- .../console/ConfigEditorProcessor.java | 14 +- .../io.quarkus.quarkus-vertx-http/config.html | 67 ++++++++- .../runtime/devmode/ConfigDescription.java | 24 ++- 5 files changed, 253 insertions(+), 14 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigDescriptionBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigDescriptionBuildItem.java index 4f50e314502380..b71457c4730528 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigDescriptionBuildItem.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigDescriptionBuildItem.java @@ -1,5 +1,7 @@ package io.quarkus.deployment.builditem; +import java.util.List; + import io.quarkus.builder.item.MultiBuildItem; /** @@ -12,12 +14,17 @@ public final class ConfigDescriptionBuildItem extends MultiBuildItem implements private final Class type; private final String defaultValue; private final String docs; + private final String valueTypeName; + private final List allowedValues; - public ConfigDescriptionBuildItem(String propertyName, Class type, String defaultValue, String docs) { + public ConfigDescriptionBuildItem(String propertyName, Class type, String defaultValue, String docs, + String valueTypeName, List allowedValues) { this.propertyName = propertyName; this.type = type; this.defaultValue = defaultValue; this.docs = docs; + this.valueTypeName = valueTypeName; + this.allowedValues = allowedValues; } public String getPropertyName() { @@ -36,6 +43,18 @@ public String getDocs() { return docs; } + public String getValueTypeName() { + return valueTypeName; + } + + public List getAllowedValues() { + return allowedValues; + } + + public boolean hasAllowedValues() { + return allowedValues != null && !allowedValues.isEmpty(); + } + @Override public int compareTo(ConfigDescriptionBuildItem o) { return propertyName.compareTo(o.propertyName); diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java index 5cd2005e2b343f..2dea9889d707a3 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java @@ -3,10 +3,17 @@ import java.io.IOException; import java.io.UncheckedIOException; import java.lang.reflect.Field; +import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; +import java.util.Optional; +import java.util.OptionalDouble; +import java.util.OptionalInt; +import java.util.OptionalLong; import java.util.Properties; +import java.util.Set; import java.util.function.Consumer; +import java.util.logging.Level; import org.eclipse.microprofile.config.inject.ConfigProperty; @@ -50,6 +57,9 @@ public void accept(Container node) { final ConfigProperty configProperty = field.getAnnotation(ConfigProperty.class); String defaultDefault; final Class valueClass = field.getType(); + + EffectiveConfigTypeAndValues effectiveConfigTypeAndValues = getTypeName(field); + if (valueClass == boolean.class) { defaultDefault = "false"; } else if (valueClass.isPrimitive() && valueClass != char.class) { @@ -72,9 +82,138 @@ public void accept(Container node) { String javadocKey = field.getDeclaringClass().getName().replace('$', '.') + '.' + field.getName(); ret.add(new ConfigDescriptionBuildItem("quarkus." + node.getPropertyName(), node.findEnclosingClass().getConfigurationClass(), - defVal, javadoc.getProperty(javadocKey))); + defVal, + javadoc.getProperty(javadocKey), + effectiveConfigTypeAndValues.getTypeName(), + effectiveConfigTypeAndValues.getAllowedValues())); } }); } + private EffectiveConfigTypeAndValues getTypeName(Field field) { + final Class valueClass = field.getType(); + return getTypeName(field, valueClass); + } + + private EffectiveConfigTypeAndValues getTypeName(Field field, Class valueClass) { + EffectiveConfigTypeAndValues typeAndValues = new EffectiveConfigTypeAndValues(); + String name = valueClass.getName(); + + // Extract Optionals, Lists and Sets + if ((valueClass.equals(Optional.class) || valueClass.equals(List.class) || valueClass.equals(Set.class))) { + + if (field != null) { + Type genericType = field.getGenericType(); + name = genericType.getTypeName(); + } + + if (name.contains("<") && name.contains(">")) { + name = name.substring(name.lastIndexOf("<") + 1, name.indexOf(">")); + } + + try { + Class c = Class.forName(name); + return getTypeName(null, c); + } catch (ClassNotFoundException ex) { + // Then we use the name as is. + } + } + + // Check other optionals + if (valueClass.equals(OptionalInt.class)) { + name = Integer.class.getName(); + } else if (valueClass.equals(OptionalDouble.class)) { + name = Double.class.getName(); + } else if (valueClass.equals(OptionalLong.class)) { + name = Long.class.getName(); + } + + // Check if this is an enum + if (Enum.class.isAssignableFrom(valueClass)) { + name = Enum.class.getName(); + + Object[] values = valueClass.getEnumConstants(); + for (Object v : values) { + Enum casted = (Enum) valueClass.cast(v); + typeAndValues.addAllowedValue(casted.name()); + } + } + + // Special case for Log level + if (valueClass.isAssignableFrom(Level.class)) { + typeAndValues.addAllowedValue(Level.ALL.getName()); + typeAndValues.addAllowedValue(Level.CONFIG.getName()); + typeAndValues.addAllowedValue(Level.FINE.getName()); + typeAndValues.addAllowedValue(Level.FINER.getName()); + typeAndValues.addAllowedValue(Level.FINEST.getName()); + typeAndValues.addAllowedValue(Level.INFO.getName()); + typeAndValues.addAllowedValue(Level.OFF.getName()); + typeAndValues.addAllowedValue(Level.SEVERE.getName()); + typeAndValues.addAllowedValue(Level.WARNING.getName()); + } + + // Map all primatives + if (name.equals("int")) { + name = Integer.class.getName(); + } else if (name.equals("boolean")) { + name = Boolean.class.getName(); + } else if (name.equals("float")) { + name = Float.class.getName(); + } else if (name.equals("double")) { + name = Double.class.getName(); + } else if (name.equals("long")) { + name = Long.class.getName(); + } else if (name.equals("byte")) { + name = Byte.class.getName(); + } else if (name.equals("short")) { + name = Short.class.getName(); + } else if (name.equals("char")) { + name = Character.class.getName(); + } + + typeAndValues.setTypeName(name); + return typeAndValues; + } + + class EffectiveConfigTypeAndValues { + private String typeName; + private List allowedValues; + + public EffectiveConfigTypeAndValues() { + + } + + public EffectiveConfigTypeAndValues(String typeName) { + this.typeName = typeName; + } + + public EffectiveConfigTypeAndValues(String typeName, List allowedValues) { + this.typeName = typeName; + this.allowedValues = allowedValues; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public List getAllowedValues() { + return allowedValues; + } + + public void setAllowedValues(List allowedValues) { + this.allowedValues = allowedValues; + } + + public void addAllowedValue(String v) { + if (allowedValues == null) { + allowedValues = new ArrayList<>(); + } + allowedValues.add(v); + } + } + } diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java index 1d963b996fd4d1..5f814b22c2eab8 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java @@ -45,14 +45,18 @@ public void config(BuildProducer devCons Optional devServicesLauncherConfig) { List configDescriptions = new ArrayList<>(); for (ConfigDescriptionBuildItem item : configDescriptionBuildItems) { - configDescriptions.add( - new ConfigDescription(item.getPropertyName(), item.getDocs(), item.getDefaultValue(), - isSetByDevServices(devServicesLauncherConfig, item.getPropertyName()))); + new ConfigDescription(item.getPropertyName(), + item.getDocs(), + item.getDefaultValue(), + isSetByDevServices(devServicesLauncherConfig, item.getPropertyName()), + item.getValueTypeName(), + item.getAllowedValues())); } - devConsoleRuntimeTemplateProducer.produce( - new DevConsoleRuntimeTemplateInfoBuildItem("config", new ConfigDescriptionsSupplier(configDescriptions))); + devConsoleRuntimeTemplateProducer.produce(new DevConsoleRuntimeTemplateInfoBuildItem("config", + new ConfigDescriptionsSupplier(configDescriptions))); + devConsoleRuntimeTemplateProducer.produce(new DevConsoleRuntimeTemplateInfoBuildItem("hasDevServices", new HasDevServicesSupplier(devServicesLauncherConfig.isPresent() && devServicesLauncherConfig.get().getConfig() != null diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html index 8b7601c90d7cdd..ca41f9ad994ad1 100644 --- a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html +++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html @@ -69,11 +69,32 @@ hideEmptyTables(); } -function changeInputValue(name){ +function changeSelectValue(element, name){ + var $el = $("select[id='" + name + "']"); + var $tr = $("tr[id='tr-" + name + "']"); + var value = element.options[element.selectedIndex].text; + + postChangeConfigValue(name, value, $el); +} + +function changeCheckboxValue(element, name){ var $el = $("input[id='" + name + "']"); var $tr = $("tr[id='tr-" + name + "']"); + var value = element.checked; + postChangeConfigValue(name, value, $el); +} + +function changeInputValue(name){ + var $el = $("input[id='" + name + "']"); + var $tr = $("tr[id='tr-" + name + "']"); var value = $el.val(); + + postChangeConfigValue(name, value, $el); +} + +function postChangeConfigValue(name, value, $el){ + $el.prop('disabled', true); $.post("", { action: "updateProperty", @@ -90,6 +111,7 @@ hideEmptyTables(); changeBackgroundColor("#ff6366", $el); } + $el.prop('disabled', false); }); } @@ -386,12 +408,45 @@ {#if configsource.key.editable} -

    - -
    - + + {#if item.typeName && item.typeName == "java.lang.Boolean"} +
    +
    + + +
    +
    + {#else if item.typeName && (item.typeName == "java.lang.Integer" || item.typeName == "java.lang.Long")} +
    + +
    + +
    +
    + {#else if item.typeName && (item.typeName == "java.lang.Float" || item.typeName == "java.lang.Double")} +
    + +
    + +
    +
    + {#else if item.typeName && (item.typeName == "java.lang.Enum" || item.typeName == "java.util.logging.Level")} +
    +
    -
    + {#else} +
    + +
    + +
    +
    + {/if} {#else} {item.configValue.value} {/if} diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java index d1baf58b0d3f0b..c0e76b33079870 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java @@ -1,5 +1,7 @@ package io.quarkus.vertx.http.runtime.devmode; +import java.util.List; + import io.smallrye.config.ConfigValue; public class ConfigDescription implements Comparable { @@ -8,16 +10,20 @@ public class ConfigDescription implements Comparable { private String defaultValue; private ConfigValue configValue; private boolean autoFromDevServices = false; + private String typeName; + private List allowedValues; public ConfigDescription() { } public ConfigDescription(final String name, final String description, final String defaultValue, - final boolean autoFromDevServices) { + final boolean autoFromDevServices, String typeName, List allowedValues) { this.name = name; this.description = description; this.defaultValue = defaultValue; this.autoFromDevServices = autoFromDevServices; + this.typeName = typeName; + this.allowedValues = allowedValues; } public ConfigDescription( @@ -71,6 +77,22 @@ public void setAutoFromDevServices(boolean autoFromDevServices) { this.autoFromDevServices = autoFromDevServices; } + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public List getAllowedValues() { + return allowedValues; + } + + public void setAllowedValues(List allowedValues) { + this.allowedValues = allowedValues; + } + @Override public int compareTo(ConfigDescription o) { int ordinal = Integer.compare(o.configValue.getConfigSourceOrdinal(), this.configValue.getConfigSourceOrdinal()); From a77eadb930cb39d3e07a0d009e6a04ba2667246d Mon Sep 17 00:00:00 2001 From: Guillaume Le Floch Date: Tue, 31 Aug 2021 09:18:32 +0200 Subject: [PATCH 045/138] Set default jvm-target in kotlin sample project --- .../multi-module-kotlin-project/web/build.gradle.kts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/web/build.gradle.kts b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/web/build.gradle.kts index dd4627b9f7240f..55afb0a79cdbbd 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/web/build.gradle.kts +++ b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/web/build.gradle.kts @@ -3,6 +3,12 @@ plugins { kotlin("jvm") } +// This is a fix as kotlin 1.5.30 does not support Java 17 yet +if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { + tasks.quarkusDev { + compilerArgs = listOf("-jvm-target", "16") + } +} dependencies { implementation(project(":port")) implementation(project(":domain")) From 03647998696e6a7e202b7e3a07c0ecb2883b5f1e Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Wed, 1 Sep 2021 18:02:27 +1000 Subject: [PATCH 046/138] Make sure KC Dev UI page persists after reload --- .../devservices/keycloak/KeycloakDevServicesProcessor.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java index 1a0658f65fe06e..030b6bf880e97e 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java @@ -93,6 +93,7 @@ public class KeycloakDevServicesProcessor { private static volatile String capturedKeycloakUrl; private static volatile FileTime capturedRealmFileLastModifiedDate; private final IsDockerWorking isDockerWorking = new IsDockerWorking(true); + private static volatile KeycloakDevServicesConfigBuildItem existingDevServiceConfig; @BuildStep(onlyIfNot = IsNormal.class, onlyIf = { IsEnabled.class, GlobalDevServicesConfig.Enabled.class }) public KeycloakDevServicesConfigBuildItem startKeycloakContainer( @@ -121,7 +122,7 @@ public KeycloakDevServicesConfigBuildItem startKeycloakContainer( } } if (!restartRequired) { - return null; + return existingDevServiceConfig; } for (Closeable closeable : closeables) { try { @@ -133,6 +134,7 @@ public KeycloakDevServicesConfigBuildItem startKeycloakContainer( closeables = null; capturedDevServicesConfiguration = null; capturedKeycloakUrl = null; + existingDevServiceConfig = null; } capturedDevServicesConfiguration = currentDevServicesConfiguration; @@ -212,7 +214,8 @@ private KeycloakDevServicesConfigBuildItem prepareConfiguration(boolean createRe configProperties.put(CLIENT_SECRET_CONFIG_KEY, oidcClientSecret); configProperties.put(OIDC_USERS, users); - return new KeycloakDevServicesConfigBuildItem(configProperties); + existingDevServiceConfig = new KeycloakDevServicesConfigBuildItem(configProperties); + return existingDevServiceConfig; } private StartResult startContainer(boolean useSharedContainer) { From 07db37f530aa9450874f2e96b31505ab3e39e622 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Wed, 1 Sep 2021 11:32:03 +0300 Subject: [PATCH 047/138] Fix @NoCache without fields handling in RESTEasy Reactive Fixes: #19822 --- .../test/cache/NoCacheOnMethodsTest.java | 40 +++++++++++++------ .../scanning/CacheControlScanner.java | 10 ++--- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnMethodsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnMethodsTest.java index 00662d7c38287d..1925a3855d8522 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnMethodsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnMethodsTest.java @@ -30,37 +30,53 @@ public JavaArchive get() { }); @Test - public void testWith() { - RestAssured.get("/test/with") + public void testWithFields() { + RestAssured.get("/test/withFields") .then() .statusCode(200) - .body(equalTo("with")) + .body(equalTo("withFields")) .header("Cache-Control", "no-cache=\"f1\", no-cache=\"f2\""); } @Test - public void testWithout() { - RestAssured.get("/test/without") + public void testWithoutFields() { + RestAssured.get("/test/withoutFields") .then() .statusCode(200) - .body(equalTo("without")) + .body(equalTo("withoutFields")) + .header("Cache-Control", "no-cache"); + } + + @Test + public void testWithoutAnnotation() { + RestAssured.get("/test/withoutAnnotation") + .then() + .statusCode(200) + .body(equalTo("withoutAnnotation")) .header("Cache-Control", nullValue()); } @Path("test") public static class ResourceWithNoCache { - @Path("with") + @Path("withFields") @GET @NoCache(fields = { "f1", "f2" }) - public String with() { - return "with"; + public String withFields() { + return "withFields"; + } + + @Path("withoutFields") + @GET + @NoCache + public String withoutFields() { + return "withoutFields"; } - @Path("without") + @Path("withoutAnnotation") @GET - public String without() { - return "without"; + public String withoutAnnotation() { + return "withoutAnnotation"; } } } diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/CacheControlScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/CacheControlScanner.java index 5b5ef467906394..6464523f41e220 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/CacheControlScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/CacheControlScanner.java @@ -61,18 +61,18 @@ private ExtendedCacheControl noCacheToCacheControl(AnnotationInstance noCacheIns if (noCacheInstance == null) { return null; } + ExtendedCacheControl cacheControl = new ExtendedCacheControl(); + cacheControl.setNoCache(true); + cacheControl.setNoTransform(false); AnnotationValue fieldsValue = noCacheInstance.value("fields"); if (fieldsValue != null) { String[] fields = fieldsValue.asStringArray(); if ((fields != null) && (fields.length > 0)) { - ExtendedCacheControl cacheControl = new ExtendedCacheControl(); - cacheControl.setNoCache(true); - cacheControl.setNoTransform(false); cacheControl.getNoCacheFields().addAll(Arrays.asList(fields)); - return cacheControl; + } } - return null; + return cacheControl; } private ExtendedCacheControl cacheToCacheControl(AnnotationInstance cacheInstance) { From 12a882fd3a8ebbe136360d20511037336b585a6e Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Wed, 1 Sep 2021 11:57:07 +0300 Subject: [PATCH 048/138] Mark quarkus-container-image-openshift as stable --- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/container-image/container-image-openshift/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/container-image/container-image-openshift/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 5f6b78609781c9..9c1ee15c7c8bb0 100644 --- a/extensions/container-image/container-image-openshift/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/container-image/container-image-openshift/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -8,4 +8,4 @@ metadata: - "image" categories: - "cloud" - status: "preview" \ No newline at end of file + status: "stable" From dc51118ad3ee36d1e861e6aa283f76bf34c12eb4 Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Wed, 1 Sep 2021 12:32:17 +0200 Subject: [PATCH 049/138] Dev UI Config screen show lock icon for Build Time properties (Fix #19755) Signed-off-by:Phillip Kruger --- .../builditem/ConfigDescriptionBuildItem.java | 9 ++++++++- .../steps/ConfigDescriptionBuildStep.java | 15 +++++++++------ .../devmode/console/ConfigEditorProcessor.java | 3 ++- .../io.quarkus.quarkus-vertx-http/config.html | 8 ++++++++ .../http/runtime/devmode/ConfigDescription.java | 12 +++++++++++- 5 files changed, 38 insertions(+), 9 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigDescriptionBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigDescriptionBuildItem.java index b71457c4730528..ad2059b87c604f 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigDescriptionBuildItem.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigDescriptionBuildItem.java @@ -3,6 +3,7 @@ import java.util.List; import io.quarkus.builder.item.MultiBuildItem; +import io.quarkus.runtime.annotations.ConfigPhase; /** * A build item that is not part of the standard build, but is only used to generate @@ -16,15 +17,17 @@ public final class ConfigDescriptionBuildItem extends MultiBuildItem implements private final String docs; private final String valueTypeName; private final List allowedValues; + private final ConfigPhase configPhase; public ConfigDescriptionBuildItem(String propertyName, Class type, String defaultValue, String docs, - String valueTypeName, List allowedValues) { + String valueTypeName, List allowedValues, ConfigPhase configPhase) { this.propertyName = propertyName; this.type = type; this.defaultValue = defaultValue; this.docs = docs; this.valueTypeName = valueTypeName; this.allowedValues = allowedValues; + this.configPhase = configPhase; } public String getPropertyName() { @@ -51,6 +54,10 @@ public List getAllowedValues() { return allowedValues; } + public ConfigPhase getConfigPhase() { + return configPhase; + } + public boolean hasAllowedValues() { return allowedValues != null && !allowedValues.isEmpty(); } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java index 2dea9889d707a3..a576fc64c7ad55 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java @@ -23,6 +23,7 @@ import io.quarkus.deployment.configuration.matching.ConfigPatternMap; import io.quarkus.deployment.configuration.matching.Container; import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.util.ClassPathUtils; public class ConfigDescriptionBuildStep { @@ -39,15 +40,16 @@ List createConfigDescriptions( } }); List ret = new ArrayList<>(); - processConfig(config.getReadResult().getBuildTimePatternMap(), ret, javadoc); - processConfig(config.getReadResult().getBuildTimeRunTimePatternMap(), ret, javadoc); - processConfig(config.getReadResult().getBootstrapPatternMap(), ret, javadoc); - processConfig(config.getReadResult().getRunTimePatternMap(), ret, javadoc); + processConfig(config.getReadResult().getBuildTimePatternMap(), ret, javadoc, ConfigPhase.BUILD_TIME); + processConfig(config.getReadResult().getBuildTimeRunTimePatternMap(), ret, javadoc, + ConfigPhase.BUILD_AND_RUN_TIME_FIXED); + processConfig(config.getReadResult().getBootstrapPatternMap(), ret, javadoc, ConfigPhase.BOOTSTRAP); + processConfig(config.getReadResult().getRunTimePatternMap(), ret, javadoc, ConfigPhase.RUN_TIME); return ret; } private void processConfig(ConfigPatternMap patterns, List ret, - Properties javadoc) { + Properties javadoc, ConfigPhase configPhase) { patterns.forEach(new Consumer() { @Override @@ -85,7 +87,8 @@ public void accept(Container node) { defVal, javadoc.getProperty(javadocKey), effectiveConfigTypeAndValues.getTypeName(), - effectiveConfigTypeAndValues.getAllowedValues())); + effectiveConfigTypeAndValues.getAllowedValues(), + configPhase)); } }); } diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java index 5f814b22c2eab8..b1cfade99fa138 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java @@ -51,7 +51,8 @@ public void config(BuildProducer devCons item.getDefaultValue(), isSetByDevServices(devServicesLauncherConfig, item.getPropertyName()), item.getValueTypeName(), - item.getAllowedValues())); + item.getAllowedValues(), + item.getConfigPhase().name())); } devConsoleRuntimeTemplateProducer.produce(new DevConsoleRuntimeTemplateInfoBuildItem("config", diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html index ca41f9ad994ad1..5cba1ded572881 100644 --- a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html +++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html @@ -401,10 +401,18 @@ + {#if item.configPhase?? && (item.configPhase == "BUILD_AND_RUN_TIME_FIXED" || item.configPhase == "BUILD_TIME")} + + {#else} + + {/if} + {item.configValue.name} + {#if item.autoFromDevServices} {/if} + {#if configsource.key.editable} diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java index c0e76b33079870..20f3aea287d10a 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java @@ -12,18 +12,20 @@ public class ConfigDescription implements Comparable { private boolean autoFromDevServices = false; private String typeName; private List allowedValues; + private String configPhase; public ConfigDescription() { } public ConfigDescription(final String name, final String description, final String defaultValue, - final boolean autoFromDevServices, String typeName, List allowedValues) { + final boolean autoFromDevServices, String typeName, List allowedValues, String configPhase) { this.name = name; this.description = description; this.defaultValue = defaultValue; this.autoFromDevServices = autoFromDevServices; this.typeName = typeName; this.allowedValues = allowedValues; + this.configPhase = configPhase; } public ConfigDescription( @@ -93,6 +95,14 @@ public void setAllowedValues(List allowedValues) { this.allowedValues = allowedValues; } + public String getConfigPhase() { + return configPhase; + } + + public void setConfigPhase(String configPhase) { + this.configPhase = configPhase; + } + @Override public int compareTo(ConfigDescription o) { int ordinal = Integer.compare(o.configValue.getConfigSourceOrdinal(), this.configValue.getConfigSourceOrdinal()); From 750495329e30681592a2bdc1739fac7c352d8a4e Mon Sep 17 00:00:00 2001 From: Matej Novotny Date: Fri, 27 Sep 2019 10:41:18 +0200 Subject: [PATCH 050/138] Arc - type-level and method-level inheritance tests --- .../MemberLevelInheritanceTest.java | 121 +++++++++++++++ .../inheritance/TypeLevelInheritanceTest.java | 138 ++++++++++++++++++ 2 files changed, 259 insertions(+) create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java new file mode 100644 index 00000000000000..1560a143aa3858 --- /dev/null +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java @@ -0,0 +1,121 @@ +package io.quarkus.arc.test.inheritance; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import javax.annotation.Priority; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.Typed; +import javax.inject.Inject; +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InterceptorBinding; +import javax.interceptor.InvocationContext; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +public class MemberLevelInheritanceTest { + + @RegisterExtension + ArcTestContainer testContainer = new ArcTestContainer(Foo.class, FooExtended.class, DummyBean.class, + MyBinding.class, MyInterceptor.class); + + @Test + public void testMemberLevelInheritance() { + ArcContainer container = Arc.container(); + // IP inheritance + FooExtended fooExtended = container.instance(FooExtended.class).get(); + assertNotNull(fooExtended); + assertNotNull(fooExtended.getBar()); + + // producer inheritance is tested simply by not getting ambiguous dependency while running the test + + // initializer inheritance + assertNotNull(fooExtended.getBeanFromInitMethod()); + + // interceptor binding on a method inheritance + assertEquals(0, MyInterceptor.timesInvoked); + fooExtended.interceptedMethod(); + assertEquals(1, MyInterceptor.timesInvoked); + } + + @ApplicationScoped + static class Foo { + @Inject + DummyBean bar; + + public DummyBean getBar() { + return bar; + } + + @Produces + String string = "42"; + + @Produces + public Integer answerToLifeUniverseAndAll() { + return 42; + } + + DummyBean beanFromInitMethod = null; + + public DummyBean getBeanFromInitMethod() { + return beanFromInitMethod; + } + + @Inject + public void initializerMethod(DummyBean bean) { + System.err.println("Initializer invoked!"); + this.beanFromInitMethod = bean; + } + + @MyBinding + public void interceptedMethod() { + } + } + + @ApplicationScoped + @Typed(FooExtended.class) + static class FooExtended extends Foo { + // does inherit injected field + // does not inherit producers + // does inherit initializer + // does inherit intercepted interceptedMethod + } + + @ApplicationScoped + static class DummyBean { + + } + + @Target({ TYPE, METHOD, FIELD, PARAMETER }) + @Retention(RUNTIME) + @Inherited + @InterceptorBinding + @interface MyBinding { + } + + @MyBinding + @Interceptor + @Priority(1) + static class MyInterceptor { + public static int timesInvoked = 0; + + @AroundInvoke + Object aroundInvoke(InvocationContext ctx) throws Exception { + timesInvoked++; + return ctx.proceed(); + } + } +} diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java new file mode 100644 index 00000000000000..20865635ca6a7b --- /dev/null +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java @@ -0,0 +1,138 @@ +package io.quarkus.arc.test.inheritance; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import javax.annotation.Priority; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.Typed; +import javax.enterprise.util.AnnotationLiteral; +import javax.inject.Qualifier; +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InterceptorBinding; +import javax.interceptor.InvocationContext; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +/** + * Tests type inheritence, e.g. that scopes, stereotypes, bindings and qualifiers are inherited so long as they + * declare {@code @Inherited} + * + * Scope inheritance is tested separately, see ScopeInheritanceTest + */ +public class TypeLevelInheritanceTest { + + @RegisterExtension + public ArcTestContainer container = ArcTestContainer.builder().removeUnusedBeans(false) + .beanClasses(BasicBean.class, SubBean.class, FirstInterceptor.class, + SecondInterceptor.class, MyBinding.class, MyStereotype.class, SecondaryBinding.class, MyQualifier.class) + .build(); + + @Test + public void testTypeInheritance() { + ArcContainer container = Arc.container(); + + assertEquals(0, FirstInterceptor.timesInvoked); + assertEquals(0, SecondInterceptor.timesInvoked); + + BasicBean basicBean = container.instance(BasicBean.class, new MyQualifier.Literal()).get(); + assertNotNull(basicBean); + basicBean.ping(); + assertEquals(1, FirstInterceptor.timesInvoked); + assertEquals(1, SecondInterceptor.timesInvoked); + + SubBean subBean = container.instance(SubBean.class, new MyQualifier.Literal()).get(); + assertNotNull(subBean); + subBean.ping(); + assertEquals(2, FirstInterceptor.timesInvoked); + assertEquals(2, SecondInterceptor.timesInvoked); + } + + @ApplicationScoped + @MyBinding + @MyQualifier + @MyStereotype + static class BasicBean { + public void ping() { + + } + } + + @Typed(SubBean.class) + @ApplicationScoped + static class SubBean extends BasicBean { + + } + + @MyBinding + @Interceptor + @Priority(1) + static class FirstInterceptor { + public static int timesInvoked = 0; + + @AroundInvoke + Object aroundInvoke(InvocationContext ctx) throws Exception { + timesInvoked++; + return ctx.proceed(); + } + } + + @SecondaryBinding + @Interceptor + @Priority(1) + static class SecondInterceptor { + public static int timesInvoked = 0; + + @AroundInvoke + Object aroundInvoke(InvocationContext ctx) throws Exception { + timesInvoked++; + return ctx.proceed(); + } + } + + @Target({ TYPE, METHOD, FIELD, PARAMETER }) + @Retention(RUNTIME) + @Inherited + @InterceptorBinding + @interface MyBinding { + } + + @Stereotype + @Inherited + @SecondaryBinding + @Target({ TYPE, METHOD, FIELD, PARAMETER }) + @Retention(RUNTIME) + @interface MyStereotype { + } + + @Target({ TYPE, METHOD, FIELD, PARAMETER }) + @Retention(RUNTIME) + @Inherited + @InterceptorBinding + @interface SecondaryBinding { + } + + @Inherited + @Qualifier + @Target({ TYPE, METHOD, FIELD, PARAMETER }) + @Retention(RUNTIME) + @interface MyQualifier { + + static class Literal extends AnnotationLiteral implements MyQualifier { + + } + } +} From cdd280a30047631062fe45dd85ce2dc4f5a03b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Wed, 1 Sep 2021 11:56:12 +0200 Subject: [PATCH 051/138] Add missing @ConfigItem annotations --- .../LiquibaseMongodbBuildTimeConfig.java | 4 ++- .../runtime/LiquibaseMongodbConfig.java | 30 ++++++++++++++----- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbBuildTimeConfig.java b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbBuildTimeConfig.java index 9bd5432a0f75e2..8945d1d07b549c 100644 --- a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbBuildTimeConfig.java +++ b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbBuildTimeConfig.java @@ -1,5 +1,6 @@ package io.quarkus.liquibase.runtime; +import io.quarkus.runtime.annotations.ConfigItem; import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; @@ -12,5 +13,6 @@ public class LiquibaseMongodbBuildTimeConfig { /** * The change log file */ - public String changeLog = "db/changeLog.xml"; + @ConfigItem(defaultValue = "db/changeLog.xml") + public String changeLog; } diff --git a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbConfig.java b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbConfig.java index 6cab1009c19d7d..0917e5204285e1 100644 --- a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbConfig.java +++ b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbConfig.java @@ -1,9 +1,11 @@ package io.quarkus.liquibase.runtime; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import io.quarkus.runtime.annotations.ConfigItem; import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; @@ -16,53 +18,67 @@ public class LiquibaseMongodbConfig { /** * The migrate at start flag */ - public boolean migrateAtStart = false; + @ConfigItem + public boolean migrateAtStart; /** * The validate on update flag */ - public boolean validateOnMigrate = true; + @ConfigItem(defaultValue = "true") + public boolean validateOnMigrate; /** * The clean at start flag */ - public boolean cleanAtStart = false; + @ConfigItem + public boolean cleanAtStart; - public Map changeLogParameters = null; + /** + * The parameters to be passed to the changelog. + * Defined as key value pairs. + */ + @ConfigItem + public Map changeLogParameters = new HashMap<>();; /** * The list of contexts */ - public Optional> contexts = null; + @ConfigItem + public Optional> contexts = Optional.empty(); /** * The list of labels */ - public Optional> labels = null; + @ConfigItem + public Optional> labels = Optional.empty(); /** * The default catalog name */ + @ConfigItem public Optional defaultCatalogName = Optional.empty(); /** * The default schema name */ + @ConfigItem public Optional defaultSchemaName = Optional.empty(); /** * The liquibase tables catalog name */ + @ConfigItem public Optional liquibaseCatalogName = Optional.empty(); /** * The liquibase tables schema name */ + @ConfigItem public Optional liquibaseSchemaName = Optional.empty(); /** * The liquibase tables tablespace name */ + @ConfigItem public Optional liquibaseTablespaceName = Optional.empty(); - } From c5b4dc30a2c017c796d9b0ec424aaa7599f0aa52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szynkiewicz?= Date: Wed, 1 Sep 2021 14:44:59 +0200 Subject: [PATCH 052/138] Support config properties in @ClientHeaderParam fixes #19805 --- .../main/asciidoc/rest-client-reactive.adoc | 32 +++++-- .../MicroProfileRestClientEnricher.java | 13 ++- .../ClientHeaderParamFromPropertyTest.java | 84 +++++++++++++++++++ .../client/reactive/runtime/ConfigUtils.java | 41 +++++++++ 4 files changed, 163 insertions(+), 7 deletions(-) create mode 100644 extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java create mode 100644 extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/ConfigUtils.java diff --git a/docs/src/main/asciidoc/rest-client-reactive.adoc b/docs/src/main/asciidoc/rest-client-reactive.adoc index 39b1c338f4e77e..9418f0285aa0e7 100644 --- a/docs/src/main/asciidoc/rest-client-reactive.adoc +++ b/docs/src/main/asciidoc/rest-client-reactive.adoc @@ -541,9 +541,13 @@ This difference comes from the laziness aspect of Mutiny and its subscription pr More details about this can be found in https://smallrye.io/smallrye-mutiny/#_uni_and_multi[the Mutiny documentation]. == Custom headers support -The MicroProfile REST client allows amending request headers by registering a `ClientHeadersFactory` with the `@RegisterClientHeaders` annotation. +There are a few ways in which you can specify custom headers for your REST calls: -Let's see it in action by adding a `@RegisterClientHeaders` annotation pointing to a `RequestUUIDHeaderFactory` class in our `CountriesService` REST interface: +- by registering a `ClientHeadersFactory` with the `@RegisterClientHeaders` annotation +- by specifying the value of the header with `@ClientHeaderParam` +- by specifying the value of the header by `@HeaderParam` + +The code below demonstrates how to use each of this techniques: [source, java] ---- @@ -560,12 +564,15 @@ import java.util.Set; @Path("/v2") @RegisterRestClient -@RegisterClientHeaders(RequestUUIDHeaderFactory.class) +@RegisterClientHeaders(RequestUUIDHeaderFactory.class) // <1> +@ClientHeaderParam(name = "my-header", value = "constant-header-value") // <2> +@ClientHeaderParam(name = "computed-header", value = "{org.acme.rest.client.Util.computeHeader}") // <3> public interface CountriesService { @GET @Path("/name/{name}") - Set getByName(@PathParam("name") String name); + @ClientHeaderParam(name = "header-from-properties", value = "${header.value}") // <4> + Set getByName(@PathParam("name") String name, @HeaderParam("jaxrs-style-header") String headerValue); // <5> @GET @Path("/name/{name}") @@ -573,7 +580,12 @@ public interface CountriesService { } ---- -And the `RequestUUIDHeaderFactory` would look like: +<1> There can be only one `ClientHeadersFactory` per class. With it, you can not only add custom headers, but you can also transform existing ones. See the `RequestUUIDHeaderFactory` class below for an example of the factory. +<2> `@ClientHeaderParam` can be used on the client interface and on methods. It can specify a constant header value... +<3> ... and a name of a method that should compute the value of the header. It can either be a static method or a default method in this interface +<4> ... as well as a value from your application's configuration + +A `ClientHeadersFactory` can look as follows: [source, java] ---- @@ -601,8 +613,16 @@ public class RequestUUIDHeaderFactory implements ClientHeadersFactory { As you see in the example above, you can make your `ClientHeadersFactory` implementation a CDI bean by annotating it with a scope-defining annotation, such as `@Singleton`, `@ApplicationScoped`, etc. +To specify a value for `${header.value}`, simply put the following in your `application.properties`: + +[source,properties] +---- +header.value=value of the header +---- + === Default header factory -You can also use `@RegisterClientHeaders` annotation without any custom factory specified. In that case the `DefaultClientHeadersFactoryImpl` factory will be used and all headers listed in `org.eclipse.microprofile.rest.client.propagateHeaders` configuration property will be amended. Individual header names are comma-separated. +The `@RegisterClientHeaders` annotation can also be used without any custom factory specified. In that case the `DefaultClientHeadersFactoryImpl` factory will be used. +If you make a REST client call from a REST resource, this fatory will propagate all the headers listed in `org.eclipse.microprofile.rest.client.propagateHeaders` configuration property from the resource request to the client request. Individual header names are comma-separated. [source, java] ---- diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java index f5e90dc889c70a..88ef8823de5b07 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java @@ -53,6 +53,7 @@ import io.quarkus.gizmo.TryBlock; import io.quarkus.jaxrs.client.reactive.deployment.JaxrsClientReactiveEnricher; import io.quarkus.rest.client.reactive.HeaderFiller; +import io.quarkus.rest.client.reactive.runtime.ConfigUtils; import io.quarkus.rest.client.reactive.runtime.MicroProfileRestClientRequestFilter; import io.quarkus.rest.client.reactive.runtime.NoOpHeaderFiller; import io.quarkus.runtime.util.HashUtil; @@ -321,9 +322,19 @@ private void addHeaderParam(MethodInfo declaringMethod, MethodCreator fillHeader .trueBranch(); if (values.length > 1 || !(values[0].startsWith("{") && values[0].endsWith("}"))) { + boolean required = annotation.valueWithDefault(index, "required").asBoolean(); ResultHandle headerList = fillHeaders.newInstance(MethodDescriptor.ofConstructor(ArrayList.class)); for (String value : values) { - fillHeaders.invokeInterfaceMethod(LIST_ADD_METHOD, headerList, fillHeaders.load(value)); + if (value.startsWith("${") && value.endsWith("}")) { + ResultHandle headerValueFromConfig = fillHeaders.invokeStaticMethod( + MethodDescriptor.ofMethod(ConfigUtils.class, "getConfigValue", String.class, String.class, + boolean.class), + fillHeaders.load(value), fillHeaders.load(required)); + fillHeaders.ifNotNull(headerValueFromConfig) + .trueBranch().invokeInterfaceMethod(LIST_ADD_METHOD, headerList, headerValueFromConfig); + } else { + fillHeaders.invokeInterfaceMethod(LIST_ADD_METHOD, headerList, fillHeaders.load(value)); + } } fillHeaders.invokeInterfaceMethod(MAP_PUT_METHOD, headerMap, fillHeaders.load(headerName), headerList); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java new file mode 100644 index 00000000000000..6a3035988b1078 --- /dev/null +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java @@ -0,0 +1,84 @@ +package io.quarkus.rest.client.reactive.headers; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.net.URI; + +import javax.enterprise.context.ApplicationScoped; +import javax.ws.rs.GET; +import javax.ws.rs.HeaderParam; +import javax.ws.rs.Path; + +import org.eclipse.microprofile.rest.client.RestClientBuilder; +import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.QuarkusUnitTest; +import io.quarkus.test.common.http.TestHTTPResource; + +public class ClientHeaderParamFromPropertyTest { + private static final String HEADER_VALUE = "oifajrofijaeoir5gjaoasfaxcvcz"; + + @TestHTTPResource + URI baseUri; + + @RegisterExtension + static final QuarkusUnitTest config = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(Client.class) + .addAsResource( + new StringAsset("my.property-value=" + HEADER_VALUE), + "application.properties")); + + @Test + void shouldSetHeaderFromProperties() { + Client client = RestClientBuilder.newBuilder().baseUri(baseUri) + .build(Client.class); + + assertThat(client.getWithHeader()).isEqualTo(HEADER_VALUE); + } + + @Test + void shouldFailOnMissingRequiredHeaderProperty() { + Client client = RestClientBuilder.newBuilder().baseUri(baseUri) + .build(Client.class); + + assertThatThrownBy(client::missingRequiredProperty) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + void shouldSucceedOnMissingNonRequiredHeaderProperty() { + Client client = RestClientBuilder.newBuilder().baseUri(baseUri) + .build(Client.class); + + assertThat(client.missingNonRequiredProperty()).isEqualTo(HEADER_VALUE); + } + + @Path("/") + @ApplicationScoped + public static class Resource { + @GET + public String returnHeaderValue(@HeaderParam("my-header") String header) { + return header; + } + } + + @ClientHeaderParam(name = "my-header", value = "${my.property-value}") + public interface Client { + @GET + String getWithHeader(); + + @GET + @ClientHeaderParam(name = "some-other-header", value = "${non-existent-property}") + String missingRequiredProperty(); + + @GET + @ClientHeaderParam(name = "some-other-header", value = "${non-existent-property}", required = false) + String missingNonRequiredProperty(); + } +} diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/ConfigUtils.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/ConfigUtils.java new file mode 100644 index 00000000000000..f1596ddfb713ff --- /dev/null +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/ConfigUtils.java @@ -0,0 +1,41 @@ +package io.quarkus.rest.client.reactive.runtime; + +import java.util.NoSuchElementException; + +import org.eclipse.microprofile.config.ConfigProvider; +import org.jboss.logging.Logger; + +public class ConfigUtils { + + private static final Logger log = Logger.getLogger(ConfigUtils.class); + + public static String getConfigValue(String configProperty, boolean required) { + String propertyName = stripPrefixAndSuffix(configProperty); + try { + return ConfigProvider.getConfig().getValue(propertyName, String.class); + } catch (NoSuchElementException e) { + String message = "Failed to find value for config property " + configProperty + + " in application configuration. Please provide the value for the property, e.g. by adding " + + propertyName + "= to your application.properties"; + if (required) { + throw new IllegalArgumentException(message, e); + } else { + log.warn(message); + return null; + } + } catch (IllegalArgumentException e) { + String message = "Failed to convert value for property " + configProperty + " to String"; + if (required) { + throw new IllegalArgumentException(message, e); + } else { + log.warn(message); + return null; + } + } + } + + private static String stripPrefixAndSuffix(String configProperty) { + // by now we know that configProperty is of form ${...} + return configProperty.substring(2, configProperty.length() - 1); + } +} From 6675997ad6e6c12a79ba7fe1080bea8963c86b57 Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Wed, 1 Sep 2021 14:58:56 +0200 Subject: [PATCH 053/138] Dev UI Config screen copy-to-profile takes filter into account (Fix #19821) Signed-off-by:Phillip Kruger --- .../console/ConfigEditorProcessor.java | 115 +++++++++++------- .../io.quarkus.quarkus-vertx-http/config.html | 23 +++- 2 files changed, 89 insertions(+), 49 deletions(-) diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java index b1cfade99fa138..a793dc8ab3cd64 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java @@ -7,6 +7,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; @@ -80,22 +81,13 @@ protected void handlePost(RoutingContext event, MultiMap form) throws Exception Map values = Collections.singletonMap(name, value); updateConfig(values); - } else if (action.equals("copyTestDevServices") && devServicesLauncherConfig.isPresent()) { + } else if (action.equals("copyDevServices") && devServicesLauncherConfig.isPresent()) { + String environment = event.request().getFormAttribute("environment"); + String filter = event.request().getParam("filterConfigKeys"); + List configFilter = getConfigFilter(filter); Map autoconfig = devServicesLauncherConfig.get().getConfig(); - autoconfig = autoconfig.entrySet().stream() - .collect(Collectors.toMap( - e -> appendProfile("test", e.getKey()), - Map.Entry::getValue)); - - updateConfig(autoconfig); - } else if (action.equals("copyProdDevServices") && devServicesLauncherConfig.isPresent()) { - Map autoconfig = devServicesLauncherConfig.get().getConfig(); - - autoconfig = autoconfig.entrySet().stream() - .collect(Collectors.toMap( - e -> appendProfile("prod", e.getKey()), - Map.Entry::getValue)); + autoconfig = filterAndApplyProfile(autoconfig, configFilter, environment.toLowerCase()); updateConfig(autoconfig); } else if (action.equals("updateProperties")) { @@ -111,6 +103,37 @@ protected void handlePost(RoutingContext event, MultiMap form) throws Exception })); } + private Map filterAndApplyProfile(Map autoconfig, List configFilter, + String profile) { + return autoconfig.entrySet().stream() + .filter((t) -> { + if (configFilter != null && !configFilter.isEmpty()) { + for (String sw : configFilter) { + if (t.getKey().startsWith(sw)) { + return true; + } + } + } else { + return true; + } + return false; + }) + .collect(Collectors.toMap( + e -> appendProfile(profile, e.getKey()), + Map.Entry::getValue)); + } + + private List getConfigFilter(String filter) { + if (filter != null && !filter.isEmpty()) { + if (filter.contains(",")) { + return Arrays.asList(filter.split(",")); + } else { + return List.of(filter); + } + } + return Collections.EMPTY_LIST; + } + private String appendProfile(String profile, String originalKey) { return String.format("%%%s.%s", profile, originalKey); } @@ -137,45 +160,47 @@ static byte[] getConfig() { } static void updateConfig(Map values) { - try { - Path configPath = getConfigPath(); - String profile = ProfileManager.getActiveProfile(); - List lines = Files.readAllLines(configPath); - for (Map.Entry entry : values.entrySet()) { - String name = entry.getKey(); - String value = entry.getValue(); - name = !profile.equals(DEVELOPMENT.getDefaultProfile()) ? "%" + profile + "." + name : name; - int nameLine = -1; - for (int i = 0, linesSize = lines.size(); i < linesSize; i++) { - final String line = lines.get(i); - if (line.startsWith(name + "=")) { - nameLine = i; - break; + if (values != null && !values.isEmpty()) { + try { + Path configPath = getConfigPath(); + String profile = ProfileManager.getActiveProfile(); + List lines = Files.readAllLines(configPath); + for (Map.Entry entry : values.entrySet()) { + String name = entry.getKey(); + String value = entry.getValue(); + name = !profile.equals(DEVELOPMENT.getDefaultProfile()) ? "%" + profile + "." + name : name; + int nameLine = -1; + for (int i = 0, linesSize = lines.size(); i < linesSize; i++) { + final String line = lines.get(i); + if (line.startsWith(name + "=")) { + nameLine = i; + break; + } } - } - if (nameLine != -1) { - if (value.isEmpty()) { - lines.remove(nameLine); + if (nameLine != -1) { + if (value.isEmpty()) { + lines.remove(nameLine); + } else { + lines.set(nameLine, name + "=" + value); + } } else { - lines.set(nameLine, name + "=" + value); - } - } else { - if (!value.isEmpty()) { - lines.add(name + "=" + value); + if (!value.isEmpty()) { + lines.add(name + "=" + value); + } } } - } - try (BufferedWriter writer = Files.newBufferedWriter(configPath)) { - for (String i : lines) { - writer.write(i); - writer.newLine(); + try (BufferedWriter writer = Files.newBufferedWriter(configPath)) { + for (String i : lines) { + writer.write(i); + writer.newLine(); + } } + preventKill(); + } catch (Throwable t) { + throw new RuntimeException(t); } - preventKill(); - } catch (Throwable t) { - throw new RuntimeException(t); } } diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html index 5cba1ded572881..43419922e74892 100644 --- a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html +++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html @@ -190,10 +190,11 @@ } function copyDevServices(environment){ - var action = "copy" + environment + "DevServices"; $.post("", { - action: action + action: "copyDevServices", + environment: environment, + filter: configfilter }, function(data, status){ if(status === "success"){ @@ -302,9 +303,22 @@ }); $('#configFilterModal').modal('hide'); + + showHideDevServicesButton(); + hideEmptyTables(); } +function showHideDevServicesButton(){ + // Check if there is any dev services visible on the page + var numberOfMagicConfig = $('.fa-magic:visible').length; + if(numberOfMagicConfig === 0){ + $('.devservices').hide(); + }else { + $('.devservices').show(); + } +} + function hideEmptyTables(){ $('.filterableTable').filter(function(index){ @@ -328,6 +342,7 @@ $(this).parent().show(); }); clearFilterInput(); + showHideDevServicesButton(); } {/script} @@ -358,7 +373,7 @@
    {#if info:hasDevServices} -
    +
    @@ -491,7 +506,7 @@
    • {#if info:hasDevServices} -
  • +
  • From 689367823028d8433d2a205d3aad871b13eb3808 Mon Sep 17 00:00:00 2001 From: Guillaume Le Floch Date: Wed, 1 Sep 2021 15:28:25 +0200 Subject: [PATCH 054/138] Remove hard coded kotlin version in Gradle tests --- integration-tests/gradle/pom.xml | 10 +++++----- .../basic-kotlin-application-project/gradle.properties | 2 +- .../resources/bean-in-testsources-project/build.gradle | 4 ++-- .../bean-in-testsources-project/gradle.properties | 1 + .../bean-in-testsources-project/settings.gradle | 4 +++- .../main/resources/kotlin-grpc-project/build.gradle | 4 ++-- .../resources/kotlin-grpc-project/gradle.properties | 1 + .../main/resources/kotlin-grpc-project/settings.gradle | 4 +++- .../multi-module-kotlin-project/gradle.properties | 2 +- .../main/resources/multi-source-project/build.gradle | 4 ++-- .../resources/multi-source-project/gradle.properties | 1 + .../resources/multi-source-project/settings.gradle | 4 +++- 12 files changed, 25 insertions(+), 16 deletions(-) diff --git a/integration-tests/gradle/pom.xml b/integration-tests/gradle/pom.xml index 04ef293f49b86f..d9301122053a24 100644 --- a/integration-tests/gradle/pom.xml +++ b/integration-tests/gradle/pom.xml @@ -184,12 +184,12 @@ - - - src/test/resources + + + src/main/resources true - - + + org.apache.maven.plugins diff --git a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties index 15d78eaf882e51..41c5c0fe733b9f 100644 --- a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties +++ b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties @@ -1,4 +1,4 @@ -kotlinVersion=1.5.30 +kotlinVersion=${kotlin.version} quarkusPlatformArtifactId=quarkus-bom quarkusPlatformGroupId=io.quarkus diff --git a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle index d67f9aaa686262..28f0d81161779a 100644 --- a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle +++ b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle @@ -1,8 +1,8 @@ plugins { id 'java' id 'io.quarkus' - id 'org.jetbrains.kotlin.jvm' version "1.5.30" - id "org.jetbrains.kotlin.plugin.allopen" version "1.5.30" + id 'org.jetbrains.kotlin.jvm' + id 'org.jetbrains.kotlin.plugin.allopen' } repositories { diff --git a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/gradle.properties b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/gradle.properties index ec2b6ef199c2ca..1fde479f847f83 100644 --- a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/gradle.properties +++ b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/gradle.properties @@ -1,2 +1,3 @@ +kotlinVersion=${kotlin.version} quarkusPlatformArtifactId=quarkus-bom quarkusPlatformGroupId=io.quarkus diff --git a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/settings.gradle b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/settings.gradle index 2342a44865b5cd..7034c8acb938b6 100644 --- a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/settings.gradle +++ b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/settings.gradle @@ -11,7 +11,9 @@ pluginManagement { } } plugins { - id 'io.quarkus' version "${quarkusPluginVersion}" + id 'io.quarkus' version "${quarkusPluginVersion}" + id 'org.jetbrains.kotlin.jvm' version "${kotlinVersion}" + id 'org.jetbrains.kotlin.plugin.allopen' version "${kotlinVersion}" } } rootProject.name='code-with-quarkus' \ No newline at end of file diff --git a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle index fed218e5f7b90c..2ab309ef84913d 100644 --- a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle +++ b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version "1.5.30" - id "org.jetbrains.kotlin.plugin.allopen" version "1.5.30" + id 'org.jetbrains.kotlin.jvm' + id 'org.jetbrains.kotlin.plugin.allopen' id 'io.quarkus' } diff --git a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/gradle.properties b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/gradle.properties index 8f063b7d88ba4a..f4494d9c018570 100644 --- a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/gradle.properties +++ b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/gradle.properties @@ -1,2 +1,3 @@ +kotlinVersion=${kotlin.version} quarkusPlatformArtifactId=quarkus-bom quarkusPlatformGroupId=io.quarkus \ No newline at end of file diff --git a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/settings.gradle b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/settings.gradle index 9fb4b0f54c909f..4f8ea526e9125a 100644 --- a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/settings.gradle +++ b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/settings.gradle @@ -12,7 +12,9 @@ pluginManagement { } } plugins { - id 'io.quarkus' version "${quarkusPluginVersion}" + id 'io.quarkus' version "${quarkusPluginVersion}" + id 'org.jetbrains.kotlin.jvm' version "${kotlinVersion}" + id 'org.jetbrains.kotlin.plugin.allopen' version "${kotlinVersion}" } } rootProject.name='code-with-quarkus' \ No newline at end of file diff --git a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/gradle.properties b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/gradle.properties index 663c1b3b7991ed..b8ff81712a4976 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/gradle.properties +++ b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/gradle.properties @@ -3,5 +3,5 @@ quarkusPlatformArtifactId=quarkus-bom quarkusPlatformGroupId=io.quarkus -kotlinVersion=1.5.30 +kotlinVersion=${kotlin.version} diff --git a/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle b/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle index d7466be3bc153f..349362885e842f 100644 --- a/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle +++ b/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.jetbrains.kotlin.jvm' version "1.5.30" - id "org.jetbrains.kotlin.plugin.allopen" version "1.5.30" + id 'org.jetbrains.kotlin.jvm' + id 'org.jetbrains.kotlin.plugin.allopen' id 'io.quarkus' } diff --git a/integration-tests/gradle/src/main/resources/multi-source-project/gradle.properties b/integration-tests/gradle/src/main/resources/multi-source-project/gradle.properties index 8f063b7d88ba4a..f4494d9c018570 100644 --- a/integration-tests/gradle/src/main/resources/multi-source-project/gradle.properties +++ b/integration-tests/gradle/src/main/resources/multi-source-project/gradle.properties @@ -1,2 +1,3 @@ +kotlinVersion=${kotlin.version} quarkusPlatformArtifactId=quarkus-bom quarkusPlatformGroupId=io.quarkus \ No newline at end of file diff --git a/integration-tests/gradle/src/main/resources/multi-source-project/settings.gradle b/integration-tests/gradle/src/main/resources/multi-source-project/settings.gradle index 9fb4b0f54c909f..4f8ea526e9125a 100644 --- a/integration-tests/gradle/src/main/resources/multi-source-project/settings.gradle +++ b/integration-tests/gradle/src/main/resources/multi-source-project/settings.gradle @@ -12,7 +12,9 @@ pluginManagement { } } plugins { - id 'io.quarkus' version "${quarkusPluginVersion}" + id 'io.quarkus' version "${quarkusPluginVersion}" + id 'org.jetbrains.kotlin.jvm' version "${kotlinVersion}" + id 'org.jetbrains.kotlin.plugin.allopen' version "${kotlinVersion}" } } rootProject.name='code-with-quarkus' \ No newline at end of file From a5424aea5f96e6aa5d27eb51750f4efc11597861 Mon Sep 17 00:00:00 2001 From: Ladislav Thon Date: Tue, 24 Aug 2021 15:51:38 +0200 Subject: [PATCH 055/138] Simplify logging using static invocations and bytecode transformation Also update Jandex to 2.4.0.Final and Jandex Maven plugin to 1.2.0. --- bom/application/pom.xml | 7 +- build-parent/pom.xml | 2 +- core/deployment/pom.xml | 4 + .../BytecodeTransformerBuildItem.java | 14 + .../deployment/index/IndexWrapper.java | 16 + .../logging/LoggingWithPanacheProcessor.java | 198 ++ .../steps/ClassTransformingBuildStep.java | 12 +- .../src/main/java/io/quarkus/logging/Log.java | 2310 +++++++++++++++++ .../java/io/quarkus/logging/GenerateLog.java | 72 + .../logging/LoggingApiCompletenessTest.java | 73 + docs/src/main/asciidoc/logging.adoc | 30 +- independent-projects/arc/pom.xml | 2 +- .../quarkus/arc/processor/BeanArchives.java | 16 + .../resteasy-reactive/pom.xml | 2 +- independent-projects/tools/pom.xml | 2 +- integration-tests/logging-panache/pom.xml | 60 + .../quarkus/logging/GenerateAllLogUsages.java | 62 + .../io/quarkus/logging/GeneratedBean.java | 219 ++ .../java/io/quarkus/logging/LoggingBean.java | 41 + .../io/quarkus/logging/LoggingEndpoint.java | 13 + .../LoggingWithPanacheDevModeTest.java | 47 + .../LoggingWithPanacheGeneratedTest.java | 24 + .../logging/LoggingWithPanacheTest.java | 53 + .../logging/NoStackTraceTestException.java | 8 + integration-tests/pom.xml | 1 + .../io/quarkus/test/QuarkusDevModeTest.java | 4 + 26 files changed, 3282 insertions(+), 10 deletions(-) create mode 100644 core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingWithPanacheProcessor.java create mode 100644 core/runtime/src/main/java/io/quarkus/logging/Log.java create mode 100644 core/runtime/src/test/java/io/quarkus/logging/GenerateLog.java create mode 100644 core/runtime/src/test/java/io/quarkus/logging/LoggingApiCompletenessTest.java create mode 100644 integration-tests/logging-panache/pom.xml create mode 100644 integration-tests/logging-panache/src/test/java/io/quarkus/logging/GenerateAllLogUsages.java create mode 100644 integration-tests/logging-panache/src/test/java/io/quarkus/logging/GeneratedBean.java create mode 100644 integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingBean.java create mode 100644 integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEndpoint.java create mode 100644 integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheDevModeTest.java create mode 100644 integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheGeneratedTest.java create mode 100644 integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java create mode 100644 integration-tests/logging-panache/src/test/java/io/quarkus/logging/NoStackTraceTestException.java diff --git a/bom/application/pom.xml b/bom/application/pom.xml index a23b245708ee09..57504808a73275 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -17,7 +17,7 @@ 1.69 1.0.2.1 1.0.12.2 - 2.3.1.Final + 2.4.0.Final 4.7.0.Final 0.33.0 1.0.0 @@ -4365,6 +4365,11 @@ asm-analysis ${asm.version} + + org.ow2.asm + asm-commons + ${asm.version} + org.slf4j slf4j-api diff --git a/build-parent/pom.xml b/build-parent/pom.xml index e7c6e7f70fe40c..605cba756dbd33 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -34,7 +34,7 @@ ${version.surefire.plugin} - 1.1.1 + 1.2.0 2.0.2 1.3.3 - 2.3.1.Final + 2.4.0.Final 5.7.2 3.8.1 3.20.2 diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java index 3ea6daa02c1d29..6e7299cef1daa8 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java @@ -32,6 +32,7 @@ import org.jboss.jandex.Index; import org.jboss.jandex.IndexView; import org.jboss.jandex.Indexer; +import org.jboss.jandex.ModuleInfo; import org.jboss.jandex.Type; import org.jboss.logging.Logger; @@ -177,6 +178,21 @@ public Collection getAnnotationsWithRepeatable(DotName annot return this.index.getAnnotationsWithRepeatable(annotationName, index); } + @Override + public Collection getKnownModules() { + return this.index.getKnownModules(); + } + + @Override + public ModuleInfo getModuleByName(DotName moduleName) { + return this.index.getModuleByName(moduleName); + } + + @Override + public Collection getKnownUsers(DotName className) { + return this.index.getKnownUsers(className); + } + private void getAllKnownSubClasses(DotName className, Set allKnown, Set processedClasses) { final Set subClassesToProcess = new HashSet(); subClassesToProcess.add(className); diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml index f43d16df34780d..97550a20502e96 100644 --- a/independent-projects/resteasy-reactive/pom.xml +++ b/independent-projects/resteasy-reactive/pom.xml @@ -37,7 +37,7 @@ 11 2.0.2 - 2.3.1.Final + 2.4.0.Final 5.7.2 3.8.1 3.20.2 diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml index 5b5fc826e20ef2..69b9bf3c9181ff 100644 --- a/independent-projects/tools/pom.xml +++ b/independent-projects/tools/pom.xml @@ -54,7 +54,7 @@ 18 2.11.0 1.6.0 - 1.1.1 + 1.2.0 artifact-api diff --git a/integration-tests/logging-panache/pom.xml b/integration-tests/logging-panache/pom.xml new file mode 100644 index 00000000000000..e15484e26d3e57 --- /dev/null +++ b/integration-tests/logging-panache/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + + + quarkus-integration-tests-parent + io.quarkus + 999-SNAPSHOT + + + quarkus-integration-test-logging-panache + + Quarkus - Integration Tests - Logging with Panache + + + + io.quarkus + quarkus-arc-deployment + test + + + io.quarkus + quarkus-resteasy + test + + + + io.quarkus + quarkus-junit5-internal + test + + + io.rest-assured + rest-assured + test + + + org.assertj + assertj-core + test + + + + + io.quarkus + quarkus-resteasy-deployment + ${project.version} + pom + test + + + * + * + + + + + diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/GenerateAllLogUsages.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/GenerateAllLogUsages.java new file mode 100644 index 00000000000000..4341ee3c653dab --- /dev/null +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/GenerateAllLogUsages.java @@ -0,0 +1,62 @@ +package io.quarkus.logging; + +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Parameter; +import java.util.Arrays; +import java.util.Comparator; + +import org.jboss.logging.Logger; + +public class GenerateAllLogUsages { + public static void main(String[] args) { + println("package io.quarkus.logging;"); + println(""); + println("// generated by GenerateAllLogUsages, don't update manually"); + println("public class GeneratedBean {"); + println(" public void testLogging() {"); + Arrays.stream(Log.class.getDeclaredMethods()) + .filter(method -> Modifier.isPublic(method.getModifiers())) + .sorted(Comparator.comparing(Method::getName).thenComparingInt(Method::getParameterCount)) + .forEach(method -> { + Parameter[] parameters = method.getParameters(); + String[] arguments = new String[method.getParameterCount()]; + for (int i = 0; i < parameters.length; i++) { + Parameter parameter = parameters[i]; + String argument; + if (parameter.getType() == Object.class && "message".equals(parameter.getName())) { + argument = "\"foobar\""; + } else if (parameter.getType() == Object.class + && (parameter.getName().startsWith("param") || parameter.getName().startsWith("arg"))) { + argument = "new Object()"; + } else if (parameter.getType() == Object[].class && "params".equals(parameter.getName())) { + argument = "new Object[] {}"; + } else if (parameter.getType() == String.class && "loggerFqcn".equals(parameter.getName())) { + argument = "\"io.quarkus.logging.GeneratedBean\""; + } else if (parameter.getType() == String.class && "format".equals(parameter.getName())) { + argument = "\"foobar\""; + } else if (parameter.getType() == int.class) { + argument = "13"; + } else if (parameter.getType() == long.class) { + argument = "42L"; + } else if (parameter.getType() == Throwable.class) { + argument = "new NoStackTraceTestException()"; + } else if (parameter.getType() == Logger.Level.class) { + argument = "org.jboss.logging.Logger.Level.INFO"; + } else { + throw new RuntimeException("Couldn't generate argument value for parameter " + i + " of type " + + method.getParameterTypes()[i] + ": " + method); + } + arguments[i] = argument; + } + + println(" Log." + method.getName() + "(" + String.join(", ", arguments) + ");"); + }); + println(" }"); + println("}"); + } + + private static void println(String string) { + System.out.println(string); + } +} diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/GeneratedBean.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/GeneratedBean.java new file mode 100644 index 00000000000000..7dea885e5c4c9a --- /dev/null +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/GeneratedBean.java @@ -0,0 +1,219 @@ +package io.quarkus.logging; + +// generated by GenerateAllLogUsages, don't update manually +public class GeneratedBean { + public void testLogging() { + Log.debug("foobar"); + Log.debug("foobar", new NoStackTraceTestException()); + Log.debug("io.quarkus.logging.GeneratedBean", "foobar", new NoStackTraceTestException()); + Log.debug("io.quarkus.logging.GeneratedBean", "foobar", new Object[] {}, new NoStackTraceTestException()); + Log.debugf("foobar", new Object[] {}); + Log.debugf("foobar", new Object()); + Log.debugf("foobar", 13); + Log.debugf("foobar", 42L); + Log.debugf("foobar", 13, new Object()); + Log.debugf("foobar", 13, 13); + Log.debugf(new NoStackTraceTestException(), "foobar", 13); + Log.debugf(new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.debugf("foobar", new Object(), new Object()); + Log.debugf(new NoStackTraceTestException(), "foobar", new Object()); + Log.debugf(new NoStackTraceTestException(), "foobar", 42L); + Log.debugf("foobar", 42L, new Object()); + Log.debugf("foobar", 42L, 42L); + Log.debugf(new NoStackTraceTestException(), "foobar", 42L, new Object()); + Log.debugf(new NoStackTraceTestException(), "foobar", 42L, 42L); + Log.debugf("foobar", 13, 13, new Object()); + Log.debugf("foobar", 13, 13, 13); + Log.debugf(new NoStackTraceTestException(), "foobar", 13, new Object()); + Log.debugf(new NoStackTraceTestException(), "foobar", 13, 13); + Log.debugf("foobar", 13, new Object(), new Object()); + Log.debugf("foobar", new Object(), new Object(), new Object()); + Log.debugf(new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.debugf("foobar", 42L, 42L, 42L); + Log.debugf("foobar", 42L, 42L, new Object()); + Log.debugf("foobar", 42L, new Object(), new Object()); + Log.debugf(new NoStackTraceTestException(), "foobar", 42L, 42L, 42L); + Log.debugf(new NoStackTraceTestException(), "foobar", 42L, 42L, new Object()); + Log.debugf(new NoStackTraceTestException(), "foobar", 42L, new Object(), new Object()); + Log.debugf(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object()); + Log.debugf(new NoStackTraceTestException(), "foobar", 13, new Object(), new Object()); + Log.debugf(new NoStackTraceTestException(), "foobar", 13, 13, new Object()); + Log.debugf(new NoStackTraceTestException(), "foobar", 13, 13, 13); + Log.debugv("foobar", new Object[] {}); + Log.debugv("foobar", new Object()); + Log.debugv(new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.debugv("foobar", new Object(), new Object()); + Log.debugv(new NoStackTraceTestException(), "foobar", new Object()); + Log.debugv("foobar", new Object(), new Object(), new Object()); + Log.debugv(new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.debugv(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object()); + Log.error("foobar"); + Log.error("foobar", new NoStackTraceTestException()); + Log.error("io.quarkus.logging.GeneratedBean", "foobar", new NoStackTraceTestException()); + Log.error("io.quarkus.logging.GeneratedBean", "foobar", new Object[] {}, new NoStackTraceTestException()); + Log.errorf("foobar", new Object[] {}); + Log.errorf("foobar", new Object()); + Log.errorf("foobar", new Object(), new Object()); + Log.errorf(new NoStackTraceTestException(), "foobar", new Object()); + Log.errorf(new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.errorf(new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.errorf("foobar", new Object(), new Object(), new Object()); + Log.errorf(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object()); + Log.errorv("foobar", new Object[] {}); + Log.errorv("foobar", new Object()); + Log.errorv(new NoStackTraceTestException(), "foobar", new Object()); + Log.errorv("foobar", new Object(), new Object()); + Log.errorv(new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.errorv(new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.errorv("foobar", new Object(), new Object(), new Object()); + Log.errorv(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object()); + Log.fatal("foobar"); + Log.fatal("foobar", new NoStackTraceTestException()); + Log.fatal("io.quarkus.logging.GeneratedBean", "foobar", new NoStackTraceTestException()); + Log.fatal("io.quarkus.logging.GeneratedBean", "foobar", new Object[] {}, new NoStackTraceTestException()); + Log.fatalf("foobar", new Object()); + Log.fatalf("foobar", new Object[] {}); + Log.fatalf(new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.fatalf(new NoStackTraceTestException(), "foobar", new Object()); + Log.fatalf("foobar", new Object(), new Object()); + Log.fatalf("foobar", new Object(), new Object(), new Object()); + Log.fatalf(new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.fatalf(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object()); + Log.fatalv("foobar", new Object[] {}); + Log.fatalv("foobar", new Object()); + Log.fatalv(new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.fatalv(new NoStackTraceTestException(), "foobar", new Object()); + Log.fatalv("foobar", new Object(), new Object()); + Log.fatalv(new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.fatalv("foobar", new Object(), new Object(), new Object()); + Log.fatalv(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object()); + Log.info("foobar"); + Log.info("foobar", new NoStackTraceTestException()); + Log.info("io.quarkus.logging.GeneratedBean", "foobar", new NoStackTraceTestException()); + Log.info("io.quarkus.logging.GeneratedBean", "foobar", new Object[] {}, new NoStackTraceTestException()); + Log.infof("foobar", new Object[] {}); + Log.infof("foobar", new Object()); + Log.infof(new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.infof(new NoStackTraceTestException(), "foobar", new Object()); + Log.infof("foobar", new Object(), new Object()); + Log.infof(new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.infof("foobar", new Object(), new Object(), new Object()); + Log.infof(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object()); + Log.infov("foobar", new Object[] {}); + Log.infov("foobar", new Object()); + Log.infov(new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.infov(new NoStackTraceTestException(), "foobar", new Object()); + Log.infov("foobar", new Object(), new Object()); + Log.infov("foobar", new Object(), new Object(), new Object()); + Log.infov(new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.infov(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object()); + Log.isDebugEnabled(); + Log.isEnabled(org.jboss.logging.Logger.Level.INFO); + Log.isInfoEnabled(); + Log.isTraceEnabled(); + Log.log(org.jboss.logging.Logger.Level.INFO, "foobar"); + Log.log(org.jboss.logging.Logger.Level.INFO, "foobar", new NoStackTraceTestException()); + Log.log(org.jboss.logging.Logger.Level.INFO, "io.quarkus.logging.GeneratedBean", "foobar", + new NoStackTraceTestException()); + Log.log("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, "foobar", new Object[] {}, + new NoStackTraceTestException()); + Log.logf(org.jboss.logging.Logger.Level.INFO, "foobar", new Object()); + Log.logf(org.jboss.logging.Logger.Level.INFO, "foobar", new Object[] {}); + Log.logf(org.jboss.logging.Logger.Level.INFO, "foobar", new Object(), new Object()); + Log.logf(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.logf(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object()); + Log.logf(org.jboss.logging.Logger.Level.INFO, "foobar", new Object(), new Object(), new Object()); + Log.logf("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), + "foobar", new Object()); + Log.logf("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), + "foobar", new Object[] {}); + Log.logf(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.logf("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), + "foobar", new Object(), new Object()); + Log.logf(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object(), new Object(), + new Object()); + Log.logf("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), + "foobar", new Object(), new Object(), new Object()); + Log.logv(org.jboss.logging.Logger.Level.INFO, "foobar", new Object()); + Log.logv(org.jboss.logging.Logger.Level.INFO, "foobar", new Object[] {}); + Log.logv(org.jboss.logging.Logger.Level.INFO, "foobar", new Object(), new Object()); + Log.logv(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object()); + Log.logv(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.logv(org.jboss.logging.Logger.Level.INFO, "foobar", new Object(), new Object(), new Object()); + Log.logv("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), + "foobar", new Object[] {}); + Log.logv("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), + "foobar", new Object()); + Log.logv(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.logv(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object(), new Object(), + new Object()); + Log.logv("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), + "foobar", new Object(), new Object()); + Log.logv("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), + "foobar", new Object(), new Object(), new Object()); + Log.trace("foobar"); + Log.trace("foobar", new NoStackTraceTestException()); + Log.trace("io.quarkus.logging.GeneratedBean", "foobar", new NoStackTraceTestException()); + Log.trace("io.quarkus.logging.GeneratedBean", "foobar", new Object[] {}, new NoStackTraceTestException()); + Log.tracef("foobar", new Object[] {}); + Log.tracef("foobar", new Object()); + Log.tracef("foobar", 13); + Log.tracef("foobar", 42L); + Log.tracef(new NoStackTraceTestException(), "foobar", 42L); + Log.tracef("foobar", new Object(), new Object()); + Log.tracef(new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.tracef(new NoStackTraceTestException(), "foobar", new Object()); + Log.tracef("foobar", 13, new Object()); + Log.tracef(new NoStackTraceTestException(), "foobar", 13); + Log.tracef("foobar", 13, 13); + Log.tracef("foobar", 42L, 42L); + Log.tracef("foobar", 42L, new Object()); + Log.tracef(new NoStackTraceTestException(), "foobar", 42L, new Object()); + Log.tracef(new NoStackTraceTestException(), "foobar", 42L, 42L); + Log.tracef("foobar", 42L, new Object(), new Object()); + Log.tracef("foobar", new Object(), new Object(), new Object()); + Log.tracef(new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.tracef("foobar", 13, new Object(), new Object()); + Log.tracef(new NoStackTraceTestException(), "foobar", 13, 13); + Log.tracef("foobar", 13, 13, 13); + Log.tracef("foobar", 13, 13, new Object()); + Log.tracef("foobar", 42L, 42L, 42L); + Log.tracef("foobar", 42L, 42L, new Object()); + Log.tracef(new NoStackTraceTestException(), "foobar", 13, new Object()); + Log.tracef(new NoStackTraceTestException(), "foobar", 42L, 42L, 42L); + Log.tracef(new NoStackTraceTestException(), "foobar", 42L, 42L, new Object()); + Log.tracef(new NoStackTraceTestException(), "foobar", 42L, new Object(), new Object()); + Log.tracef(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object()); + Log.tracef(new NoStackTraceTestException(), "foobar", 13, new Object(), new Object()); + Log.tracef(new NoStackTraceTestException(), "foobar", 13, 13, 13); + Log.tracef(new NoStackTraceTestException(), "foobar", 13, 13, new Object()); + Log.tracev("foobar", new Object()); + Log.tracev("foobar", new Object[] {}); + Log.tracev("foobar", new Object(), new Object()); + Log.tracev(new NoStackTraceTestException(), "foobar", new Object()); + Log.tracev(new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.tracev(new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.tracev("foobar", new Object(), new Object(), new Object()); + Log.tracev(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object()); + Log.warn("foobar"); + Log.warn("foobar", new NoStackTraceTestException()); + Log.warn("io.quarkus.logging.GeneratedBean", "foobar", new NoStackTraceTestException()); + Log.warn("io.quarkus.logging.GeneratedBean", "foobar", new Object[] {}, new NoStackTraceTestException()); + Log.warnf("foobar", new Object[] {}); + Log.warnf("foobar", new Object()); + Log.warnf(new NoStackTraceTestException(), "foobar", new Object()); + Log.warnf("foobar", new Object(), new Object()); + Log.warnf(new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.warnf(new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.warnf("foobar", new Object(), new Object(), new Object()); + Log.warnf(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object()); + Log.warnv("foobar", new Object[] {}); + Log.warnv("foobar", new Object()); + Log.warnv("foobar", new Object(), new Object()); + Log.warnv(new NoStackTraceTestException(), "foobar", new Object[] {}); + Log.warnv(new NoStackTraceTestException(), "foobar", new Object()); + Log.warnv(new NoStackTraceTestException(), "foobar", new Object(), new Object()); + Log.warnv("foobar", new Object(), new Object(), new Object()); + Log.warnv(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object()); + } +} diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingBean.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingBean.java new file mode 100644 index 00000000000000..d137a47414e51f --- /dev/null +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingBean.java @@ -0,0 +1,41 @@ +package io.quarkus.logging; + +import javax.annotation.PostConstruct; +import javax.inject.Singleton; + +@Singleton +public class LoggingBean { + // not final to prevent constant inlining + private static String msg = "Heya!"; + + static { + Log.info(msg); + } + + @PostConstruct + public void setup() { + Log.tracef("%s created", LoggingBean.class.getSimpleName()); + } + + public void doSomething() { + if (Log.isDebugEnabled()) { + Log.debug("starting massive computation"); + } + + Log.debugf("one: %d", 42); + Log.tracef("two: %d | %d", 42, 13); + Log.debugf("three: %d | %d | %d", 42, 13, 1); + + Log.debugv("one: {0}", "foo"); + Log.infov("two: {0} | {1}", "foo", "bar"); + Log.warnv("three: {0} | {1} | {2}", "foo", "bar", "baz"); + Log.errorv("four: {0} | {1} | {2} | {3}", "foo", "bar", "baz", "quux"); + + Exception error = new NoStackTraceTestException(); + + Log.warnv(error, "{0} | {1} | {2} | {3}", "foo", "bar", "baz", "quux"); + + Log.error("Hello Error", error); + } + +} diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEndpoint.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEndpoint.java new file mode 100644 index 00000000000000..8fe56a9d405dca --- /dev/null +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEndpoint.java @@ -0,0 +1,13 @@ +package io.quarkus.logging; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; + +@Path("/logging") +public class LoggingEndpoint { + @GET + public String hello() { + Log.info("hello"); + return "hello"; + } +} diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheDevModeTest.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheDevModeTest.java new file mode 100644 index 00000000000000..c382c1c259d288 --- /dev/null +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheDevModeTest.java @@ -0,0 +1,47 @@ +package io.quarkus.logging; + +import static io.restassured.RestAssured.when; +import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.Matchers.is; + +import java.util.List; +import java.util.logging.Formatter; +import java.util.stream.Collectors; + +import org.jboss.logmanager.formatters.PatternFormatter; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.QuarkusDevModeTest; + +public class LoggingWithPanacheDevModeTest { + @RegisterExtension + static final QuarkusDevModeTest TEST = new QuarkusDevModeTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(LoggingEndpoint.class)) + .setLogRecordPredicate(record -> "io.quarkus.logging.LoggingEndpoint".equals(record.getLoggerName())); + + @Test + public void testRepositoryIsReloaded() { + Formatter formatter = new PatternFormatter("[%p] %m"); + + { + when().get("/logging").then().body(is("hello")); + + List lines = TEST.getLogRecords().stream().map(formatter::format).collect(Collectors.toList()); + assertThat(lines).containsExactly("[INFO] hello"); + TEST.clearLogRecords(); + } + + TEST.modifySourceFile("LoggingEndpoint.java", s -> s.replace("hello", "hi")); + + { + when().get("/logging").then().body(is("hi")); + + List lines = TEST.getLogRecords().stream().map(formatter::format).collect(Collectors.toList()); + assertThat(lines).containsExactly("[INFO] hi"); + TEST.clearLogRecords(); + } + } +} diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheGeneratedTest.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheGeneratedTest.java new file mode 100644 index 00000000000000..044257cf5fabcc --- /dev/null +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheGeneratedTest.java @@ -0,0 +1,24 @@ +package io.quarkus.logging; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.QuarkusUnitTest; + +public class LoggingWithPanacheGeneratedTest { + @RegisterExtension + static final QuarkusUnitTest test = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .addClasses(GeneratedBean.class, NoStackTraceTestException.class)) + .overrideConfigKey("quarkus.log.category.\"io.quarkus.logging\".min-level", "TRACE") + .overrideConfigKey("quarkus.log.category.\"io.quarkus.logging\".level", "TRACE"); + + @Test + public void test() { + new GeneratedBean().testLogging(); + // no asserts, this test only verifies that all Log methods can be successfully invoked + // (in other words, that the bytecode transformation isn't horribly broken) + } +} diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java new file mode 100644 index 00000000000000..52b8d433aa00c9 --- /dev/null +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java @@ -0,0 +1,53 @@ +package io.quarkus.logging; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.List; +import java.util.logging.Formatter; +import java.util.stream.Collectors; + +import javax.inject.Inject; + +import org.jboss.logmanager.formatters.PatternFormatter; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.QuarkusUnitTest; + +public class LoggingWithPanacheTest { + @RegisterExtension + static final QuarkusUnitTest test = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .addClasses(LoggingBean.class, NoStackTraceTestException.class)) + .overrideConfigKey("quarkus.log.category.\"io.quarkus.logging\".min-level", "TRACE") + .overrideConfigKey("quarkus.log.category.\"io.quarkus.logging\".level", "TRACE") + .setLogRecordPredicate(record -> "io.quarkus.logging.LoggingBean".equals(record.getLoggerName())) + .assertLogRecords(records -> { + Formatter formatter = new PatternFormatter("[%p] %m"); + List lines = records.stream().map(formatter::format).map(String::trim).collect(Collectors.toList()); + + assertThat(lines).containsExactly( + "[INFO] Heya!", + "[TRACE] LoggingBean created", + "[DEBUG] starting massive computation", + "[DEBUG] one: 42", + "[TRACE] two: 42 | 13", + "[DEBUG] three: 42 | 13 | 1", + "[DEBUG] one: foo", + "[INFO] two: foo | bar", + "[WARN] three: foo | bar | baz", + "[ERROR] four: foo | bar | baz | quux", + "[WARN] foo | bar | baz | quux: io.quarkus.logging.NoStackTraceTestException", + "[ERROR] Hello Error: io.quarkus.logging.NoStackTraceTestException"); + }); + + @Inject + LoggingBean bean; + + @Test + public void test() { + bean.doSomething(); + } +} diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/NoStackTraceTestException.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/NoStackTraceTestException.java new file mode 100644 index 00000000000000..9a3cf887ea1e9d --- /dev/null +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/NoStackTraceTestException.java @@ -0,0 +1,8 @@ +package io.quarkus.logging; + +public class NoStackTraceTestException extends RuntimeException { + @Override + public synchronized Throwable fillInStackTrace() { + return this; + } +} diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index fb683ab4e17823..c7cadd1fe67ba0 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -273,6 +273,7 @@ native-config-profile logging-min-level-unset logging-min-level-set + logging-panache redis-devservices diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java index d7c8ddabf9f882..b038d6f9b9c1cd 100644 --- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java +++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java @@ -159,6 +159,10 @@ public List getLogRecords() { return inMemoryLogHandler.records; } + public void clearLogRecords() { + inMemoryLogHandler.clearRecords(); + } + public QuarkusDevModeTest setBuildSystemProperty(String name, String value) { buildSystemProperties.put(name, value); return this; From bac9ee06145d3b1595f1a38eddfcb465820015a1 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Wed, 1 Sep 2021 11:31:09 -0300 Subject: [PATCH 056/138] Marking Amazon extensions as stable --- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/extensions/amazon-alexa/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-alexa/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 94df9bef06f780..609bf3df1dd9c3 100644 --- a/extensions/amazon-alexa/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-alexa/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -8,4 +8,4 @@ metadata: categories: - "cloud" guide: "https://quarkus.io/guides/amazon-lambda" - status: "preview" + status: "stable" diff --git a/extensions/amazon-lambda-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 3ee6b0b861cd66..295b2b80f286c1 100644 --- a/extensions/amazon-lambda-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-lambda-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -11,4 +11,4 @@ metadata: categories: - "cloud" guide: "https://quarkus.io/guides/amazon-lambda-http" - status: "preview" + status: "stable" diff --git a/extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 8636a6f8832a44..992fa650deacb1 100644 --- a/extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -11,6 +11,6 @@ metadata: categories: - "cloud" guide: "https://quarkus.io/guides/amazon-lambda-http" - status: "preview" + status: "stable" config: - "quarkus.lambda-http." diff --git a/extensions/amazon-lambda-xray/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda-xray/runtime/src/main/resources/META-INF/quarkus-extension.yaml index b68cb8deb0e6ad..64721449014f47 100644 --- a/extensions/amazon-lambda-xray/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-lambda-xray/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -10,4 +10,4 @@ metadata: guide: "https://quarkus.io/guides/amazon-lambda#tracing-with-aws-xray-and-graalvm" categories: - "cloud" - status: "preview" \ No newline at end of file + status: "stable" \ No newline at end of file diff --git a/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml index c19be1cae40cb5..495288d1d6b539 100644 --- a/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -8,7 +8,7 @@ metadata: categories: - "cloud" guide: "https://quarkus.io/guides/amazon-lambda" - status: "preview" + status: "stable" codestart: name: "amazon-lambda" kind: "example" diff --git a/extensions/amazon-services/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 4ea5a1d78f630b..86c58a06796c58 100644 --- a/extensions/amazon-services/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -8,5 +8,5 @@ metadata: - "amazon" categories: - "data" - status: "preview" + status: "stable" unlisted: true \ No newline at end of file diff --git a/extensions/amazon-services/dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml index ace051cb576d94..597bec9e4fb7bc 100644 --- a/extensions/amazon-services/dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -10,6 +10,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-dynamodb" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.dynamodb." diff --git a/extensions/amazon-services/iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 5eb16f520dd059..0046f605a490ea 100644 --- a/extensions/amazon-services/iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-iam" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.iam." diff --git a/extensions/amazon-services/kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml index c7cb65aa89ff8a..e6bc35fc57f554 100644 --- a/extensions/amazon-services/kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-kms" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.kms." diff --git a/extensions/amazon-services/s3/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/s3/runtime/src/main/resources/META-INF/quarkus-extension.yaml index ed8bc6d64adc54..cfff54043b1190 100644 --- a/extensions/amazon-services/s3/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/s3/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-s3" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.s3." diff --git a/extensions/amazon-services/ses/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/ses/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 7133851af1215a..7b8c825793fe74 100644 --- a/extensions/amazon-services/ses/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/ses/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-ses" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.ses." diff --git a/extensions/amazon-services/sns/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/sns/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 87cab1d1233cfe..5df4b079013f87 100644 --- a/extensions/amazon-services/sns/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/sns/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-sns" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.sns." diff --git a/extensions/amazon-services/sqs/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/sqs/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 58366e56f9dc92..35623c807f85bb 100644 --- a/extensions/amazon-services/sqs/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/sqs/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-sqs" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.sqs." diff --git a/extensions/amazon-services/ssm/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/ssm/runtime/src/main/resources/META-INF/quarkus-extension.yaml index b3024a2dfb0878..ec7c7fbba307c1 100644 --- a/extensions/amazon-services/ssm/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/ssm/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-ssm" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.ssm." From 12ca7ebfbf4d170f6775447cb2658db39c7c10f1 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Wed, 1 Sep 2021 15:14:01 +0300 Subject: [PATCH 057/138] Provide actionable error message when RESTEasy Reactive can't pick Provider constructor Relates to: #19750 Co-authored-by: George Gastaldi --- .../common/runtime/ArcBeanFactory.java | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcBeanFactory.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcBeanFactory.java index 0808558c0ca57b..c44b8bb45458c4 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcBeanFactory.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcBeanFactory.java @@ -22,17 +22,28 @@ public String toString() { @Override public BeanInstance createInstance() { - BeanContainer.Instance instance = factory.create(); - return new BeanInstance() { - @Override - public T getInstance() { - return instance.get(); + BeanContainer.Instance instance; + try { + instance = factory.create(); + return new BeanInstance() { + @Override + public T getInstance() { + return instance.get(); + } + + @Override + public void close() { + instance.close(); + } + }; + } catch (Exception e) { + if (factory.getClass().getName().contains("DefaultInstanceFactory")) { + throw new IllegalArgumentException( + "Unable to create class '" + targetClassName + + "'. To fix the problem, make sure this class is a CDI bean.", + e); } - - @Override - public void close() { - instance.close(); - } - }; + throw e; + } } } From 55c8f016384ffaf348154498393c98793b5e972c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szynkiewicz?= Date: Wed, 1 Sep 2021 12:56:32 +0200 Subject: [PATCH 058/138] Rest Client Reactive: Multipart file name set to actual filename for path and file fixes #19805 --- .../JaxrsClientReactiveProcessor.java | 20 +++-- .../MultipartPopulatorGenerator.java | 3 +- .../reactive/MultipartFilenameTest.java | 80 +++++++++++++++++++ 3 files changed, 94 insertions(+), 9 deletions(-) create mode 100644 extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultipartFilenameTest.java diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java index 815441cbad7502..b3335b157c0c41 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java @@ -146,6 +146,9 @@ public class JaxrsClientReactiveProcessor { String.class, Object.class); private static final MethodDescriptor MULTIVALUED_MAP_ADD = MethodDescriptor.ofMethod(MultivaluedMap.class, "add", void.class, Object.class, Object.class); + private static final MethodDescriptor PATH_GET_FILENAME = MethodDescriptor.ofMethod(Path.class, "getFileName", + Path.class); + private static final MethodDescriptor OBJECT_TO_STRING = MethodDescriptor.ofMethod(Object.class, "toString", String.class); static final DotName CONTINUATION = DotName.createSimple("kotlin.coroutines.Continuation"); private static final DotName UNI_KT = DotName.createSimple("io.smallrye.mutiny.coroutines.UniKt"); @@ -989,7 +992,7 @@ private ResultHandle createMultipartForm(MethodCreator methodCreator, ResultHand formClass.name() + "." + field.name()); } ResultHandle filePath = methodCreator.invokeVirtualMethod( - MethodDescriptor.ofMethod(File.class, "getPath", String.class), fieldValue); + MethodDescriptor.ofMethod(File.class, "toPath", Path.class), fieldValue); addFile(methodCreator, multipartForm, formParamName, partType, filePath); } else if (is(PATH, fieldClass, index)) { // and so is path @@ -998,9 +1001,7 @@ private ResultHandle createMultipartForm(MethodCreator methodCreator, ResultHand "No @PartType annotation found on multipart form field of type Path: " + formClass.name() + "." + field.name()); } - ResultHandle filePath = methodCreator.invokeInterfaceMethod( - MethodDescriptor.ofMethod(Path.class, "toString", String.class), fieldValue); - addFile(methodCreator, multipartForm, formParamName, partType, filePath); + addFile(methodCreator, multipartForm, formParamName, partType, fieldValue); } else if (is(BUFFER, fieldClass, index)) { // and buffer addBuffer(methodCreator, multipartForm, formParamName, partType, fieldValue, field); @@ -1047,6 +1048,9 @@ private ResultHandle createMultipartForm(MethodCreator methodCreator, ResultHand */ private void addFile(MethodCreator methodCreator, AssignableResultHandle multipartForm, String formParamName, String partType, ResultHandle filePath) { + ResultHandle fileNamePath = methodCreator.invokeInterfaceMethod(PATH_GET_FILENAME, filePath); + ResultHandle fileName = methodCreator.invokeVirtualMethod(OBJECT_TO_STRING, fileNamePath); + ResultHandle pathString = methodCreator.invokeVirtualMethod(OBJECT_TO_STRING, filePath); if (partType.equalsIgnoreCase(MediaType.APPLICATION_OCTET_STREAM)) { methodCreator.assign(multipartForm, // MultipartForm#binaryFileUpload(String name, String filename, String pathname, String mediaType); @@ -1055,8 +1059,8 @@ private void addFile(MethodCreator methodCreator, AssignableResultHandle multipa MethodDescriptor.ofMethod(MultipartForm.class, "binaryFileUpload", MultipartForm.class, String.class, String.class, String.class, String.class), - multipartForm, methodCreator.load(formParamName), methodCreator.load(formParamName), - filePath, methodCreator.load(partType))); + multipartForm, methodCreator.load(formParamName), fileName, + pathString, methodCreator.load(partType))); } else { methodCreator.assign(multipartForm, // MultipartForm#textFileUpload(String name, String filename, String pathname, String mediaType);; @@ -1065,8 +1069,8 @@ private void addFile(MethodCreator methodCreator, AssignableResultHandle multipa MethodDescriptor.ofMethod(MultipartForm.class, "textFileUpload", MultipartForm.class, String.class, String.class, String.class, String.class), - multipartForm, methodCreator.load(formParamName), methodCreator.load(formParamName), - filePath, methodCreator.load(partType))); + multipartForm, methodCreator.load(formParamName), fileName, + pathString, methodCreator.load(partType))); } } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java index e02091633f9024..b9353e698a05e9 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java @@ -189,7 +189,8 @@ private MultipartPopulatorGenerator() { */ static String generate(ClassInfo multipartClassInfo, ClassOutput classOutput, IndexView index) { if (!multipartClassInfo.hasNoArgsConstructor()) { - throw new IllegalArgumentException("Classes annotated with '@MultipartForm' must contain a no-args constructor"); + throw new IllegalArgumentException("Classes annotated with '@MultipartForm' must contain a no-args constructor. " + + "The constructor is missing on " + multipartClassInfo.name()); } String multipartClassName = multipartClassInfo.name().toString(); diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultipartFilenameTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultipartFilenameTest.java new file mode 100644 index 00000000000000..89ca96c51be375 --- /dev/null +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultipartFilenameTest.java @@ -0,0 +1,80 @@ +package io.quarkus.rest.client.reactive; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.io.File; +import java.io.IOException; +import java.net.URI; + +import javax.enterprise.context.ApplicationScoped; +import javax.ws.rs.Consumes; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.core.MediaType; + +import org.eclipse.microprofile.rest.client.RestClientBuilder; +import org.jboss.resteasy.reactive.MultipartForm; +import org.jboss.resteasy.reactive.PartType; +import org.jboss.resteasy.reactive.multipart.FileUpload; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.QuarkusUnitTest; +import io.quarkus.test.common.http.TestHTTPResource; + +public class MultipartFilenameTest { + + @TestHTTPResource + URI baseUri; + + @RegisterExtension + static final QuarkusUnitTest TEST = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .addClasses(Resource.class, FormData.class, Client.class, ClientForm.class)) + .withConfigurationResource("dependent-test-application.properties"); + + @Test + void shouldPassOriginalFileName() throws IOException { + Client client = RestClientBuilder.newBuilder().baseUri(baseUri).build(Client.class); + + File file = File.createTempFile("MultipartTest", ".txt"); + file.deleteOnExit(); + + ClientForm form = new ClientForm(); + form.file = file; + assertThat(client.postMultipart(form)).isEqualTo(file.getName()); + } + + @Path("/multipart") + @ApplicationScoped + public static class Resource { + @POST + @Consumes(MediaType.MULTIPART_FORM_DATA) + public String upload(@MultipartForm FormData form) { + return form.myFile.fileName(); + } + } + + public static class FormData { + @FormParam("myFile") + public FileUpload myFile; + + } + + @Path("/multipart") + public interface Client { + @POST + @Consumes(MediaType.MULTIPART_FORM_DATA) + String postMultipart(@MultipartForm ClientForm clientForm); + + } + + public static class ClientForm { + @FormParam("myFile") + @PartType(MediaType.APPLICATION_OCTET_STREAM) + public File file; + } +} From ee298ecdfdd258b6af47fe2b8daa0d3f602031c1 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Wed, 1 Sep 2021 19:35:22 +0300 Subject: [PATCH 059/138] Don't fail Hibernate Validator when no RESTEasy Reactive request is in flight Relates to: #19834 --- ...ResteasyReactiveContextLocaleResolver.java | 7 +- .../server/injection/ContextProducers.java | 6 +- .../pom.xml | 182 ++++++++++++++++++ .../HibernateValidatorTestResource.java | 167 ++++++++++++++++ ...ValidatorTestResourceGenericInterface.java | 9 + ...bernateValidatorTestResourceInterface.java | 22 +++ .../validator/custom/MyCustomConstraint.java | 31 +++ .../validator/custom/MyOtherBean.java | 19 ++ .../HibernateValidatorFunctionalityTest.java | 31 +++ integration-tests/pom.xml | 1 + 10 files changed, 473 insertions(+), 2 deletions(-) create mode 100644 integration-tests/hibernate-validator-resteasy-reactive/pom.xml create mode 100644 integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java create mode 100644 integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java create mode 100644 integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java create mode 100644 integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java create mode 100644 integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyOtherBean.java create mode 100644 integration-tests/hibernate-validator-resteasy-reactive/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveContextLocaleResolver.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveContextLocaleResolver.java index 38366401d34e95..9f4023f7186993 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveContextLocaleResolver.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveContextLocaleResolver.java @@ -18,6 +18,11 @@ public ResteasyReactiveContextLocaleResolver(HttpHeaders headers) { @Override protected HttpHeaders getHeaders() { - return headers; + try { + headers.getLength(); // this forces the creation of the actual object which will fail if there is no request in flight + return headers; + } catch (IllegalStateException e) { + return null; + } } } diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java index 06318c42c1c2d0..74c67f38224201 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java @@ -133,6 +133,10 @@ SecurityContext securityContext() { } private ResteasyReactiveRequestContext getContext() { - return CurrentRequestManager.get(); + ResteasyReactiveRequestContext context = CurrentRequestManager.get(); + if (context == null) { + throw new IllegalStateException("No RESTEasy Reactive request in progress"); + } + return context; } } diff --git a/integration-tests/hibernate-validator-resteasy-reactive/pom.xml b/integration-tests/hibernate-validator-resteasy-reactive/pom.xml new file mode 100644 index 00000000000000..9862dac97f3d36 --- /dev/null +++ b/integration-tests/hibernate-validator-resteasy-reactive/pom.xml @@ -0,0 +1,182 @@ + + + + quarkus-integration-tests-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-integration-test-hibernate-validator-resteasy-reactive + Quarkus - Integration Tests - Hibernate Validator + Module that contains Hibernate Validator/Bean Validation related tests using RESTEasy Reactive + + + + io.quarkus + quarkus-resteasy-reactive-jsonb + + + io.quarkus + quarkus-hibernate-validator + + + io.quarkus + quarkus-arc + + + + + io.quarkus + quarkus-hibernate-orm + + + io.quarkus + quarkus-jdbc-h2 + + + + + io.quarkus + quarkus-junit5 + test + + + io.rest-assured + rest-assured + test + + + io.quarkus + quarkus-test-h2 + test + + + + io.quarkus + quarkus-arc-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-hibernate-orm-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-hibernate-validator-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-jdbc-h2-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-resteasy-reactive-jsonb-deployment + ${project.version} + pom + test + + + * + * + + + + + + + + + src/main/resources + true + + + + + io.quarkus + quarkus-maven-plugin + + + + build + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + en + + + + + + + + + native-image + + + native + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + en + + + + + + + + + diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java new file mode 100644 index 00000000000000..cc7f0929c2e147 --- /dev/null +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java @@ -0,0 +1,167 @@ +package io.quarkus.it.hibernate.validator; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import javax.enterprise.event.Observes; +import javax.inject.Inject; +import javax.validation.ConstraintViolation; +import javax.validation.Valid; +import javax.validation.Validator; +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.Email; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +import org.hibernate.validator.constraints.Length; + +import io.quarkus.it.hibernate.validator.custom.MyOtherBean; +import io.quarkus.runtime.StartupEvent; + +@Path("/hibernate-validator/test") +public class HibernateValidatorTestResource { + + @Inject + Validator validator; + + public void testValidationOutsideOfResteasyContext(@Observes StartupEvent startupEvent) { + validator.validate(new MyOtherBean(null)); + } + + @GET + @Path("/basic-features") + @Produces(MediaType.TEXT_PLAIN) + public String testBasicFeatures() { + ResultBuilder result = new ResultBuilder(); + + Map> invalidCategorizedEmails = new HashMap<>(); + invalidCategorizedEmails.put("a", Collections.singletonList("b")); + + result.append(formatViolations(validator.validate(new MyBean( + "Bill Jones", + "b", + Collections.singletonList("c"), + -4d, + invalidCategorizedEmails)))); + + Map> validCategorizedEmails = new HashMap<>(); + validCategorizedEmails.put("Professional", Collections.singletonList("bill.jones@example.com")); + + result.append(formatViolations(validator.validate(new MyBean( + "Bill Jones", + "bill.jones@example.com", + Collections.singletonList("biji@example.com"), + 5d, + validCategorizedEmails)))); + + return result.build(); + } + + private String formatViolations(Set> violations) { + if (violations.isEmpty()) { + return "passed"; + } + + return "failed: " + violations.stream() + .map(v -> v.getPropertyPath().toString() + " (" + v.getMessage() + ")") + .sorted() + .collect(Collectors.joining(", ")); + } + + public static class MyBean { + + private String name; + + @Email + private String email; + + private List<@Email String> additionalEmails; + + @DecimalMin("0") + private Double score; + + private Map<@Length(min = 3) String, List<@Email String>> categorizedEmails; + + @Valid + private NestedBeanWithoutConstraints nestedBeanWithoutConstraints; + + public MyBean(String name, String email, List additionalEmails, Double score, + Map> categorizedEmails) { + this.name = name; + this.email = email; + this.additionalEmails = additionalEmails; + this.score = score; + this.categorizedEmails = categorizedEmails; + this.nestedBeanWithoutConstraints = new NestedBeanWithoutConstraints(); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public List getAdditionalEmails() { + return additionalEmails; + } + + public void setAdditionalEmails(List additionalEmails) { + this.additionalEmails = additionalEmails; + } + + public Double getScore() { + return score; + } + + public void setScore(Double score) { + this.score = score; + } + + public Map> getCategorizedEmails() { + return categorizedEmails; + } + + public void setCategorizedEmails(Map> categorizedEmails) { + this.categorizedEmails = categorizedEmails; + } + } + + private static class ResultBuilder { + + private StringBuilder builder = new StringBuilder(); + + public ResultBuilder append(String element) { + if (builder.length() > 0) { + builder.append("\n"); + } + builder.append(element); + return this; + } + + public String build() { + return builder.toString(); + } + } + + private static class NestedBeanWithoutConstraints { + + @SuppressWarnings("unused") + private String property; + } +} diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java new file mode 100644 index 00000000000000..d2dfd4aa2222f5 --- /dev/null +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java @@ -0,0 +1,9 @@ +package io.quarkus.it.hibernate.validator; + +import javax.validation.constraints.Digits; + +public interface HibernateValidatorTestResourceGenericInterface { + + T testRestEndpointGenericMethodValidation(@Digits(integer = 5, fraction = 0) T id); + +} diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java new file mode 100644 index 00000000000000..fe76470c7c2521 --- /dev/null +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java @@ -0,0 +1,22 @@ +package io.quarkus.it.hibernate.validator; + +import javax.validation.constraints.Digits; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +public interface HibernateValidatorTestResourceInterface { + + @GET + @Path("/rest-end-point-interface-validation/{id}/") + @Produces(MediaType.TEXT_PLAIN) + public String testRestEndPointInterfaceValidation(@Digits(integer = 5, fraction = 0) @PathParam("id") String id); + + @GET + @Path("/rest-end-point-interface-validation-annotation-on-impl-method/{id}/") + @Produces(MediaType.TEXT_PLAIN) + public String testRestEndPointInterfaceValidationWithAnnotationOnImplMethod( + @Digits(integer = 5, fraction = 0) @PathParam("id") String id); +} diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java new file mode 100644 index 00000000000000..ad412dea04eb52 --- /dev/null +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java @@ -0,0 +1,31 @@ +package io.quarkus.it.hibernate.validator.custom; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import javax.validation.Constraint; +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; +import javax.validation.Payload; + +@Target({ ElementType.TYPE_USE, ElementType.FIELD }) +@Retention(RetentionPolicy.RUNTIME) +@Constraint(validatedBy = MyCustomConstraint.Validator.class) +public @interface MyCustomConstraint { + + String message() default "{MyCustomConstraint.message}"; + + Class[] groups() default {}; + + Class[] payload() default {}; + + class Validator implements ConstraintValidator { + + @Override + public boolean isValid(MyOtherBean value, ConstraintValidatorContext context) { + return value.getName() != null; + } + } +} diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyOtherBean.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyOtherBean.java new file mode 100644 index 00000000000000..4961a6d0103b0b --- /dev/null +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyOtherBean.java @@ -0,0 +1,19 @@ +package io.quarkus.it.hibernate.validator.custom; + +@MyCustomConstraint +public class MyOtherBean { + + private String name; + + public MyOtherBean(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java b/integration-tests/hibernate-validator-resteasy-reactive/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java new file mode 100644 index 00000000000000..433213be9fad86 --- /dev/null +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java @@ -0,0 +1,31 @@ +package io.quarkus.it.hibernate.validator; + +import static org.hamcrest.Matchers.is; + +import org.junit.jupiter.api.Test; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.h2.H2DatabaseTestResource; +import io.quarkus.test.junit.QuarkusTest; +import io.restassured.RestAssured; + +@QuarkusTest +@QuarkusTestResource(H2DatabaseTestResource.class) +public class HibernateValidatorFunctionalityTest { + + @Test + public void testBasicFeatures() throws Exception { + StringBuilder expected = new StringBuilder(); + expected.append("failed: additionalEmails[0]. (must be a well-formed email address)").append(", ") + .append("categorizedEmails[a]. (length must be between 3 and 2147483647)").append(", ") + .append("categorizedEmails[a].[0]. (must be a well-formed email address)").append(", ") + .append("email (must be a well-formed email address)").append(", ") + .append("score (must be greater than or equal to 0)").append("\n"); + expected.append("passed"); + + RestAssured.when() + .get("/hibernate-validator/test/basic-features") + .then() + .body(is(expected.toString())); + } +} diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index fb683ab4e17823..e3252c5b1a3b56 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -123,6 +123,7 @@ class-transformer shared-library hibernate-validator + hibernate-validator-resteasy-reactive common-jpa-entities infinispan-client devtools From c83c608d31c719968549162bb3ba81fbbf8f126f Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Wed, 1 Sep 2021 18:45:20 +0200 Subject: [PATCH 060/138] Dev UI Test result screen make sure dark background use light test (Fix #19374) Signed-off-by:Phillip Kruger --- .../io.quarkus.quarkus-vertx-http/tests.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/tests.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/tests.html index f5e8c77ca9141b..bf9981b60745ff 100644 --- a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/tests.html +++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/tests.html @@ -87,7 +87,7 @@

    -
    +
    {#for throwable in r.problems} 
    {throwable.message}
    @@ -100,7 +100,7 @@
    {#if !r.logOutput.empty}
    -
    +
    {#for log in r.logOutput} {log.raw}
    @@ -124,7 +124,7 @@
    {#if !r.logOutput.empty}
    -
    +
    {#for log in r.logOutput} {log.raw}
    @@ -149,7 +149,7 @@
    {#if !r.logOutput.empty}
    -
    +
    {#for log in r.logOutput} {log.raw}
    @@ -191,7 +191,7 @@

    -
    +
    {#for log in r.logOutput} {log.raw}
    @@ -214,7 +214,7 @@

    -
    +
    {#for log in r.logOutput} {log.raw}
    @@ -256,7 +256,7 @@

    -
    +
    {#for log in r.logOutput} {log.raw}
    From c85d8f1ab3e4980eb7be5d86491b46b71c59945d Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Mon, 12 Jul 2021 10:06:04 -0400 Subject: [PATCH 061/138] aws testing endpoint aws test event server hot replacement lambda hot replacement lambda cleanup hot replacement lambda cleanup 2 lambda http finish add gson to benchmarks do not enable mock lambda if LambdaClint final dev mode touches lambda lambda native testing comment comment finish it process resources fix banned dependency fix banned dependency fixes debug lambda test mode finish mock event initial process res logging remove lambda fixes lambda continuous testing test --- bom/application/pom.xml | 15 ++ .../amazon-lambda-example/codestart.yml | 2 +- .../org/acme/lambda/LambdaHandlerTest.java | 19 +- .../java/src/test/resources/application.yml | 3 - .../funqy-amazon-lambda-example/codestart.yml | 2 +- .../test/java/org/acme/funqy/FunqyTest.java | 29 ++- .../java/src/test/resources/application.yml | 3 - .../src/main/asciidoc/amazon-lambda-http.adoc | 78 +++++- docs/src/main/asciidoc/amazon-lambda.adoc | 110 ++++---- .../amazon-lambda-http/deployment/pom.xml | 4 + .../deployment/AmazonLambdaHttpProcessor.java | 6 +- .../DevServicesHttpLambdaProcessor.java | 14 + .../http-event-server/pom.xml | 55 ++++ .../lambda/runtime/MockHttpEventServer.java | 149 +++++++++++ .../lambda/runtime/EventServerTest.java | 82 ++++++ extensions/amazon-lambda-http/pom.xml | 2 + .../amazon-lambda-rest/deployment/pom.xml | 4 + .../deployment/AmazonLambdaHttpProcessor.java | 6 +- .../DevServicesRestLambdaProcessor.java | 14 + extensions/amazon-lambda-rest/pom.xml | 1 + .../rest-event-server/pom.xml | 59 +++++ .../lambda/runtime/MockRestEventServer.java | 173 +++++++++++++ .../lambda/runtime/EventServerTest.java | 83 ++++++ .../amazon-lambda/common-deployment/pom.xml | 4 + .../AmazonLambdaCommonProcessor.java | 6 +- .../DevServicesLambdaProcessor.java | 95 +++++++ .../EventServerOverrideBuildItem.java | 18 ++ .../lambda/deployment/LambdaConfig.java | 14 + .../deployment/MockEventServerConfig.java | 23 ++ .../runtime/AbstractLambdaPollLoop.java | 90 ++++++- .../lambda/runtime/AmazonLambdaApi.java | 35 ++- .../lambda/runtime/JacksonOutputWriter.java | 7 + .../lambda/runtime/LambdaBuildTimeConfig.java | 20 -- .../runtime/LambdaHotReplacementRecorder.java | 49 ++++ .../lambda/runtime/LambdaOutputWriter.java | 4 + extensions/amazon-lambda/deployment/pom.xml | 5 + .../deployment/AmazonLambdaProcessor.java | 6 +- .../deployment/testing/GreetingLambda.java | 12 + ...aDevServicesContinuousTestingTestCase.java | 49 ++++ .../deployment/testing/LambdaHandlerET.java | 31 +++ .../lambda/deployment/testing/Person.java | 15 ++ extensions/amazon-lambda/event-server/pom.xml | 70 +++++ .../lambda/runtime/MockEventServer.java | 240 ++++++++++++++++++ .../lambda/runtime/EventServerTest.java | 66 +++++ .../archetype-resources/build.gradle | 2 - .../resources/archetype-resources/pom.xml | 4 +- .../src/test/java/LambdaHandlerTest.java | 23 +- .../src/test/resources/application.properties | 3 - extensions/amazon-lambda/pom.xml | 1 + .../bindings/FunqyLambdaBuildStep.java | 6 +- .../RequireVirtualHttpBuildItem.java | 13 +- .../http/deployment/VertxHttpProcessor.java | 4 +- .../amazon-lambda-http-resteasy/pom.xml | 1 + .../src/main/resources/application.properties | 2 - .../lambda/AmazonLambdaSimpleTestCase.java | 3 + integration-tests/amazon-lambda-http/pom.xml | 4 +- .../src/main/resources/application.properties | 2 - .../lambda/AmazonLambdaSimpleTestCase.java | 238 ++++++++++------- integration-tests/amazon-lambda-rest/pom.xml | 4 +- .../src/main/resources/application.properties | 2 - .../lambda/AmazonLambdaV1SimpleTestCase.java | 222 ++++++++++------ integration-tests/amazon-lambda/pom.xml | 4 +- .../src/main/resources/application.properties | 1 - .../lambda/AmazonLambdaSimpleTestCase.java | 36 +-- integration-tests/funqy-amazon-lambda/pom.xml | 4 +- .../io/quarkus/funqy/test/GreetTestBase.java | 34 ++- .../io/quarkus/funqy/test/NoArgFunTest.java | 11 +- .../src/test/resources/application.properties | 1 - .../amazon/lambda/test/LambdaClient.java | 15 ++ .../test/common/RestAssuredURLManager.java | 14 +- 70 files changed, 2046 insertions(+), 380 deletions(-) delete mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/java/src/test/resources/application.yml delete mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-amazon-lambda-example/java/src/test/resources/application.yml create mode 100644 extensions/amazon-lambda-http/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/DevServicesHttpLambdaProcessor.java create mode 100644 extensions/amazon-lambda-http/http-event-server/pom.xml create mode 100644 extensions/amazon-lambda-http/http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java create mode 100644 extensions/amazon-lambda-http/http-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java create mode 100644 extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/DevServicesRestLambdaProcessor.java create mode 100644 extensions/amazon-lambda-rest/rest-event-server/pom.xml create mode 100644 extensions/amazon-lambda-rest/rest-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockRestEventServer.java create mode 100644 extensions/amazon-lambda-rest/rest-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java create mode 100644 extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/DevServicesLambdaProcessor.java create mode 100644 extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/EventServerOverrideBuildItem.java create mode 100644 extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/LambdaConfig.java create mode 100644 extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/MockEventServerConfig.java delete mode 100644 extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaBuildTimeConfig.java create mode 100644 extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaHotReplacementRecorder.java create mode 100644 extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/GreetingLambda.java create mode 100644 extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaDevServicesContinuousTestingTestCase.java create mode 100644 extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaHandlerET.java create mode 100644 extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/Person.java create mode 100644 extensions/amazon-lambda/event-server/pom.xml create mode 100644 extensions/amazon-lambda/event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockEventServer.java create mode 100644 extensions/amazon-lambda/event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java delete mode 100644 integration-tests/funqy-amazon-lambda/src/test/resources/application.properties diff --git a/bom/application/pom.xml b/bom/application/pom.xml index f5650a0c23543f..34fa3826bbd31d 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -1928,6 +1928,21 @@ quarkus-amazon-common ${project.version} + + io.quarkus + quarkus-amazon-lambda-event-server + ${project.version} + + + io.quarkus + quarkus-amazon-lambda-http-event-server + ${project.version} + + + io.quarkus + quarkus-amazon-lambda-rest-event-server + ${project.version} + io.quarkus quarkus-amazon-common-deployment diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/codestart.yml b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/codestart.yml index 40de3a544e76a1..d1612c9b1c613e 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/codestart.yml +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/codestart.yml @@ -11,4 +11,4 @@ language: dependencies: - io.quarkus:quarkus-amazon-lambda test-dependencies: - - io.quarkus:quarkus-test-amazon-lambda + - io.rest-assured:rest-assured diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/java/src/test/java/org/acme/lambda/LambdaHandlerTest.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/java/src/test/java/org/acme/lambda/LambdaHandlerTest.java index 3ba4687dd2d6fc..d214926e70acf3 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/java/src/test/java/org/acme/lambda/LambdaHandlerTest.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/java/src/test/java/org/acme/lambda/LambdaHandlerTest.java @@ -1,20 +1,31 @@ package org.acme.lambda; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.quarkus.amazon.lambda.test.LambdaClient; import io.quarkus.test.junit.QuarkusTest; +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.containsString; + @QuarkusTest public class LambdaHandlerTest { @Test public void testSimpleLambdaSuccess() throws Exception { + // you test your lambas by invoking on http://localhost:8081 + // this works in dev mode too + Person in = new Person(); in.setName("Stu"); - String out = LambdaClient.invoke(String.class, in); - Assertions.assertEquals("Hello Stu", out); + given() + .contentType("application/json") + .accept("application/json") + .body(in) + .when() + .post() + .then() + .statusCode(200) + .body(containsString("Hello Stu")); } } diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/java/src/test/resources/application.yml b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/java/src/test/resources/application.yml deleted file mode 100644 index 6f64d4a18d957f..00000000000000 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/amazon-lambda-example/java/src/test/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -quarkus.lambda.enable-polling-jvm-mode: true - - diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-amazon-lambda-example/codestart.yml b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-amazon-lambda-example/codestart.yml index ff7bfaf26b25db..521883c9527fe9 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-amazon-lambda-example/codestart.yml +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-amazon-lambda-example/codestart.yml @@ -14,4 +14,4 @@ language: dependencies: - io.quarkus:quarkus-funqy-amazon-lambda test-dependencies: - - io.quarkus:quarkus-test-amazon-lambda + - io.rest-assured:rest-assured diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-amazon-lambda-example/java/src/test/java/org/acme/funqy/FunqyTest.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-amazon-lambda-example/java/src/test/java/org/acme/funqy/FunqyTest.java index c689c8c74689aa..e3bb72f0eb24b6 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-amazon-lambda-example/java/src/test/java/org/acme/funqy/FunqyTest.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-amazon-lambda-example/java/src/test/java/org/acme/funqy/FunqyTest.java @@ -1,16 +1,31 @@ package org.acme.funqy; -import io.quarkus.amazon.lambda.test.LambdaClient; -import io.quarkus.test.junit.QuarkusTest; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import io.quarkus.test.junit.QuarkusTest; + +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.containsString; @QuarkusTest public class FunqyTest { + @Test - public void testSimpleLambdaSuccess() throws Exception { - Person friend = new Person("Bill"); - String out = LambdaClient.invoke(String.class, friend); - Assertions.assertEquals("Hello Bill", out); + public void testFunqyLambda() throws Exception { + // you test your lambas by invoking on http://localhost:8081 + // this works in dev mode too + + Person in = new Person(); + in.setName("Bill"); + given() + .contentType("application/json") + .accept("application/json") + .body(in) + .when() + .post() + .then() + .statusCode(200) + .body(containsString("Hello Bill")); } + } + diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-amazon-lambda-example/java/src/test/resources/application.yml b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-amazon-lambda-example/java/src/test/resources/application.yml deleted file mode 100644 index 6f64d4a18d957f..00000000000000 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-amazon-lambda-example/java/src/test/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -quarkus.lambda.enable-polling-jvm-mode: true - - diff --git a/docs/src/main/asciidoc/amazon-lambda-http.adoc b/docs/src/main/asciidoc/amazon-lambda-http.adoc index e921c834686700..ed9f1c5d95f6ce 100644 --- a/docs/src/main/asciidoc/amazon-lambda-http.adoc +++ b/docs/src/main/asciidoc/amazon-lambda-http.adoc @@ -19,6 +19,7 @@ Quarkus has a different extension for each Gateway API. The HTTP Gateway API is The REST Gateway API is implemented within the `quarkus-amazon-lambda-rest` extension. If you are confused on which Gateway product to use, Amazon has a https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vs-rest.html[great guide] to help you navigate this decision. +Like most Quarkus extensions, the Quarkus AWS Lambda HTTP/REST extensions support Live Coding. include::./status-include.adoc[] @@ -105,7 +106,82 @@ are in the the build directory: `target/` for Maven, `build/` for Gradle. * `sam.jvm.yaml` - sam cli deployment script * `sam.native.yaml` - sam cli deployment script for native -== Simulate Amazon Lambda Deployment +== Live Coding and Simulating AWS Lambda Environment Locally + +In dev and test mode, Quarkus will start a mock AWS Lambda event server +that will convert HTTP requests to the corresponding API Gateway event types and post them to the underlying +Quarkus HTTP lambda environment for processing. This simulates the AWS Lambda environment +as much as possible locally without requiring tools like Docker and SAM CLI. + +When using Quarkus Dev Mode just invoke HTTP requests on `http://localhost:8080` +as you normally would when testing your REST endpoints. This request will hit the Mock Event Server and will +be converted to the API Gateway json message that is consumed by the Quarkus Lambda Poll loop. + +For testing, Quarkus starts up a separate Mock Event server under port 8081. The default port for Rest Assured is +automatically set to 8081 by Quarkus, so you don't have to worry about setting this up. + +If you want to simulate more complex +API Gateway events in your tests, then manually do an HTTP POST to `http://localhost:8080/\_lambda_` (port 8081 in test mode) with +the raw API Gateway json events. These events will be placed directly on the Quarkus Lambda poll loop +for processing. Here's an example of that: + +[source,java] +---- +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.equalTo; + +import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; + +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest +public class AmazonLambdaSimpleTestCase { + @Test + public void testJaxrsCognitoJWTSecurityContext() throws Exception { + APIGatewayV2HTTPEvent request = request("/security/username"); + request.getRequestContext().setAuthorizer(new APIGatewayV2HTTPEvent.RequestContext.Authorizer()); + request.getRequestContext().getAuthorizer().setJwt(new APIGatewayV2HTTPEvent.RequestContext.Authorizer.JWT()); + request.getRequestContext().getAuthorizer().getJwt().setClaims(new HashMap<>()); + request.getRequestContext().getAuthorizer().getJwt().getClaims().put("cognito:username", "Bill"); + + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post("/_lambda_") + .then() + .statusCode(200) + .body("body", equalTo("Bill")); + } +---- + +The above example simulates sending a Cognito principal with an HTTP request to your HTTP Lambda. + +If you want to hand code raw events for the AWS HTTP API, the AWS Lambda library has the request event type which is +`com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent` and the response event type +of `com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse`. This corresponds +to the `quarkus-amazon-lambda-http` extension and the AWS HTTP API. + +If you want to hand code raw events for the AWS REST API, Quarkus has its own implementation: `io.quarkus.amazon.lambda.http.model.AwsProxyRequest` +and `io.quarkus.amazon.lambda.http.model.AwsProxyResponse`. This corresponds +to `quarkus-amazon-lambda-rest` extension and the AWS REST API. + +The mock event server is also started for `@NativeImageTest` unit tests so will work +with native binaries too. All this provides similar functionality to the SAM CLI local testing, without the overhead of Docker. + +Finally, if port 8080 or port 8081 is not available on your computer, you can modify the dev +and test mode ports with application.properties + +[source, subs=attributes+] +---- +quarkus.lambda.mock-event-server.dev-port=8082 +quarkus.lambda.mock-event-server.test-port=8083 +---- + + + +== Simulate Amazon Lambda Deployment with SAM CLI The AWS SAM CLI allows you to run your lambda's locally on your laptop in a simulated Lambda environment. This requires Docker to be installed. After you have built your Maven project, execute this command: diff --git a/docs/src/main/asciidoc/amazon-lambda.adoc b/docs/src/main/asciidoc/amazon-lambda.adoc index 2fa38baaa1a185..9cb3f66ce8821e 100644 --- a/docs/src/main/asciidoc/amazon-lambda.adoc +++ b/docs/src/main/asciidoc/amazon-lambda.adoc @@ -14,6 +14,9 @@ Your lambdas can use injection annotations from CDI or Spring and other Quarkus Quarkus lambdas can be deployed using the Amazon Java Runtime, or you can build a native executable and use Amazon's Custom Runtime if you want a smaller memory footprint and faster cold boot startup time. +Quarkus's integration with lambdas also supports Quarkus's Live Coding development cycle. You an +bring up your Quarkus lambda project in dev or test mode and code on your project live. + include::./status-include.adoc[] == Prerequisites @@ -330,96 +333,71 @@ dependencies { ---- -== Integration Testing -The Quarkus Amazon Lambda extension has a matching test framework that provides functionality to execute standard JUnit tests on your AWS Lambda function, -via the integration layer that Quarkus provides. This is true for both JVM and native modes. -It provides similar functionality to the SAM CLI, without the overhead of Docker. - -To illustrate, the project generated by the Maven archetype, generates a JUnit test for the `RequestHandler` implementation, which is shown below. -The test replicates the execution environment, for the function that is selected for invocation, as described <>. +== Live Coding and Unit/Integration Testing +To mirror the AWS Lambda environment as closely as possible in a dev environment, +the Quarkus Amazon Lambda extension boots up a mock AWS Lambda event server in Quarkus Dev and Test mode. +This mock event server simulates a true AWS Lambda environment. -To use the integration tests in your project there is a required property, in `src/test/resources/application.properties`. If not included, the integration tests will be in a constant loop. +While running in Quarkus Dev Mode, you can feed events to it by doing an HTTP POST to `http://localhost:8080`. +The mock event server will receive the events and your lambda will be invoked. You can perform live coding on your lambda +and changes will automatically be recompiled and available the next invocation you make. Here's an example: -[source,properties] ----- -quarkus.lambda.enable-polling-jvm-mode=true +[source,bash] ---- +$ mvn clean quarkus:dev -NOTE: If you are following along with the example Maven archetype project for AWS Lambda in this guide, -it includes the required property `quarkus.lambda.enable-polling-jvm-mode=true` in the test `application.properties`. - -[source,java] +$ curl -d "{\"name\":\"John\"}" -X POST http://localhost:8080 ---- -@QuarkusTest -public class LambdaHandlerTest { - @Test - public void testSimpleLambdaSuccess() throws Exception { - InputObject in = new InputObject(); - in.setGreeting("Hello"); - in.setName("Stu"); +For your unit tests, you can also invoke on the mock event server using any HTTP client you want. Here's an example +using rest-assured. Quarkus starts up a separate Mock Event server under port 8081. +The default port for Rest Assured is automatically set to 8081 by Quarkus so you can invoke +on this endpoint. - OutputObject out = LambdaClient.invoke(OutputObject.class, in); - Assertions.assertEquals("Hello Stu", out.getResult()); - Assertions.assertTrue(out.getRequestId().matches("aws-request-\\d"), "Expected requestId as 'aws-request-'"); - } -} +[source,java] ---- +import org.junit.jupiter.api.Test; -Similarly, if you are using a `RequestStreamHandler` implementation, you can add a matching JUnit test, like below, -which aligns to the generated `StreamLambda` class in the generated project. - -Obviously, these two types of tests are mutually exclusive. You must have a test that corresponds to the implemented AWS Lambda interfaces, -whether `RequestHandler` or `RequestStreamHandler`. +import io.quarkus.test.junit.QuarkusTest; -Two versions of the Test for `RequestStreamHandler` are presented below. You can use either, depending on -the needs of your Unit test. The first is obviously simpler and quicker. Using Java streams can require more coding. +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.containsString; -[source,java] ----- @QuarkusTest -public class LambdaStreamHandlerTest { - - private static Logger LOG = Logger.getLogger(LambdaStreamHandlerTest.class); +public class LambdaHandlerTest { @Test public void testSimpleLambdaSuccess() throws Exception { - String out = LambdaClient.invoke(String.class, "lowercase"); - Assertions.assertEquals("LOWERCASE", out); - } - - @Test - public void testInputStreamSuccess() { - try { - String input = "{ \"name\": \"Bill\", \"greeting\": \"hello\"}"; - InputStream inputStream = new ByteArrayInputStream(input.getBytes()); - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - - LambdaClient.invoke(inputStream, outputStream); - - ByteArrayInputStream out = new ByteArrayInputStream(outputStream.toByteArray()); - StringBuilder response = new StringBuilder(); - int i = 0; - while ((i = out.read()) != -1) { - response.append((char)i); - } - - Assertions.assertTrue(response.toString().contains("BILL")); - } catch (Exception e) { - Assertions.fail(e.getMessage()); - } + Person in = new Person(); + in.setName("Stu"); + given() + .contentType("application/json") + .accept("application/json") + .body(in) + .when() + .post() + .then() + .statusCode(200) + .body(containsString("Hello Stu")); } - } ---- -If your code uses CDI injection, this too will be executed, along with mocking functionality, see the link:getting-started-testing[Test Guide] for more details. +The mock event server is also started for `@NativeImageTest` unit tests so will work +with native binaries too. All this provides similar functionality to the SAM CLI local testing, without the overhead of Docker. -To add JUnit functionality for native tests, add the `@NativeImageTest` annotation to a subclass of your test class, which will execute against your native image, and can be leveraged in an IDE. +Finally, if port 8080 or port 8081 is not available on your computer, you can modify the dev +and test mode ports with application.properties +[source, subs=attributes+] +---- +quarkus.lambda.mock-event-server.dev-port=8082 +quarkus.lambda.mock-event-server.test-port=8083 +---- == Testing with the SAM CLI +If you do not want to use the mock event server, you can test your lambdas with SAM CLI. The https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html[AWS SAM CLI] allows you to run your lambdas locally on your laptop in a simulated Lambda environment. This requires diff --git a/extensions/amazon-lambda-http/deployment/pom.xml b/extensions/amazon-lambda-http/deployment/pom.xml index 2d1091906ac49b..d14d4ce408f31b 100644 --- a/extensions/amazon-lambda-http/deployment/pom.xml +++ b/extensions/amazon-lambda-http/deployment/pom.xml @@ -35,6 +35,10 @@ io.quarkus quarkus-amazon-lambda-http + + io.quarkus + quarkus-amazon-lambda-http-event-server + diff --git a/extensions/amazon-lambda-http/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java b/extensions/amazon-lambda-http/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java index ea559b4de05046..b2912010e6cf85 100644 --- a/extensions/amazon-lambda-http/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java +++ b/extensions/amazon-lambda-http/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java @@ -15,12 +15,10 @@ import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.LaunchModeBuildItem; import io.quarkus.deployment.builditem.SystemPropertyBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem; import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem; -import io.quarkus.runtime.LaunchMode; import io.quarkus.vertx.http.deployment.RequireVirtualHttpBuildItem; import io.vertx.core.file.impl.FileResolver; @@ -41,8 +39,8 @@ public void setupSecurity(BuildProducer additionalBeans } @BuildStep - public RequireVirtualHttpBuildItem requestVirtualHttp(LaunchModeBuildItem launchMode) { - return launchMode.getLaunchMode() == LaunchMode.NORMAL ? RequireVirtualHttpBuildItem.MARKER : null; + public RequireVirtualHttpBuildItem requestVirtualHttp() { + return RequireVirtualHttpBuildItem.ALWAYS_VIRTUAL; } @BuildStep diff --git a/extensions/amazon-lambda-http/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/DevServicesHttpLambdaProcessor.java b/extensions/amazon-lambda-http/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/DevServicesHttpLambdaProcessor.java new file mode 100644 index 00000000000000..c93237fe812c2f --- /dev/null +++ b/extensions/amazon-lambda-http/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/DevServicesHttpLambdaProcessor.java @@ -0,0 +1,14 @@ +package io.quarkus.amazon.lambda.http.deployment; + +import io.quarkus.amazon.lambda.deployment.EventServerOverrideBuildItem; +import io.quarkus.amazon.lambda.runtime.MockHttpEventServer; +import io.quarkus.deployment.annotations.BuildStep; + +public class DevServicesHttpLambdaProcessor { + + @BuildStep + public EventServerOverrideBuildItem overrideEventServer() { + return new EventServerOverrideBuildItem( + () -> new MockHttpEventServer()); + } +} diff --git a/extensions/amazon-lambda-http/http-event-server/pom.xml b/extensions/amazon-lambda-http/http-event-server/pom.xml new file mode 100644 index 00000000000000..de659dc116afd5 --- /dev/null +++ b/extensions/amazon-lambda-http/http-event-server/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + + io.quarkus + quarkus-amazon-lambda-http-parent + 999-SNAPSHOT + ../pom.xml + + + quarkus-amazon-lambda-http-event-server + Quarkus - Amazon Lambda HTTP Event Server + AWS Lambda HTTP Mock Lambda event server for testing and dev mode + + + + io.quarkus + quarkus-amazon-lambda-event-server + + + org.junit.jupiter + junit-jupiter + test + + + org.jboss.resteasy + resteasy-client + test + + + commons-logging + commons-logging + + + jakarta.activation + jakarta.activation-api + + + + + + io.quarkus + quarkus-apache-httpclient + test + + + + + + + + diff --git a/extensions/amazon-lambda-http/http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java b/extensions/amazon-lambda-http/http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java new file mode 100644 index 00000000000000..c5f255c3ccebf4 --- /dev/null +++ b/extensions/amazon-lambda-http/http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java @@ -0,0 +1,149 @@ +package io.quarkus.amazon.lambda.runtime; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.UUID; + +import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; +import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.ObjectWriter; + +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpServerResponse; +import io.vertx.ext.web.RoutingContext; + +public class MockHttpEventServer extends MockEventServer { + + private final ObjectMapper objectMapper; + private final ObjectWriter eventWriter; + private final ObjectReader responseReader; + + public MockHttpEventServer() { + objectMapper = new ObjectMapper(); + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true); + eventWriter = objectMapper.writerFor(APIGatewayV2HTTPEvent.class); + responseReader = objectMapper.readerFor(APIGatewayV2HTTPResponse.class); + } + + @Override + protected void defaultHanderSetup() { + router.route().handler(this::handleHttpRequests); + } + + public void handleHttpRequests(RoutingContext ctx) { + String requestId = ctx.request().getHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (requestId == null) { + requestId = UUID.randomUUID().toString(); + } + ctx.put(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID, requestId); + String traceId = ctx.request().getHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (traceId == null) { + traceId = UUID.randomUUID().toString(); + } + ctx.put(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY, traceId); + Buffer body = ctx.getBody(); + + APIGatewayV2HTTPEvent event = new APIGatewayV2HTTPEvent(); + event.setRequestContext(new APIGatewayV2HTTPEvent.RequestContext()); + event.getRequestContext().setHttp(new APIGatewayV2HTTPEvent.RequestContext.Http()); + event.getRequestContext().getHttp().setMethod(ctx.request().method().name()); + event.setRawPath(ctx.request().path()); + event.setRawQueryString(ctx.request().query()); + for (String header : ctx.request().headers().names()) { + if (event.getHeaders() == null) + event.setHeaders(new HashMap<>()); + List values = ctx.request().headers().getAll(header); + String value = String.join(",", values); + event.getHeaders().put(header, value); + } + if (body != null) { + String ct = ctx.request().getHeader("content-type"); + if (ct == null || isBinary(ct)) { + String encoded = Base64.getMimeEncoder().encodeToString(body.getBytes()); + event.setBody(encoded); + event.setIsBase64Encoded(true); + } else { + event.setBody(new String(body.getBytes(), StandardCharsets.UTF_8)); + } + } + + try { + byte[] mEvent = eventWriter.writeValueAsBytes(event); + ctx.put(APIGatewayV2HTTPEvent.class.getName(), mEvent); + queue.put(ctx); + } catch (Exception e) { + log.error("Publish failure", e); + ctx.fail(500); + } + } + + @Override + protected String getEventContentType(RoutingContext request) { + if (request.get(APIGatewayV2HTTPEvent.class.getName()) != null) + return "application/json"; + return super.getEventContentType(request); + } + + @Override + protected Buffer processEventBody(RoutingContext request) { + byte[] buf = request.get(APIGatewayV2HTTPEvent.class.getName()); + if (buf != null) { + return Buffer.buffer(buf); + } + return super.processEventBody(request); + } + + @Override + public void processResponse(RoutingContext ctx, RoutingContext pending, Buffer buffer) { + if (pending.get(APIGatewayV2HTTPEvent.class.getName()) != null) { + try { + APIGatewayV2HTTPResponse res = responseReader.readValue(buffer.getBytes()); + HttpServerResponse response = pending.response(); + if (res.getHeaders() != null) { + for (Map.Entry header : res.getHeaders().entrySet()) { + for (String val : header.getValue().split(",")) { + response.headers().add(header.getKey(), val); + } + } + } + response.setStatusCode(res.getStatusCode()); + String body = res.getBody(); + if (body != null) { + if (res.getIsBase64Encoded()) { + byte[] bytes = Base64.getDecoder().decode(body); + response.end(Buffer.buffer(bytes)); + } else { + response.end(body); + } + } else { + response.end(); + } + + } catch (IOException e) { + log.error("Publish failure", e); + pending.fail(500); + } + } else { + super.processResponse(ctx, pending, buffer); + } + } + + private boolean isBinary(String contentType) { + if (contentType != null) { + String ct = contentType.toLowerCase(Locale.ROOT); + return !(ct.startsWith("text") || ct.contains("json") || ct.contains("xml") || ct.contains("yaml")); + } + return false; + } + +} diff --git a/extensions/amazon-lambda-http/http-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java b/extensions/amazon-lambda-http/http-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java new file mode 100644 index 00000000000000..831049128008b5 --- /dev/null +++ b/extensions/amazon-lambda-http/http-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java @@ -0,0 +1,82 @@ +package io.quarkus.amazon.lambda.runtime; + +import java.util.HashMap; +import java.util.concurrent.Future; + +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.Response; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; +import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.ObjectWriter; + +public class EventServerTest { + + static MockEventServer server; + static ObjectMapper mapper; + static ObjectReader eventReader; + static ObjectWriter resWriter; + + @BeforeAll + public static void start() { + server = new MockHttpEventServer(); + server.start(); + mapper = new ObjectMapper(); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true); + eventReader = mapper.readerFor(APIGatewayV2HTTPEvent.class); + resWriter = mapper.writerFor(APIGatewayV2HTTPResponse.class); + } + + @AfterAll + public static void end() throws Exception { + server.close(); + } + + @Test + public void testServer() throws Exception { + Client client = ClientBuilder.newBuilder().build(); + WebTarget base = client.target("http://localhost:" + MockEventServer.DEFAULT_PORT); + Future lambdaInvoke = base.request().async() + .post(Entity.text("Hello World")); + + Response next = base.path(MockEventServer.NEXT_INVOCATION).request().get(); + Assertions.assertEquals(200, next.getStatus()); + String requestId = next.getHeaderString(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + String traceId = next.getHeaderString(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY); + Assertions.assertNotNull(requestId); + Assertions.assertNotNull(traceId); + String json = next.readEntity(String.class); + APIGatewayV2HTTPEvent event = eventReader.readValue(json); + Assertions.assertEquals("text/plain", event.getHeaders().get("Content-Type")); + Assertions.assertEquals("Hello World", event.getBody()); + next.close(); + + APIGatewayV2HTTPResponse res = new APIGatewayV2HTTPResponse(); + res.setStatusCode(201); + res.setHeaders(new HashMap()); + res.getHeaders().put("Content-Type", "text/plain"); + res.setBody("Hi"); + Response sendResponse = base.path(MockEventServer.INVOCATION).path(requestId).path("response") + .request().post(Entity.json(resWriter.writeValueAsString(res))); + Assertions.assertEquals(204, sendResponse.getStatus()); + sendResponse.close(); + + Response lambdaResponse = lambdaInvoke.get(); + Assertions.assertEquals(201, lambdaResponse.getStatus()); + Assertions.assertEquals("Hi", lambdaResponse.readEntity(String.class)); + lambdaResponse.close(); + } +} diff --git a/extensions/amazon-lambda-http/pom.xml b/extensions/amazon-lambda-http/pom.xml index 61c49706a6b979..78c20a2fb26b2d 100644 --- a/extensions/amazon-lambda-http/pom.xml +++ b/extensions/amazon-lambda-http/pom.xml @@ -17,7 +17,9 @@ runtime + http-event-server deployment + maven-archetype diff --git a/extensions/amazon-lambda-rest/deployment/pom.xml b/extensions/amazon-lambda-rest/deployment/pom.xml index 32362c7132335c..97aa14362fcb06 100644 --- a/extensions/amazon-lambda-rest/deployment/pom.xml +++ b/extensions/amazon-lambda-rest/deployment/pom.xml @@ -39,6 +39,10 @@ io.quarkus quarkus-amazon-lambda-rest + + io.quarkus + quarkus-amazon-lambda-rest-event-server + diff --git a/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java b/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java index 68242ca8e9f806..822459c06fe63c 100644 --- a/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java +++ b/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java @@ -20,12 +20,10 @@ import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.LaunchModeBuildItem; import io.quarkus.deployment.builditem.SystemPropertyBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem; import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem; -import io.quarkus.runtime.LaunchMode; import io.quarkus.vertx.http.deployment.RequireVirtualHttpBuildItem; import io.vertx.core.file.impl.FileResolver; @@ -46,8 +44,8 @@ public void setupSecurity(BuildProducer additionalBeans } @BuildStep - public RequireVirtualHttpBuildItem requestVirtualHttp(LaunchModeBuildItem launchMode) { - return launchMode.getLaunchMode() == LaunchMode.NORMAL ? RequireVirtualHttpBuildItem.MARKER : null; + public RequireVirtualHttpBuildItem requestVirtualHttp() { + return RequireVirtualHttpBuildItem.ALWAYS_VIRTUAL; } @BuildStep diff --git a/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/DevServicesRestLambdaProcessor.java b/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/DevServicesRestLambdaProcessor.java new file mode 100644 index 00000000000000..5e9f952f55badf --- /dev/null +++ b/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/DevServicesRestLambdaProcessor.java @@ -0,0 +1,14 @@ +package io.quarkus.amazon.lambda.http.deployment; + +import io.quarkus.amazon.lambda.deployment.EventServerOverrideBuildItem; +import io.quarkus.amazon.lambda.runtime.MockRestEventServer; +import io.quarkus.deployment.annotations.BuildStep; + +public class DevServicesRestLambdaProcessor { + + @BuildStep + public EventServerOverrideBuildItem overrideEventServer() { + return new EventServerOverrideBuildItem( + () -> new MockRestEventServer()); + } +} diff --git a/extensions/amazon-lambda-rest/pom.xml b/extensions/amazon-lambda-rest/pom.xml index 34cb1cf262363d..3e194bce78c241 100644 --- a/extensions/amazon-lambda-rest/pom.xml +++ b/extensions/amazon-lambda-rest/pom.xml @@ -17,6 +17,7 @@ runtime + rest-event-server deployment maven-archetype diff --git a/extensions/amazon-lambda-rest/rest-event-server/pom.xml b/extensions/amazon-lambda-rest/rest-event-server/pom.xml new file mode 100644 index 00000000000000..81b5fd7b97743b --- /dev/null +++ b/extensions/amazon-lambda-rest/rest-event-server/pom.xml @@ -0,0 +1,59 @@ + + + 4.0.0 + + + io.quarkus + quarkus-amazon-lambda-rest-parent + 999-SNAPSHOT + ../pom.xml + + + quarkus-amazon-lambda-rest-event-server + Quarkus - Amazon Lambda REST Event Server + AWS Lambda REST Mock Lambda event server for testing and dev mode + + + + io.quarkus + quarkus-amazon-lambda-event-server + + + io.quarkus + quarkus-amazon-lambda-rest + + + org.junit.jupiter + junit-jupiter + test + + + org.jboss.resteasy + resteasy-client + test + + + commons-logging + commons-logging + + + jakarta.activation + jakarta.activation-api + + + + + + io.quarkus + quarkus-apache-httpclient + test + + + + + + + + diff --git a/extensions/amazon-lambda-rest/rest-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockRestEventServer.java b/extensions/amazon-lambda-rest/rest-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockRestEventServer.java new file mode 100644 index 00000000000000..4a3665eaf21889 --- /dev/null +++ b/extensions/amazon-lambda-rest/rest-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockRestEventServer.java @@ -0,0 +1,173 @@ +package io.quarkus.amazon.lambda.runtime; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.UUID; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.ObjectWriter; + +import io.quarkus.amazon.lambda.http.model.AwsProxyRequest; +import io.quarkus.amazon.lambda.http.model.AwsProxyRequestContext; +import io.quarkus.amazon.lambda.http.model.AwsProxyResponse; +import io.quarkus.amazon.lambda.http.model.Headers; +import io.quarkus.amazon.lambda.http.model.MultiValuedTreeMap; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpServerResponse; +import io.vertx.ext.web.RoutingContext; + +public class MockRestEventServer extends MockEventServer { + + private final ObjectMapper objectMapper; + private final ObjectWriter eventWriter; + private final ObjectReader responseReader; + + public MockRestEventServer() { + objectMapper = new ObjectMapper(); + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true); + eventWriter = objectMapper.writerFor(AwsProxyRequest.class); + responseReader = objectMapper.readerFor(AwsProxyResponse.class); + } + + @Override + protected void defaultHanderSetup() { + router.route().handler(this::handleHttpRequests); + } + + public void handleHttpRequests(RoutingContext ctx) { + String requestId = ctx.request().getHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (requestId == null) { + requestId = UUID.randomUUID().toString(); + } + ctx.put(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID, requestId); + String traceId = ctx.request().getHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (traceId == null) { + traceId = UUID.randomUUID().toString(); + } + ctx.put(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY, traceId); + Buffer body = ctx.getBody(); + + AwsProxyRequest event = new AwsProxyRequest(); + event.setRequestContext(new AwsProxyRequestContext()); + event.getRequestContext().setRequestId(requestId); + event.getRequestContext().setHttpMethod(ctx.request().method().name()); + event.setHttpMethod(ctx.request().method().name()); + event.setPath(ctx.request().path()); + if (ctx.request().query() != null) { + event.setMultiValueQueryStringParameters(new MultiValuedTreeMap<>()); + String[] params = ctx.request().query().split("&"); + for (String param : params) { + if (param.contains("=")) { + String[] keyval = param.split("="); + try { + event.getMultiValueQueryStringParameters().add( + URLDecoder.decode(keyval[0], StandardCharsets.UTF_8.name()), + URLDecoder.decode(keyval[1], StandardCharsets.UTF_8.name())); + } catch (UnsupportedEncodingException e) { + log.error("Failed to parse query string", e); + ctx.response().setStatusCode(400).end(); + return; + } + } + } + + } + if (ctx.request().headers() != null) { + event.setMultiValueHeaders(new Headers()); + for (String header : ctx.request().headers().names()) { + List values = ctx.request().headers().getAll(header); + for (String val : values) + event.getMultiValueHeaders().add(header, val); + } + } + if (body != null) { + String ct = ctx.request().getHeader("content-type"); + if (ct == null || isBinary(ct)) { + String encoded = Base64.getMimeEncoder().encodeToString(body.getBytes()); + event.setBody(encoded); + event.setIsBase64Encoded(true); + } else { + event.setBody(new String(body.getBytes(), StandardCharsets.UTF_8)); + } + } + + try { + byte[] mEvent = eventWriter.writeValueAsBytes(event); + ctx.put(AwsProxyRequest.class.getName(), mEvent); + queue.put(ctx); + } catch (Exception e) { + log.error("Publish failure", e); + ctx.fail(500); + } + } + + @Override + protected String getEventContentType(RoutingContext request) { + if (request.get(AwsProxyRequest.class.getName()) != null) + return "application/json"; + return super.getEventContentType(request); + } + + @Override + protected Buffer processEventBody(RoutingContext request) { + byte[] buf = request.get(AwsProxyRequest.class.getName()); + if (buf != null) { + return Buffer.buffer(buf); + } + return super.processEventBody(request); + } + + @Override + public void processResponse(RoutingContext ctx, RoutingContext pending, Buffer buffer) { + if (pending.get(AwsProxyRequest.class.getName()) != null) { + try { + AwsProxyResponse res = responseReader.readValue(buffer.getBytes()); + HttpServerResponse response = pending.response(); + if (res.getMultiValueHeaders() != null) { + for (Map.Entry> header : res.getMultiValueHeaders().entrySet()) { + for (String val : header.getValue()) { + response.headers().add(header.getKey(), val); + } + } + } + response.setStatusCode(res.getStatusCode()); + String body = res.getBody(); + if (body != null) { + if (res.isBase64Encoded()) { + byte[] bytes = Base64.getDecoder().decode(body); + response.end(Buffer.buffer(bytes)); + } else { + response.end(body); + } + } else { + response.end(); + } + + } catch (IOException e) { + log.error("Publish failure", e); + pending.fail(500); + } + } else { + super.processResponse(ctx, pending, buffer); + } + } + + private boolean isBinary(String contentType) { + if (contentType != null) { + String ct = contentType.toLowerCase(Locale.ROOT); + return !(ct.startsWith("text") || ct.contains("json") || ct.contains("xml") || ct.contains("yaml")); + } + return false; + } + +} diff --git a/extensions/amazon-lambda-rest/rest-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java b/extensions/amazon-lambda-rest/rest-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java new file mode 100644 index 00000000000000..508ea7e4bbabb6 --- /dev/null +++ b/extensions/amazon-lambda-rest/rest-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java @@ -0,0 +1,83 @@ +package io.quarkus.amazon.lambda.runtime; + +import java.util.HashMap; +import java.util.concurrent.Future; + +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.Response; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.ObjectWriter; + +import io.quarkus.amazon.lambda.http.model.AwsProxyRequest; +import io.quarkus.amazon.lambda.http.model.AwsProxyResponse; + +public class EventServerTest { + + static MockEventServer server; + static ObjectMapper mapper; + static ObjectReader eventReader; + static ObjectWriter resWriter; + + @BeforeAll + public static void start() { + server = new MockRestEventServer(); + server.start(); + mapper = new ObjectMapper(); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true); + eventReader = mapper.readerFor(AwsProxyRequest.class); + resWriter = mapper.writerFor(AwsProxyResponse.class); + } + + @AfterAll + public static void end() throws Exception { + server.close(); + } + + @Test + public void testServer() throws Exception { + Client client = ClientBuilder.newBuilder().build(); + WebTarget base = client.target("http://localhost:" + MockEventServer.DEFAULT_PORT); + Future lambdaInvoke = base.request().async() + .post(Entity.text("Hello World")); + + Response next = base.path(MockEventServer.NEXT_INVOCATION).request().get(); + Assertions.assertEquals(200, next.getStatus()); + String requestId = next.getHeaderString(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + String traceId = next.getHeaderString(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY); + Assertions.assertNotNull(requestId); + Assertions.assertNotNull(traceId); + String json = next.readEntity(String.class); + AwsProxyRequest event = eventReader.readValue(json); + Assertions.assertEquals("text/plain", event.getMultiValueHeaders().getFirst("Content-Type")); + Assertions.assertEquals("Hello World", event.getBody()); + next.close(); + + AwsProxyResponse res = new AwsProxyResponse(); + res.setStatusCode(201); + res.setHeaders(new HashMap()); + res.getHeaders().put("Content-Type", "text/plain"); + res.setBody("Hi"); + Response sendResponse = base.path(MockEventServer.INVOCATION).path(requestId).path("response") + .request().post(Entity.json(resWriter.writeValueAsString(res))); + Assertions.assertEquals(204, sendResponse.getStatus()); + sendResponse.close(); + + Response lambdaResponse = lambdaInvoke.get(); + Assertions.assertEquals(201, lambdaResponse.getStatus()); + Assertions.assertEquals("Hi", lambdaResponse.readEntity(String.class)); + lambdaResponse.close(); + } +} diff --git a/extensions/amazon-lambda/common-deployment/pom.xml b/extensions/amazon-lambda/common-deployment/pom.xml index f2686d8d098c60..9e34d9282e0ce9 100644 --- a/extensions/amazon-lambda/common-deployment/pom.xml +++ b/extensions/amazon-lambda/common-deployment/pom.xml @@ -35,6 +35,10 @@ io.quarkus quarkus-amazon-lambda-common + + io.quarkus + quarkus-amazon-lambda-event-server + io.quarkus quarkus-junit5-internal diff --git a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaCommonProcessor.java b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaCommonProcessor.java index df692697ed573a..eafa77114b062e 100644 --- a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaCommonProcessor.java +++ b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaCommonProcessor.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.amazon.lambda.runtime.AmazonLambdaMapperRecorder; -import io.quarkus.amazon.lambda.runtime.LambdaBuildTimeConfig; import io.quarkus.arc.deployment.BeanContainerBuildItem; import io.quarkus.arc.deployment.UnremovableBeanBuildItem; import io.quarkus.deployment.annotations.BuildProducer; @@ -75,12 +74,11 @@ public void initContextReaders(AmazonLambdaMapperRecorder recorder, @BuildStep @Record(value = ExecutionTime.STATIC_INIT) - void initContextReaders(LambdaBuildTimeConfig config, - AmazonLambdaMapperRecorder recorder, + void initContextReaders(AmazonLambdaMapperRecorder recorder, LambdaObjectMapperInitializedBuildItem dependency, LaunchModeBuildItem launchModeBuildItem) { LaunchMode mode = launchModeBuildItem.getLaunchMode(); - if (config.enablePollingJvmMode && mode.isDevOrTest()) { + if (mode.isDevOrTest()) { // only need context readers in native or dev or test mode recorder.initContextReaders(); } diff --git a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/DevServicesLambdaProcessor.java b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/DevServicesLambdaProcessor.java new file mode 100644 index 00000000000000..6b41e5100b0c96 --- /dev/null +++ b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/DevServicesLambdaProcessor.java @@ -0,0 +1,95 @@ +package io.quarkus.amazon.lambda.deployment; + +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; + +import java.util.Optional; +import java.util.function.Supplier; + +import org.jboss.logging.Logger; + +import io.quarkus.amazon.lambda.runtime.AmazonLambdaApi; +import io.quarkus.amazon.lambda.runtime.LambdaHotReplacementRecorder; +import io.quarkus.amazon.lambda.runtime.MockEventServer; +import io.quarkus.bootstrap.classloading.QuarkusClassLoader; +import io.quarkus.deployment.IsNormal; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.DevServicesNativeConfigResultBuildItem; +import io.quarkus.deployment.builditem.LaunchModeBuildItem; +import io.quarkus.deployment.builditem.ServiceStartBuildItem; +import io.quarkus.runtime.LaunchMode; + +public class DevServicesLambdaProcessor { + private static final Logger log = Logger.getLogger(DevServicesLambdaProcessor.class); + + static MockEventServer server; + static LaunchMode startMode; + + @BuildStep(onlyIfNot = IsNormal.class) + @Record(STATIC_INIT) + public void enableHotReplacementChecker(LaunchModeBuildItem launchMode, + LambdaHotReplacementRecorder recorder, + LambdaObjectMapperInitializedBuildItem dependency) { + if (launchMode.getLaunchMode().isDevOrTest()) { + if (!legacyTestingEnabled()) { + recorder.enable(); + } + } + } + + private boolean legacyTestingEnabled() { + try { + Class.forName("io.quarkus.amazon.lambda.test.LambdaClient"); + return true; + } catch (ClassNotFoundException e) { + return false; + } + } + + @BuildStep(onlyIfNot = IsNormal.class) + public void startEventServer(LaunchModeBuildItem launchMode, + LambdaConfig config, + Optional override, + BuildProducer devServicePropertiesProducer, + BuildProducer serviceStartBuildItemBuildProducer) throws Exception { + if (!launchMode.getLaunchMode().isDevOrTest()) + return; + if (legacyTestingEnabled()) + return; + if (server != null) { + return; + } + Supplier supplier = null; + if (override.isPresent()) { + supplier = override.get().getServer(); + } else { + supplier = () -> new MockEventServer(); + } + + server = supplier.get(); + int port = launchMode.getLaunchMode() == LaunchMode.TEST ? config.mockEventServer.testPort + : config.mockEventServer.devPort; + startMode = launchMode.getLaunchMode(); + server.start(port); + String baseUrl = "localhost:" + port + MockEventServer.BASE_PATH; + System.setProperty(AmazonLambdaApi.QUARKUS_INTERNAL_AWS_LAMBDA_TEST_API, baseUrl); + devServicePropertiesProducer.produce( + new DevServicesNativeConfigResultBuildItem(AmazonLambdaApi.QUARKUS_INTERNAL_AWS_LAMBDA_TEST_API, baseUrl)); + Runnable closeTask = () -> { + if (server != null) { + try { + server.close(); + } catch (Throwable e) { + log.error("Failed to stop the Lambda Mock Event Server", e); + } finally { + server = null; + } + } + startMode = null; + server = null; + }; + QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader(); + ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask); + } +} diff --git a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/EventServerOverrideBuildItem.java b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/EventServerOverrideBuildItem.java new file mode 100644 index 00000000000000..29644cf78b8b02 --- /dev/null +++ b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/EventServerOverrideBuildItem.java @@ -0,0 +1,18 @@ +package io.quarkus.amazon.lambda.deployment; + +import java.util.function.Supplier; + +import io.quarkus.amazon.lambda.runtime.MockEventServer; +import io.quarkus.builder.item.SimpleBuildItem; + +public final class EventServerOverrideBuildItem extends SimpleBuildItem { + private Supplier server; + + public EventServerOverrideBuildItem(Supplier server) { + this.server = server; + } + + public Supplier getServer() { + return server; + } +} diff --git a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/LambdaConfig.java b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/LambdaConfig.java new file mode 100644 index 00000000000000..e9dcc8e4c3e61f --- /dev/null +++ b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/LambdaConfig.java @@ -0,0 +1,14 @@ +package io.quarkus.amazon.lambda.deployment; + +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; + +@ConfigRoot(phase = ConfigPhase.BUILD_TIME) +public class LambdaConfig { + + /** + * Configuration for the mock event server that is run + * in dev mode and test mode + */ + MockEventServerConfig mockEventServer; +} diff --git a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/MockEventServerConfig.java b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/MockEventServerConfig.java new file mode 100644 index 00000000000000..8722ba40f47f62 --- /dev/null +++ b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/MockEventServerConfig.java @@ -0,0 +1,23 @@ +package io.quarkus.amazon.lambda.deployment; + +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; + +/** + * Configuration for the mock event server that is run + * in dev mode and test mode + */ +@ConfigGroup +public class MockEventServerConfig { + /** + * Port to access mock event server in dev mode + */ + @ConfigItem(defaultValue = "8080") + public int devPort; + + /** + * Port to access mock event server in dev mode + */ + @ConfigItem(defaultValue = "8081") + public int testPort; +} diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java index db662c1139144b..1d7052ccc766df 100644 --- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java +++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java @@ -33,23 +33,42 @@ public AbstractLambdaPollLoop(ObjectMapper objectMapper, ObjectReader cognitoIdR protected abstract boolean isStream(); - public void startPollLoop(ShutdownContext context) { + protected HttpURLConnection requestConnection = null; + public void startPollLoop(ShutdownContext context) { final AtomicBoolean running = new AtomicBoolean(true); + // flag to check whether to interrupt. + final AtomicBoolean shouldInterrupt = new AtomicBoolean(true); + String baseUrl = AmazonLambdaApi.baseUrl(); final Thread pollingThread = new Thread(new Runnable() { @SuppressWarnings("unchecked") @Override public void run() { - try { - checkQuarkusBootstrapped(); - URL requestUrl = AmazonLambdaApi.invocationNext(); + if (!LambdaHotReplacementRecorder.enabled) { + // when running with continuous testing, this method fails + // because currentApplication is not set when running as an + // auxiliary application. So, just skip it if hot replacement enabled. + // this is only needed in lambda JVM mode anyways to make sure + // quarkus has started. + checkQuarkusBootstrapped(); + } + URL requestUrl = AmazonLambdaApi.invocationNext(baseUrl); + if (AmazonLambdaApi.isTestMode()) { + // FYI: This log is required as native test runner + // looks for "Listening on" in log to ensure native executable booted + log.info("Listening on: " + requestUrl.toString()); + } while (running.get()) { - HttpURLConnection requestConnection = null; try { requestConnection = (HttpURLConnection) requestUrl.openConnection(); } catch (IOException e) { + if (!running.get()) { + // just return gracefully as we were probably shut down by + // shutdown task + return; + } if (abortGracefully(e)) { return; } @@ -57,10 +76,31 @@ public void run() { } try { String requestId = requestConnection.getHeaderField(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (requestConnection.getResponseCode() != 200) { + // connection should be closed by finally clause + continue; + } try { + if (LambdaHotReplacementRecorder.enabled) { + try { + // do not interrupt during a hot replacement + // as shutdown will abort and do nasty things. + shouldInterrupt.set(false); + if (LambdaHotReplacementRecorder.checkHotReplacement()) { + // hot replacement happened in dev mode + // so we requeue the request as quarkus will restart + // and the message will not be processed + // FYI: this requeue endpoint is something only the mock event server implements + requeue(baseUrl, requestId); + return; + } + } finally { + shouldInterrupt.set(true); + } + } String traceId = requestConnection.getHeaderField(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY); TraceId.setTraceId(traceId); - URL url = AmazonLambdaApi.invocationResponse(requestId); + URL url = AmazonLambdaApi.invocationResponse(baseUrl, requestId); if (isStream()) { HttpURLConnection responseConnection = responseStream(url); if (running.get()) { @@ -87,7 +127,7 @@ public void run() { } log.error("Failed to run lambda", e); - postError(AmazonLambdaApi.invocationError(requestId), + postError(AmazonLambdaApi.invocationError(baseUrl, requestId), new FunctionError(e.getClass().getName(), e.getMessage())); continue; } @@ -111,25 +151,34 @@ public void run() { } catch (Exception e) { try { log.error("Lambda init error", e); - postError(AmazonLambdaApi.initError(), new FunctionError(e.getClass().getName(), e.getMessage())); + postError(AmazonLambdaApi.initError(baseUrl), + new FunctionError(e.getClass().getName(), e.getMessage())); } catch (Exception ex) { log.error("Failed to report init error", ex); } finally { // our main loop is done, time to shutdown Application app = Application.currentApplication(); if (app != null) { + log.error("Shutting down Quarkus application because of error"); app.stop(); } } + } finally { + log.info("Lambda polling thread complete"); } } }, "Lambda Thread"); pollingThread.setDaemon(true); context.addShutdownTask(() -> { running.set(false); - //note that this does not seem to be 100% reliable in unblocking the thread - //which is why it is a daemon. - pollingThread.interrupt(); + try { + //note that interrupting does not seem to be 100% reliable in unblocking the thread + requestConnection.disconnect(); + } catch (Exception ignore) { + } + if (shouldInterrupt.get()) { + pollingThread.interrupt(); + } }); pollingThread.start(); @@ -167,10 +216,24 @@ private void checkQuarkusBootstrapped() { protected void postResponse(URL url, Object response) throws IOException { HttpURLConnection responseConnection = (HttpURLConnection) url.openConnection(); + if (response != null) { + getOutputWriter().writeHeaders(responseConnection); + } responseConnection.setDoOutput(true); responseConnection.setRequestMethod("POST"); - if (response != null) + if (response != null) { getOutputWriter().writeValue(responseConnection.getOutputStream(), response); + } + while (responseConnection.getInputStream().read() != -1) { + // Read data + } + } + + protected void requeue(String baseUrl, String requestId) throws IOException { + URL url = AmazonLambdaApi.requeue(baseUrl, requestId); + HttpURLConnection responseConnection = (HttpURLConnection) url.openConnection(); + responseConnection.setDoOutput(true); + responseConnection.setRequestMethod("POST"); while (responseConnection.getInputStream().read() != -1) { // Read data } @@ -178,6 +241,7 @@ protected void postResponse(URL url, Object response) throws IOException { protected void postError(URL url, Object response) throws IOException { HttpURLConnection responseConnection = (HttpURLConnection) url.openConnection(); + responseConnection.setRequestProperty("Content-Type", "application/json"); responseConnection.setDoOutput(true); responseConnection.setRequestMethod("POST"); objectMapper.writeValue(responseConnection.getOutputStream(), response); @@ -202,7 +266,7 @@ boolean abortGracefully(Exception ex) { || (ex instanceof UnknownHostException && !lambdaEnv); if (graceful) - log.warn("Aborting lambda poll loop: " + (!lambdaEnv ? "no lambda container found" : "test mode")); + log.warn("Aborting lambda poll loop: " + (lambdaEnv ? "no lambda container found" : "ending dev/test mode")); return graceful; } diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaApi.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaApi.java index a768c158bc3899..ec1e528ab38753 100644 --- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaApi.java +++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaApi.java @@ -28,20 +28,35 @@ public class AmazonLambdaApi { public static final String API_PATH_ERROR = "/error"; public static final String API_PATH_RESPONSE = "/response"; - static URL invocationNext() throws MalformedURLException { - return new URL(API_PROTOCOL + runtimeApi() + API_PATH_INVOCATION_NEXT); + // Only available in dev/test mode and points to path for mock even tserver + public static final String API_BASE_PATH_TEST = "/_lambda_"; + public static final String POST_EVENT = API_BASE_PATH_TEST; + + // this is quarkus specific endpoint for dev mode + public static final String API_PATH_REQUEUE = "/requeue"; + + static String baseUrl() { + return API_PROTOCOL + runtimeApi(); + } + + static URL invocationNext(String baseUrl) throws MalformedURLException { + return new URL(baseUrl + API_PATH_INVOCATION_NEXT); } - static URL invocationError(String requestId) throws MalformedURLException { - return new URL(API_PROTOCOL + runtimeApi() + API_PATH_INVOCATION + requestId + API_PATH_ERROR); + static URL invocationError(String baseUrl, String requestId) throws MalformedURLException { + return new URL(baseUrl + API_PATH_INVOCATION + requestId + API_PATH_ERROR); } - static URL invocationResponse(String requestId) throws MalformedURLException { - return new URL(API_PROTOCOL + runtimeApi() + API_PATH_INVOCATION + requestId + API_PATH_RESPONSE); + static URL invocationResponse(String baseUrl, String requestId) throws MalformedURLException { + return new URL(baseUrl + API_PATH_INVOCATION + requestId + API_PATH_RESPONSE); } - static URL initError() throws MalformedURLException { - return new URL(API_PROTOCOL + runtimeApi() + API_PATH_INIT_ERROR); + static URL requeue(String baseUrl, String requestId) throws MalformedURLException { + return new URL(baseUrl + API_PATH_INVOCATION + requestId + API_PATH_REQUEUE); + } + + static URL initError(String baseUrl) throws MalformedURLException { + return new URL(baseUrl + API_PATH_INIT_ERROR); } static String logGroupName() { @@ -64,6 +79,10 @@ static String functionVersion() { return System.getenv("AWS_LAMBDA_FUNCTION_VERSION"); } + public static boolean isTestMode() { + return System.getProperty(AmazonLambdaApi.QUARKUS_INTERNAL_AWS_LAMBDA_TEST_API) != null; + } + private static String runtimeApi() { String testApi = System.getProperty(QUARKUS_INTERNAL_AWS_LAMBDA_TEST_API); if (testApi != null) { diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonOutputWriter.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonOutputWriter.java index d950a57f741cf5..137e8c75461059 100644 --- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonOutputWriter.java +++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonOutputWriter.java @@ -2,6 +2,7 @@ import java.io.IOException; import java.io.OutputStream; +import java.net.HttpURLConnection; import com.fasterxml.jackson.databind.ObjectWriter; @@ -16,4 +17,10 @@ public JacksonOutputWriter(ObjectWriter writer) { public void writeValue(OutputStream os, Object obj) throws IOException { writer.writeValue(os, obj); } + + @Override + public void writeHeaders(HttpURLConnection conn) { + conn.setRequestProperty("Content-Type", "application/json"); + } + } diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaBuildTimeConfig.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaBuildTimeConfig.java deleted file mode 100644 index 3af310748aa107..00000000000000 --- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaBuildTimeConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.quarkus.amazon.lambda.runtime; - -import io.quarkus.runtime.annotations.ConfigItem; -import io.quarkus.runtime.annotations.ConfigPhase; -import io.quarkus.runtime.annotations.ConfigRoot; - -/** - * - */ -@ConfigRoot(phase = ConfigPhase.BUILD_TIME) -public class LambdaBuildTimeConfig { - - /** - * If true, this will enable the aws event poll loop within a Quarkus test run. This loop normally only runs in native - * image. This option is strictly for testing purposes. - * - */ - @ConfigItem - public boolean enablePollingJvmMode; -} diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaHotReplacementRecorder.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaHotReplacementRecorder.java new file mode 100644 index 00000000000000..8e187d637adad4 --- /dev/null +++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaHotReplacementRecorder.java @@ -0,0 +1,49 @@ +package io.quarkus.amazon.lambda.runtime; + +import org.jboss.logging.Logger; + +import io.quarkus.dev.console.DevConsoleManager; +import io.quarkus.dev.spi.HotReplacementContext; +import io.quarkus.runtime.annotations.Recorder; + +@Recorder +public class LambdaHotReplacementRecorder { + private static final Logger log = Logger.getLogger(LambdaHotReplacementRecorder.class); + + static volatile long nextUpdate; + public static volatile boolean enabled; + private static final long HOT_REPLACEMENT_INTERVAL = 2000; + + static Object syncLock = new Object(); + + public static boolean checkHotReplacement() throws Exception { + if (!enabled) + return false; + HotReplacementContext hotReplacementContext = DevConsoleManager.getHotReplacementContext(); + if (hotReplacementContext == null) + return false; + + if ((nextUpdate > System.currentTimeMillis() && !hotReplacementContext.isTest())) { + if (hotReplacementContext.getDeploymentProblem() != null) { + throw new Exception("Hot Replacement Deployment issue", hotReplacementContext.getDeploymentProblem()); + } + return false; + } + synchronized (syncLock) { + if (nextUpdate < System.currentTimeMillis() || hotReplacementContext.isTest()) { + nextUpdate = System.currentTimeMillis() + HOT_REPLACEMENT_INTERVAL; + try { + boolean restart = hotReplacementContext.doScan(true); + return restart; + } catch (Exception e) { + throw new IllegalStateException("Unable to perform live reload scanning", e); + } + } + } + return false; + } + + public void enable() { + enabled = true; + } +} diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaOutputWriter.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaOutputWriter.java index d9de5be4e9ff08..a0895ab5302277 100644 --- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaOutputWriter.java +++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaOutputWriter.java @@ -2,7 +2,11 @@ import java.io.IOException; import java.io.OutputStream; +import java.net.HttpURLConnection; public interface LambdaOutputWriter { void writeValue(OutputStream os, Object obj) throws IOException; + + default void writeHeaders(HttpURLConnection conn) { + } } diff --git a/extensions/amazon-lambda/deployment/pom.xml b/extensions/amazon-lambda/deployment/pom.xml index 6748ee9112fa6e..8e5df28f1b6d4b 100644 --- a/extensions/amazon-lambda/deployment/pom.xml +++ b/extensions/amazon-lambda/deployment/pom.xml @@ -35,6 +35,11 @@ quarkus-junit5-internal test + + io.quarkus + quarkus-junit5 + test + diff --git a/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java b/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java index 128109ea225234..b755f0aae7f7b2 100644 --- a/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java +++ b/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java @@ -24,7 +24,6 @@ import io.quarkus.amazon.lambda.runtime.AmazonLambdaRecorder; import io.quarkus.amazon.lambda.runtime.FunctionError; -import io.quarkus.amazon.lambda.runtime.LambdaBuildTimeConfig; import io.quarkus.amazon.lambda.runtime.LambdaConfig; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.BeanContainerBuildItem; @@ -248,13 +247,12 @@ void startPoolLoop(AmazonLambdaRecorder recorder, @BuildStep @Record(value = ExecutionTime.RUNTIME_INIT) - void enableNativeEventLoop(LambdaBuildTimeConfig config, - AmazonLambdaRecorder recorder, + void startPoolLoopDevOrTest(AmazonLambdaRecorder recorder, List orderServicesFirst, // force some ordering of recorders ShutdownContextBuildItem shutdownContextBuildItem, LaunchModeBuildItem launchModeBuildItem) { LaunchMode mode = launchModeBuildItem.getLaunchMode(); - if (config.enablePollingJvmMode && mode.isDevOrTest()) { + if (mode.isDevOrTest()) { recorder.startPollLoop(shutdownContextBuildItem); } } diff --git a/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/GreetingLambda.java b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/GreetingLambda.java new file mode 100644 index 00000000000000..f62a7ef7eef955 --- /dev/null +++ b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/GreetingLambda.java @@ -0,0 +1,12 @@ +package io.quarkus.amazon.lambda.deployment.testing; + +import com.amazonaws.services.lambda.runtime.Context; +import com.amazonaws.services.lambda.runtime.RequestHandler; + +public class GreetingLambda implements RequestHandler { + + @Override + public String handleRequest(Person input, Context context) { + return "Hey " + input.getName(); + } +} diff --git a/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaDevServicesContinuousTestingTestCase.java b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaDevServicesContinuousTestingTestCase.java new file mode 100644 index 00000000000000..1565016006b699 --- /dev/null +++ b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaDevServicesContinuousTestingTestCase.java @@ -0,0 +1,49 @@ +package io.quarkus.amazon.lambda.deployment.testing; + +import java.util.function.Supplier; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.QuarkusDevModeTest; + +public class LambdaDevServicesContinuousTestingTestCase { + @RegisterExtension + public static QuarkusDevModeTest test = new QuarkusDevModeTest() + .setArchiveProducer(new Supplier() { + @Override + public JavaArchive get() { + return ShrinkWrap.create(JavaArchive.class) + .addClasses(GreetingLambda.class, Person.class) + .addAsResource(new StringAsset(ContinuousTestingTestUtils.appProperties("")), + "application.properties"); + } + }).setTestArchiveProducer(new Supplier() { + @Override + public JavaArchive get() { + return ShrinkWrap.create(JavaArchive.class).addClass(LambdaHandlerET.class); + } + }); + + @Test + public void testLambda() throws Exception { + ContinuousTestingTestUtils utils = new ContinuousTestingTestUtils(); + var result = utils.waitForNextCompletion(); + Assertions.assertEquals(1, result.getTotalTestsPassed()); + Assertions.assertEquals(0, result.getTotalTestsFailed()); + test.modifySourceFile(GreetingLambda.class, s -> s.replace("Hey", "Yo")); + result = utils.waitForNextCompletion(); + Assertions.assertEquals(0, result.getTotalTestsPassed()); + Assertions.assertEquals(1, result.getTotalTestsFailed()); + test.modifyTestSourceFile(LambdaHandlerET.class, s -> s.replace("Hey", "Yo")); + result = utils.waitForNextCompletion(); + Assertions.assertEquals(1, result.getTotalTestsPassed()); + Assertions.assertEquals(0, result.getTotalTestsFailed()); + + } +} diff --git a/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaHandlerET.java b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaHandlerET.java new file mode 100644 index 00000000000000..e37e209b3c221f --- /dev/null +++ b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaHandlerET.java @@ -0,0 +1,31 @@ +package io.quarkus.amazon.lambda.deployment.testing; + +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.containsString; + +import org.junit.jupiter.api.Test; + +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest +class LambdaHandlerET { + + @Test + public void testSimpleLambdaSuccess() throws Exception { + // you test your lambas by invoking on http://localhost:8081 + // this works in dev mode too + + Person in = new Person(); + in.setName("Stu"); + given() + .contentType("application/json") + .accept("application/json") + .body(in) + .when() + .post() + .then() + .statusCode(200) + .body(containsString("Hey Stu")); + } + +} diff --git a/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/Person.java b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/Person.java new file mode 100644 index 00000000000000..d2a4066a77dc29 --- /dev/null +++ b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/Person.java @@ -0,0 +1,15 @@ +package io.quarkus.amazon.lambda.deployment.testing; + +public class Person { + + private String name; + + public String getName() { + return name; + } + + public Person setName(String name) { + this.name = name; + return this; + } +} diff --git a/extensions/amazon-lambda/event-server/pom.xml b/extensions/amazon-lambda/event-server/pom.xml new file mode 100644 index 00000000000000..9c2b5daf911e1b --- /dev/null +++ b/extensions/amazon-lambda/event-server/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + + io.quarkus + quarkus-amazon-lambda-parent + 999-SNAPSHOT + ../pom.xml + + + quarkus-amazon-lambda-event-server + Quarkus - Amazon Lambda Event Server + Mock Lambda event server for testing and dev mode + + + + io.vertx + vertx-web + + + com.fasterxml.jackson.core + jackson-databind + + + + + io.quarkus + quarkus-amazon-lambda-common + + + org.junit.jupiter + junit-jupiter + test + + + org.jboss.resteasy + resteasy-client + test + + + commons-logging + commons-logging + + + jakarta.activation + jakarta.activation-api + + + + + + io.quarkus + quarkus-apache-httpclient + test + + + io.rest-assured + rest-assured + test + + + + + + + + diff --git a/extensions/amazon-lambda/event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockEventServer.java b/extensions/amazon-lambda/event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockEventServer.java new file mode 100644 index 00000000000000..cea6dfd37e2315 --- /dev/null +++ b/extensions/amazon-lambda/event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockEventServer.java @@ -0,0 +1,240 @@ +package io.quarkus.amazon.lambda.runtime; + +import java.io.Closeable; +import java.io.IOException; +import java.util.UUID; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.jboss.logging.Logger; + +import io.vertx.core.Vertx; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpServer; +import io.vertx.ext.web.Router; +import io.vertx.ext.web.RoutingContext; +import io.vertx.ext.web.handler.BodyHandler; + +public class MockEventServer implements Closeable { + protected static final Logger log = Logger.getLogger(MockEventServer.class); + public static final int DEFAULT_PORT = 8081; + + public void start() { + int port = DEFAULT_PORT; + start(port); + } + + public void start(int port) { + this.port = port; + vertx = Vertx.vertx(); + httpServer = vertx.createHttpServer(); + router = Router.router(vertx); + setupRoutes(); + httpServer.requestHandler(router).listen(port).result(); + log.info("Mock Lambda Event Server Started"); + } + + private Vertx vertx; + private int port; + protected HttpServer httpServer; + protected Router router; + protected BlockingQueue queue; + protected ConcurrentHashMap responsePending = new ConcurrentHashMap<>(); + protected ExecutorService blockingPool = Executors.newCachedThreadPool(); + public static final String BASE_PATH = AmazonLambdaApi.API_BASE_PATH_TEST; + public static final String INVOCATION = BASE_PATH + AmazonLambdaApi.API_PATH_INVOCATION; + public static final String NEXT_INVOCATION = BASE_PATH + AmazonLambdaApi.API_PATH_INVOCATION_NEXT; + public static final String POST_EVENT = BASE_PATH; + + public MockEventServer() { + queue = new LinkedBlockingQueue<>(); + } + + public HttpServer getHttpServer() { + return httpServer; + } + + public void setupRoutes() { + router.route().handler(BodyHandler.create()); + router.post(POST_EVENT).handler(this::postEvent); + router.route(NEXT_INVOCATION).blockingHandler(this::nextEvent); + router.route(INVOCATION + ":requestId" + AmazonLambdaApi.API_PATH_REQUEUE).handler(this::handleRequeue); + router.route(INVOCATION + ":requestId" + AmazonLambdaApi.API_PATH_RESPONSE).handler(this::handleResponse); + router.route(INVOCATION + ":requestId" + AmazonLambdaApi.API_PATH_ERROR).handler(this::handleError); + defaultHanderSetup(); + } + + protected void defaultHanderSetup() { + router.post().handler(this::postEvent); + } + + public void postEvent(RoutingContext ctx) { + String requestId = ctx.request().getHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (requestId == null) { + requestId = UUID.randomUUID().toString(); + } + ctx.put(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID, requestId); + String traceId = ctx.request().getHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (traceId == null) { + traceId = UUID.randomUUID().toString(); + } + ctx.put(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY, traceId); + try { + queue.put(ctx); + } catch (InterruptedException e) { + log.error("Publish interrupted"); + ctx.fail(500); + } + } + + private RoutingContext pollNextEvent() throws InterruptedException { + for (;;) { + RoutingContext request = queue.poll(10, TimeUnit.MILLISECONDS); + if (request != null) + return request; + + } + } + + public void nextEvent(RoutingContext ctx) { + // Vert.x barfs if you block too long so we have our own executor + blockingPool.execute(() -> { + final AtomicBoolean closed = new AtomicBoolean(false); + ctx.response().closeHandler((v) -> closed.set(true)); + RoutingContext request = null; + try { + for (;;) { + request = queue.poll(10, TimeUnit.MILLISECONDS); + if (request != null) { + if (closed.get()) { + queue.put(request); + return; + } else { + break; + } + } else if (closed.get()) { + return; + } + } + } catch (InterruptedException e) { + log.error("nextEvent interrupted"); + ctx.fail(500); + } + + String contentType = getEventContentType(request); + if (contentType != null) { + ctx.response().putHeader("content-type", contentType); + } + String traceId = request.get(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY); + if (traceId != null) { + ctx.response().putHeader(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY, traceId); + } + String requestId = request.get(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + responsePending.put(requestId, request); + ctx.response().putHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID, requestId); + Buffer body = processEventBody(request); + if (body != null) { + ctx.response().setStatusCode(200).end(body); + } else { + ctx.response().setStatusCode(200).end(); + } + }); + } + + protected String getEventContentType(RoutingContext request) { + return request.request().getHeader("content-type"); + } + + protected Buffer processEventBody(RoutingContext request) { + return request.getBody(); + } + + public void handleResponse(RoutingContext ctx) { + String requestId = ctx.pathParam("requestId"); + RoutingContext pending = responsePending.remove(requestId); + if (pending == null) { + log.error("Unknown lambda request: " + requestId); + ctx.fail(404); + return; + } + Buffer buffer = ctx.getBody(); + processResponse(ctx, pending, buffer); + ctx.response().setStatusCode(204); + ctx.end(); + } + + public void handleRequeue(RoutingContext ctx) { + String requestId = ctx.pathParam("requestId"); + RoutingContext pending = responsePending.remove(requestId); + if (pending == null) { + log.error("Unknown lambda request: " + requestId); + ctx.fail(404); + return; + } + try { + queue.put(pending); + } catch (InterruptedException e) { + log.error("Publish interrupted"); + ctx.fail(500); + } + ctx.response().setStatusCode(204); + ctx.end(); + } + + public void processResponse(RoutingContext ctx, RoutingContext pending, Buffer buffer) { + if (buffer != null) { + if (ctx.request().getHeader("Content-Type") != null) { + pending.response().putHeader("Content-Type", ctx.request().getHeader("Content-Type")); + } + pending.response() + .setStatusCode(200) + .end(buffer); + } else { + pending.response() + .setStatusCode(204) + .end(); + } + } + + public void handleError(RoutingContext ctx) { + String requestId = ctx.pathParam("requestId"); + RoutingContext pending = responsePending.remove(requestId); + if (pending == null) { + log.error("Unknown lambda request: " + requestId); + ctx.fail(404); + return; + } + Buffer buffer = ctx.getBody(); + processError(ctx, pending, buffer); + ctx.response().setStatusCode(204); + ctx.end(); + } + + public void processError(RoutingContext ctx, RoutingContext pending, Buffer buffer) { + if (buffer != null) { + if (ctx.request().getHeader("Content-Type") != null) { + pending.response().putHeader("Content-Type", ctx.request().getHeader("Content-Type")); + } + pending.response() + .setStatusCode(500) + .end(buffer); + } else { + pending.response() + .setStatusCode(500) + .end(); + } + } + + @Override + public void close() throws IOException { + log.info("Stopping Mock Lambda Event Server"); + httpServer.close().result(); + vertx.close().result(); + blockingPool.shutdown(); + } +} diff --git a/extensions/amazon-lambda/event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java b/extensions/amazon-lambda/event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java new file mode 100644 index 00000000000000..d6f98929b281d9 --- /dev/null +++ b/extensions/amazon-lambda/event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java @@ -0,0 +1,66 @@ +package io.quarkus.amazon.lambda.runtime; + +import java.util.concurrent.Future; + +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.Response; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +public class EventServerTest { + + static MockEventServer server; + + @BeforeAll + public static void start() { + server = new MockEventServer(); + server.start(); + } + + @AfterAll + public static void end() throws Exception { + server.close(); + } + + @Test + public void testServer() throws Exception { + Client client = ClientBuilder.newBuilder().build(); + WebTarget base = client.target("http://localhost:" + MockEventServer.DEFAULT_PORT); + WebTarget postEvent = base.path(MockEventServer.POST_EVENT); + // test posting event works at '/_lambda' + invokeTest(base, postEvent); + // make sure posting event works on '/' + invokeTest(base, base); + } + + private void invokeTest(WebTarget base, WebTarget postEvent) + throws InterruptedException, java.util.concurrent.ExecutionException { + Future lambdaInvoke = postEvent.request().async().post(Entity.json("\"hello\"")); + + Response next = base.path(MockEventServer.NEXT_INVOCATION).request().get(); + Assertions.assertEquals(200, next.getStatus()); + String requestId = next.getHeaderString(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + String traceId = next.getHeaderString(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY); + Assertions.assertNotNull(requestId); + Assertions.assertNotNull(traceId); + String json = next.readEntity(String.class); + Assertions.assertEquals("\"hello\"", json); + next.close(); + + Response sendResponse = base.path(MockEventServer.INVOCATION).path(requestId).path("response") + .request().post(Entity.json("\"good day\"")); + Assertions.assertEquals(204, sendResponse.getStatus()); + sendResponse.close(); + + Response lambdaResponse = lambdaInvoke.get(); + Assertions.assertEquals(200, lambdaResponse.getStatus()); + Assertions.assertEquals("\"good day\"", lambdaResponse.readEntity(String.class)); + lambdaResponse.close(); + } +} diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/build.gradle b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/build.gradle index a003f1174cfd5a..0609366f7346e9 100644 --- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/build.gradle +++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/build.gradle @@ -10,10 +10,8 @@ repositories { dependencies { implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") - implementation 'io.quarkus:quarkus-resteasy' implementation 'io.quarkus:quarkus-amazon-lambda' - testImplementation "io.quarkus:quarkus-test-amazon-lambda" testImplementation 'io.quarkus:quarkus-junit5' testImplementation 'io.rest-assured:rest-assured' } diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml index b617576bb157ab..732ec60ca31e72 100644 --- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml +++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml @@ -36,8 +36,8 @@ quarkus-amazon-lambda - io.quarkus - quarkus-test-amazon-lambda + io.rest-assured + rest-assured test diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/java/LambdaHandlerTest.java b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/java/LambdaHandlerTest.java index 4f89d941f2b53b..69dc8f5452ba7c 100644 --- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/java/LambdaHandlerTest.java +++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/java/LambdaHandlerTest.java @@ -1,22 +1,31 @@ package ${package}; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.quarkus.amazon.lambda.test.LambdaClient; import io.quarkus.test.junit.QuarkusTest; +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.containsString; + @QuarkusTest public class LambdaHandlerTest { @Test public void testSimpleLambdaSuccess() throws Exception { - InputObject in = new InputObject(); - in.setGreeting("Hello"); + // you test your lambas by invoking on http://localhost:8081 + // this works in dev mode too + + Person in = new Person(); in.setName("Stu"); - OutputObject out = LambdaClient.invoke(OutputObject.class, in); - Assertions.assertEquals("Hello Stu", out.getResult()); - Assertions.assertTrue(out.getRequestId().matches("aws-request-\\d"), "Expected requestId as 'aws-request-'"); + given() + .contentType("application/json") + .accept("application/json") + .body(in) + .when() + .post() + .then() + .statusCode(200) + .body(containsString("Hello Stu")); } } diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/resources/application.properties b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/resources/application.properties index 7c37ee7b060a83..6be7ba734f7956 100644 --- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/resources/application.properties +++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/resources/application.properties @@ -1,5 +1,2 @@ quarkus.lambda.handler=test -quarkus.lambda.enable-polling-jvm-mode=true - - diff --git a/extensions/amazon-lambda/pom.xml b/extensions/amazon-lambda/pom.xml index 71ccac1880aee3..ee3640b9fbf348 100644 --- a/extensions/amazon-lambda/pom.xml +++ b/extensions/amazon-lambda/pom.xml @@ -17,6 +17,7 @@ common-runtime + event-server common-deployment runtime deployment diff --git a/extensions/funqy/funqy-amazon-lambda/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/FunqyLambdaBuildStep.java b/extensions/funqy/funqy-amazon-lambda/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/FunqyLambdaBuildStep.java index f6b374d81e519b..82887800d171c2 100644 --- a/extensions/funqy/funqy-amazon-lambda/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/FunqyLambdaBuildStep.java +++ b/extensions/funqy/funqy-amazon-lambda/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/FunqyLambdaBuildStep.java @@ -7,7 +7,6 @@ import java.util.Optional; import io.quarkus.amazon.lambda.deployment.LambdaObjectMapperInitializedBuildItem; -import io.quarkus.amazon.lambda.runtime.LambdaBuildTimeConfig; import io.quarkus.arc.deployment.BeanContainerBuildItem; import io.quarkus.builder.item.SimpleBuildItem; import io.quarkus.deployment.annotations.BuildProducer; @@ -67,14 +66,13 @@ public void startPoolLoop(FunqyLambdaBindingRecorder recorder, @BuildStep @Record(RUNTIME_INIT) - public void enableNativeEventLoop(LambdaBuildTimeConfig config, - RuntimeComplete ignored, + public void startPoolLoopDevOrTest(RuntimeComplete ignored, FunqyLambdaBindingRecorder recorder, List orderServicesFirst, // force some ordering of recorders ShutdownContextBuildItem shutdownContextBuildItem, LaunchModeBuildItem launchModeBuildItem) { LaunchMode mode = launchModeBuildItem.getLaunchMode(); - if (config.enablePollingJvmMode && mode.isDevOrTest()) { + if (mode.isDevOrTest()) { recorder.startPollLoop(shutdownContextBuildItem); } } diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/RequireVirtualHttpBuildItem.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/RequireVirtualHttpBuildItem.java index 7e0046c2d1f541..a6f43103b6b912 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/RequireVirtualHttpBuildItem.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/RequireVirtualHttpBuildItem.java @@ -6,5 +6,16 @@ * Marker class to turn on virtual http channel */ public final class RequireVirtualHttpBuildItem extends SimpleBuildItem { - public static final RequireVirtualHttpBuildItem MARKER = new RequireVirtualHttpBuildItem(); + public static final RequireVirtualHttpBuildItem MARKER = new RequireVirtualHttpBuildItem(false); + public static final RequireVirtualHttpBuildItem ALWAYS_VIRTUAL = new RequireVirtualHttpBuildItem(true); + + private boolean alwaysVirtual; + + private RequireVirtualHttpBuildItem(boolean alwaysVirtual) { + this.alwaysVirtual = alwaysVirtual; + } + + public boolean isAlwaysVirtual() { + return alwaysVirtual; + } } diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java index a1ef76ed0c7c73..08f032956fb343 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java @@ -290,8 +290,8 @@ void openSocket(ApplicationStartBuildItem start, reflectiveClass .produce(new ReflectiveClassBuildItem(true, false, false, VirtualServerChannel.class)); } - // start http socket in dev/test mode even if virtual http is required - boolean startSocket = !startVirtual || launchMode.getLaunchMode() != LaunchMode.NORMAL; + boolean startSocket = (!startVirtual || launchMode.getLaunchMode() != LaunchMode.NORMAL) + && (requireVirtual.isEmpty() || !requireVirtual.get().isAlwaysVirtual()); recorder.startServer(vertx.getVertx(), shutdown, httpBuildTimeConfig, httpConfiguration, launchMode.getLaunchMode(), startVirtual, startSocket, eventLoopCount.getEventLoopCount(), diff --git a/integration-tests/amazon-lambda-http-resteasy/pom.xml b/integration-tests/amazon-lambda-http-resteasy/pom.xml index 1b1b102f9b5bf8..062c285f3afe37 100644 --- a/integration-tests/amazon-lambda-http-resteasy/pom.xml +++ b/integration-tests/amazon-lambda-http-resteasy/pom.xml @@ -28,6 +28,7 @@ quarkus-junit5 test + io.quarkus quarkus-test-amazon-lambda diff --git a/integration-tests/amazon-lambda-http-resteasy/src/main/resources/application.properties b/integration-tests/amazon-lambda-http-resteasy/src/main/resources/application.properties index 92b4d0d030efee..7b3ccfbd22691e 100644 --- a/integration-tests/amazon-lambda-http-resteasy/src/main/resources/application.properties +++ b/integration-tests/amazon-lambda-http-resteasy/src/main/resources/application.properties @@ -1,3 +1 @@ -quarkus.lambda.enable-polling-jvm-mode=true quarkus.lambda-http.enable-security=true -quarkus.http.virtual=true diff --git a/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java index 2086d4be41fd4f..b69b2b6a3ac8d8 100644 --- a/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java +++ b/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java @@ -17,6 +17,9 @@ @QuarkusTest public class AmazonLambdaSimpleTestCase { + // TODO: This is using the old deprecated LambdaClient test API. I am keeping it here to test backward compatibility + // these tests will need to be ported once LambdaClient is removed from Quarkus. + @Test public void testCustomIDPSecurityContext() throws Exception { APIGatewayV2HTTPEvent request = request("/security/username"); diff --git a/integration-tests/amazon-lambda-http/pom.xml b/integration-tests/amazon-lambda-http/pom.xml index 62ce64d02e22fe..7b8a1a74ab6ac6 100644 --- a/integration-tests/amazon-lambda-http/pom.xml +++ b/integration-tests/amazon-lambda-http/pom.xml @@ -45,8 +45,8 @@ test - io.quarkus - quarkus-test-amazon-lambda + io.rest-assured + rest-assured test diff --git a/integration-tests/amazon-lambda-http/src/main/resources/application.properties b/integration-tests/amazon-lambda-http/src/main/resources/application.properties index d16f99844778da..b5ab6f51a3ef5c 100644 --- a/integration-tests/amazon-lambda-http/src/main/resources/application.properties +++ b/integration-tests/amazon-lambda-http/src/main/resources/application.properties @@ -1,4 +1,2 @@ -quarkus.lambda.enable-polling-jvm-mode=true -quarkus.http.virtual=true quarkus.lambda-http.enable-security=true quarkus.swagger-ui.always-include=true diff --git a/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java index 1bf83981f24d71..6287797bf1a282 100644 --- a/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java +++ b/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java @@ -1,19 +1,22 @@ package io.quarkus.it.amazon.lambda; +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; + +import java.util.Arrays; import java.util.HashMap; import javax.ws.rs.core.MediaType; -import org.apache.commons.codec.binary.Base64; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; -import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse; -import io.quarkus.amazon.lambda.test.LambdaClient; +import io.quarkus.amazon.lambda.runtime.AmazonLambdaApi; import io.quarkus.test.junit.QuarkusTest; @QuarkusTest @@ -21,13 +24,11 @@ public class AmazonLambdaSimpleTestCase { @Test public void testContext() throws Exception { - APIGatewayV2HTTPEvent request = new APIGatewayV2HTTPEvent(); - request.setRawPath("/hello/context"); - request.setRequestContext(new APIGatewayV2HTTPEvent.RequestContext()); - request.getRequestContext().setHttp(new APIGatewayV2HTTPEvent.RequestContext.Http()); - request.getRequestContext().getHttp().setMethod("GET"); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 204); + given() + .when() + .get("/hello/context") + .then() + .statusCode(204); } @Test @@ -37,9 +38,16 @@ public void testJaxrsCognitoJWTSecurityContext() throws Exception { request.getRequestContext().getAuthorizer().setJwt(new APIGatewayV2HTTPEvent.RequestContext.Authorizer.JWT()); request.getRequestContext().getAuthorizer().getJwt().setClaims(new HashMap<>()); request.getRequestContext().getAuthorizer().getJwt().getClaims().put("cognito:username", "Bill"); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertEquals(body(out), "Bill"); + + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post(AmazonLambdaApi.API_BASE_PATH_TEST) + .then() + .statusCode(200) + .body("body", equalTo("Bill")); } @Test @@ -48,9 +56,15 @@ public void testJaxrsIAMSecurityContext() throws Exception { request.getRequestContext().setAuthorizer(new APIGatewayV2HTTPEvent.RequestContext.Authorizer()); request.getRequestContext().getAuthorizer().setIam(new APIGatewayV2HTTPEvent.RequestContext.IAM()); request.getRequestContext().getAuthorizer().getIam().setUserId("Bill"); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertEquals(body(out), "Bill"); + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post(AmazonLambdaApi.API_BASE_PATH_TEST) + .then() + .statusCode(200) + .body("body", equalTo("Bill")); } @Test @@ -59,9 +73,15 @@ public void testJaxrsCustomLambdaSecurityContext() throws Exception { request.getRequestContext().setAuthorizer(new APIGatewayV2HTTPEvent.RequestContext.Authorizer()); request.getRequestContext().getAuthorizer().setLambda(new HashMap<>()); request.getRequestContext().getAuthorizer().getLambda().put("principalId", "Bill"); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertEquals(body(out), "Bill"); + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post(AmazonLambdaApi.API_BASE_PATH_TEST) + .then() + .statusCode(200) + .body("body", equalTo("Bill")); } @Test @@ -71,9 +91,15 @@ public void testServletCognitoJWTSecurityContext() throws Exception { request.getRequestContext().getAuthorizer().setJwt(new APIGatewayV2HTTPEvent.RequestContext.Authorizer.JWT()); request.getRequestContext().getAuthorizer().getJwt().setClaims(new HashMap<>()); request.getRequestContext().getAuthorizer().getJwt().getClaims().put("cognito:username", "Bill"); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertEquals(body(out), "Bill"); + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post(AmazonLambdaApi.API_BASE_PATH_TEST) + .then() + .statusCode(200) + .body("body", equalTo("Bill")); } @Test @@ -83,40 +109,59 @@ public void testVertxCognitoJWTSecurityContext() throws Exception { request.getRequestContext().getAuthorizer().setJwt(new APIGatewayV2HTTPEvent.RequestContext.Authorizer.JWT()); request.getRequestContext().getAuthorizer().getJwt().setClaims(new HashMap<>()); request.getRequestContext().getAuthorizer().getJwt().getClaims().put("cognito:username", "Bill"); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertEquals(body(out), "Bill"); + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post(AmazonLambdaApi.API_BASE_PATH_TEST) + .then() + .statusCode(200) + .body("body", equalTo("Bill")); + } + + @Test + public void testSwaggerUi() throws Exception { + given() + .when() + .get("/q/swagger-ui/") + .then() + .statusCode(200) + .body(containsString("OpenAPI UI")); } @Test public void testGetText() throws Exception { + testGetTextByEvent("/vertx/hello"); + testGetTextByEvent("/servlet/hello"); + testGetTextByEvent("/hello"); testGetText("/vertx/hello"); testGetText("/servlet/hello"); testGetText("/hello"); } - @Test - public void testSwaggerUi() throws Exception { - // this tests the FileRegion support in the handler - APIGatewayV2HTTPEvent request = request("/q/swagger-ui/"); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertTrue(body(out).contains("OpenAPI UI")); - - } - - private String body(APIGatewayV2HTTPResponse response) { - if (!response.getIsBase64Encoded()) - return response.getBody(); - return new String(Base64.decodeBase64(response.getBody())); + private void testGetTextByEvent(String path) { + APIGatewayV2HTTPEvent request = request(path); + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post(AmazonLambdaApi.API_BASE_PATH_TEST) + .then() + .statusCode(200) + .body("body", equalTo("hello")) + .body("headers.Content-Type", containsString("text/plain")); } private void testGetText(String path) { - APIGatewayV2HTTPEvent request = request(path); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertEquals(body(out), "hello"); - Assertions.assertTrue(out.getHeaders().get("Content-Type").startsWith("text/plain")); + given() + .when() + .get(path) + .then() + .statusCode(200) + .header("Content-Type", containsString("text/plain")) + .body(equalTo("hello")); } private APIGatewayV2HTTPEvent request(String path) { @@ -130,80 +175,101 @@ private APIGatewayV2HTTPEvent request(String path) { @Test public void test404() throws Exception { - APIGatewayV2HTTPEvent request = request("/nowhere"); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 404); + given() + .when() + .get("/nowhere") + .then() + .statusCode(404); } @Test public void testPostText() throws Exception { + testPostTextByEvent("/hello"); + testPostTextByEvent("/servlet/hello"); + testPostTextByEvent("/vertx/hello"); testPostText("/hello"); testPostText("/servlet/hello"); testPostText("/vertx/hello"); } - private void testPostText(String path) { + private void testPostTextByEvent(String path) { APIGatewayV2HTTPEvent request = request(path); request.getRequestContext().getHttp().setMethod("POST"); request.setHeaders(new HashMap<>()); request.getHeaders().put("Content-Type", "text/plain"); request.setBody("Bill"); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertEquals(body(out), "hello Bill"); - Assertions.assertTrue(out.getHeaders().get("Content-Type").startsWith("text/plain")); + + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post(AmazonLambdaApi.API_BASE_PATH_TEST) + .then() + .statusCode(200) + .body("body", equalTo("hello Bill")) + .body("headers.Content-Type", containsString("text/plain")); + } + + private void testPostText(String path) { + given() + .contentType("text/plain") + .body("Bill") + .when() + .post(path) + .then() + .statusCode(200) + .header("Content-Type", containsString("text/plain")) + .body(equalTo("hello Bill")); } @Test public void testPostBinary() throws Exception { byte[] bytes = { 0, 1, 2, 3 }; - String body = Base64.encodeBase64String(bytes); - APIGatewayV2HTTPEvent request = request("/hello"); - request.getRequestContext().getHttp().setMethod("POST"); - request.setHeaders(new HashMap<>()); - request.getHeaders().put("Content-Type", MediaType.APPLICATION_OCTET_STREAM); - request.setBody(body); - request.setIsBase64Encoded(true); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertEquals(out.getHeaders().get("Content-Type"), - MediaType.APPLICATION_OCTET_STREAM); - Assertions.assertTrue(out.getIsBase64Encoded()); - byte[] rtn = Base64.decodeBase64(out.getBody()); - Assertions.assertEquals(rtn[0], 4); - Assertions.assertEquals(rtn[1], 5); - Assertions.assertEquals(rtn[2], 6); + byte[] resBytes = { 4, 5, 6 }; + byte[] result = given() + .contentType(MediaType.APPLICATION_OCTET_STREAM) + .body(bytes) + .when() + .post("hello") + .then() + .statusCode(200) + .header("Content-Type", containsString(MediaType.APPLICATION_OCTET_STREAM)) + .extract().asByteArray(); + Assertions.assertTrue(Arrays.equals(resBytes, result)); } @Test public void testPostEmpty() throws Exception { - APIGatewayV2HTTPEvent request = request("/hello/empty"); - request.getRequestContext().getHttp().setMethod("POST"); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 204); - + given() + .when() + .post("/hello/empty") + .then() + .statusCode(204); } @ParameterizedTest @ValueSource(strings = { "/funqy", "/funqyAsync" }) public void testFunqy(String path) { - APIGatewayV2HTTPEvent request = request(path); - request.getRequestContext().getHttp().setMethod("POST"); - request.setHeaders(new HashMap<>()); - request.getHeaders().put("Content-Type", MediaType.APPLICATION_JSON); - request.setBody("\"Bill\""); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertEquals(body(out), "\"Make it funqy Bill\""); - Assertions.assertTrue(out.getHeaders().get("Content-Type").startsWith("application/json")); + given() + .contentType("application/json") + .accept("application/json") + .body("\"Bill\"") + .when() + .post(path) + .then() + .statusCode(200) + .header("Content-Type", containsString("application/json")) + .body(equalTo("\"Make it funqy Bill\"")); } @Test public void testProxyRequestContext() throws Exception { - APIGatewayV2HTTPEvent request = request("/hello/proxyRequestContext"); - APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 204); + given() + .when() + .get("/hello/proxyRequestContext") + .then() + .statusCode(204); } - } diff --git a/integration-tests/amazon-lambda-rest/pom.xml b/integration-tests/amazon-lambda-rest/pom.xml index cee1cbbf85a531..8f595271add45f 100644 --- a/integration-tests/amazon-lambda-rest/pom.xml +++ b/integration-tests/amazon-lambda-rest/pom.xml @@ -45,8 +45,8 @@ test - io.quarkus - quarkus-test-amazon-lambda + io.rest-assured + rest-assured test diff --git a/integration-tests/amazon-lambda-rest/src/main/resources/application.properties b/integration-tests/amazon-lambda-rest/src/main/resources/application.properties index d16f99844778da..b5ab6f51a3ef5c 100644 --- a/integration-tests/amazon-lambda-rest/src/main/resources/application.properties +++ b/integration-tests/amazon-lambda-rest/src/main/resources/application.properties @@ -1,4 +1,2 @@ -quarkus.lambda.enable-polling-jvm-mode=true -quarkus.http.virtual=true quarkus.lambda-http.enable-security=true quarkus.swagger-ui.always-include=true diff --git a/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java b/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java index b16ceefce0751b..1b237d62159006 100644 --- a/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java +++ b/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java @@ -1,5 +1,10 @@ package io.quarkus.it.amazon.lambda; +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.*; + +import java.util.Arrays; + import javax.ws.rs.core.MediaType; import org.apache.commons.codec.binary.Base64; @@ -15,7 +20,7 @@ import io.quarkus.amazon.lambda.http.model.AwsProxyResponse; import io.quarkus.amazon.lambda.http.model.CognitoAuthorizerClaims; import io.quarkus.amazon.lambda.http.model.Headers; -import io.quarkus.amazon.lambda.test.LambdaClient; +import io.quarkus.amazon.lambda.runtime.AmazonLambdaApi; import io.quarkus.test.junit.QuarkusTest; @QuarkusTest @@ -23,11 +28,11 @@ public class AmazonLambdaV1SimpleTestCase { @Test public void testContext() throws Exception { - AwsProxyRequest request = new AwsProxyRequest(); - request.setHttpMethod("GET"); - request.setPath("/hello/context"); - AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 204); + given() + .when() + .get("/hello/context") + .then() + .statusCode(204); } @Test @@ -38,9 +43,16 @@ public void testJaxrsSecurityIAM() throws Exception { request.setRequestContext(new AwsProxyRequestContext()); request.getRequestContext().setIdentity(new ApiGatewayRequestIdentity()); request.getRequestContext().getIdentity().setUser("Bill"); - AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertTrue(body(out).contains("Bill")); + + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post(AmazonLambdaApi.API_BASE_PATH_TEST) + .then() + .statusCode(200) + .body("body", equalTo("Bill")); } @Test @@ -51,9 +63,15 @@ public void testServletSecurityIAM() throws Exception { request.setRequestContext(new AwsProxyRequestContext()); request.getRequestContext().setIdentity(new ApiGatewayRequestIdentity()); request.getRequestContext().getIdentity().setUser("Bill"); - AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertTrue(body(out).contains("Bill")); + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post(AmazonLambdaApi.API_BASE_PATH_TEST) + .then() + .statusCode(200) + .body("body", equalTo("Bill")); } @Test @@ -65,9 +83,15 @@ public void testJaxrsCognitoSecurityContext() throws Exception { request.getRequestContext().setAuthorizer(new ApiGatewayAuthorizerContext()); request.getRequestContext().getAuthorizer().setClaims(new CognitoAuthorizerClaims()); request.getRequestContext().getAuthorizer().getClaims().setUsername("Bill"); - AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertTrue(body(out).contains("Bill")); + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post(AmazonLambdaApi.API_BASE_PATH_TEST) + .then() + .statusCode(200) + .body("body", equalTo("Bill")); } @Test @@ -78,26 +102,60 @@ public void testJaxrsCustomLambdaSecurityContext() throws Exception { request.setRequestContext(new AwsProxyRequestContext()); request.getRequestContext().setAuthorizer(new ApiGatewayAuthorizerContext()); request.getRequestContext().getAuthorizer().setPrincipalId("Bill"); - AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertTrue(body(out).contains("Bill")); + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post(AmazonLambdaApi.API_BASE_PATH_TEST) + .then() + .statusCode(200) + .body("body", equalTo("Bill")); } @Test public void testGetText() throws Exception { + testGetTextByEvent("/vertx/hello"); + testGetTextByEvent("/servlet/hello"); + testGetTextByEvent("/hello"); testGetText("/vertx/hello"); testGetText("/servlet/hello"); testGetText("/hello"); } + private void testGetTextByEvent(String path) { + AwsProxyRequest request = request(path); + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post(AmazonLambdaApi.API_BASE_PATH_TEST) + .then() + .statusCode(200) + .body("body", equalTo("hello")) + .body("multiValueHeaders.Content-Type", hasItem(containsString("text/plain"))); + } + + private void testGetText(String path) { + given() + .when() + .get(path) + .then() + .statusCode(200) + .header("Content-Type", containsString("text/plain")) + .body(equalTo("hello")); + } + @Test public void testSwaggerUi() throws Exception { // this tests the FileRegion support in the handler - AwsProxyRequest request = request("/q/swagger-ui/"); - AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertTrue(body(out).contains("OpenAPI UI")); - + given() + .when() + .get("/q/swagger-ui/") + .then() + .statusCode(200) + .body(containsString("OpenAPI UI")); } private String body(AwsProxyResponse response) { @@ -106,14 +164,6 @@ private String body(AwsProxyResponse response) { return new String(Base64.decodeBase64(response.getBody())); } - private void testGetText(String path) { - AwsProxyRequest request = request(path); - AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertEquals(body(out), "hello"); - Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("text/plain")); - } - private AwsProxyRequest request(String path) { AwsProxyRequest request = new AwsProxyRequest(); request.setHttpMethod("GET"); @@ -123,87 +173,103 @@ private AwsProxyRequest request(String path) { @Test public void test404() throws Exception { - AwsProxyRequest request = request("/nowhere"); - AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 404); + given() + .when() + .get("/nowhere") + .then() + .statusCode(404); } @Test public void testPostText() throws Exception { + testPostTextByEvent("/hello"); + testPostTextByEvent("/servlet/hello"); + testPostTextByEvent("/vertx/hello"); testPostText("/hello"); testPostText("/servlet/hello"); testPostText("/vertx/hello"); } - private void testPostText(String path) { + private void testPostTextByEvent(String path) { AwsProxyRequest request = new AwsProxyRequest(); request.setHttpMethod("POST"); request.setMultiValueHeaders(new Headers()); request.getMultiValueHeaders().add("Content-Type", "text/plain"); request.setPath(path); request.setBody("Bill"); - AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertEquals(body(out), "hello Bill"); - Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("text/plain")); + + given() + .contentType("application/json") + .accept("application/json") + .body(request) + .when() + .post(AmazonLambdaApi.API_BASE_PATH_TEST) + .then() + .statusCode(200) + .body("body", equalTo("hello Bill")) + .body("multiValueHeaders.Content-Type", hasItem(containsString("text/plain"))); + } + + private void testPostText(String path) { + given() + .contentType("text/plain") + .body("Bill") + .when() + .post(path) + .then() + .statusCode(200) + .header("Content-Type", containsString("text/plain")) + .body(equalTo("hello Bill")); } @Test public void testPostBinary() throws Exception { - AwsProxyRequest request = new AwsProxyRequest(); byte[] bytes = { 0, 1, 2, 3 }; - String body = Base64.encodeBase64String(bytes); - request.setHttpMethod("POST"); - request.setMultiValueHeaders(new Headers()); - request.getMultiValueHeaders().add("Content-Type", MediaType.APPLICATION_OCTET_STREAM); - request.setPath("/hello"); - request.setBody(body); - request.setIsBase64Encoded(true); - AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertEquals(out.getMultiValueHeaders().getFirst("Content-Type"), MediaType.APPLICATION_OCTET_STREAM); - Assertions.assertTrue(out.isBase64Encoded()); - byte[] rtn = Base64.decodeBase64(out.getBody()); - Assertions.assertEquals(rtn[0], 4); - Assertions.assertEquals(rtn[1], 5); - Assertions.assertEquals(rtn[2], 6); + byte[] resBytes = { 4, 5, 6 }; + byte[] result = given() + .contentType(MediaType.APPLICATION_OCTET_STREAM) + .body(bytes) + .when() + .post("hello") + .then() + .statusCode(200) + .header("Content-Type", containsString(MediaType.APPLICATION_OCTET_STREAM)) + .extract().asByteArray(); + Assertions.assertTrue(Arrays.equals(resBytes, result)); } @Test public void testPostEmpty() throws Exception { - AwsProxyRequest request = new AwsProxyRequest(); - request.setHttpMethod("POST"); - request.setMultiValueHeaders(new Headers()); - request.setPath("/hello/empty"); - AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 204); - + given() + .when() + .post("/hello/empty") + .then() + .statusCode(204); } @ParameterizedTest @ValueSource(strings = { "/funqy", "/funqyAsync" }) public void testFunqy(String path) { - AwsProxyRequest request = new AwsProxyRequest(); - request.setHttpMethod("POST"); - request.setMultiValueHeaders(new Headers()); - request.getMultiValueHeaders().add("Content-Type", "application/json"); - request.setPath(path); - request.setBody("\"Bill\""); - AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 200); - Assertions.assertEquals(body(out), "\"Make it funqy Bill\""); - Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("application/json")); + given() + .contentType("application/json") + .accept("application/json") + .body("\"Bill\"") + .when() + .post(path) + .then() + .statusCode(200) + .header("Content-Type", containsString("application/json")) + .body(equalTo("\"Make it funqy Bill\"")); } @Test public void testProxyRequestContext() throws Exception { - AwsProxyRequest request = new AwsProxyRequest(); - request.setRequestContext(new AwsProxyRequestContext()); - request.setHttpMethod("GET"); - request.setPath("/hello/proxyRequestContext"); - AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request); - Assertions.assertEquals(out.getStatusCode(), 204); + given() + .when() + .get("/hello/proxyRequestContext") + .then() + .statusCode(204); } } diff --git a/integration-tests/amazon-lambda/pom.xml b/integration-tests/amazon-lambda/pom.xml index 45bd0f3180a4fc..3194a0670c7f4a 100644 --- a/integration-tests/amazon-lambda/pom.xml +++ b/integration-tests/amazon-lambda/pom.xml @@ -29,8 +29,8 @@ test - io.quarkus - quarkus-test-amazon-lambda + io.rest-assured + rest-assured test diff --git a/integration-tests/amazon-lambda/src/main/resources/application.properties b/integration-tests/amazon-lambda/src/main/resources/application.properties index 647c5c1c59140a..984150ad856c8b 100644 --- a/integration-tests/amazon-lambda/src/main/resources/application.properties +++ b/integration-tests/amazon-lambda/src/main/resources/application.properties @@ -1,2 +1 @@ quarkus.lambda.handler=test -quarkus.lambda.enable-polling-jvm-mode=true \ No newline at end of file diff --git a/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java index 15fafdc5c6eb17..a8064da4cfb67d 100644 --- a/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java +++ b/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java @@ -1,12 +1,12 @@ package io.quarkus.it.amazon.lambda; +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.Test; -import io.quarkus.amazon.lambda.test.LambdaClient; import io.quarkus.test.junit.QuarkusTest; @QuarkusTest @@ -18,10 +18,15 @@ public void testSimpleLambdaSuccess() throws Exception { InputObject in = new InputObject(); in.setGreeting("Hello"); in.setName("Stu"); - OutputObject out = LambdaClient.invoke(OutputObject.class, in); - assertEquals("Hello Stu", out.getResult()); - assertCounter(1); - assertTrue(out.getRequestId().matches("aws-request-\\d"), "Expected requestId as 'aws-request-'"); + given() + .contentType("application/json") + .accept("application/json") + .body(in) + .when() + .post() + .then() + .statusCode(200) + .body(containsString("Hello Stu")); } @Test @@ -30,14 +35,15 @@ public void testSimpleLambdaFailure() throws Exception { InputObject in = new InputObject(); in.setGreeting("Hello"); in.setName("Stuart"); - try { - OutputObject out = LambdaClient.invoke(OutputObject.class, in); - out.getResult(); - fail(); - } catch (Exception e) { - assertEquals(ProcessingService.CAN_ONLY_GREET_NICKNAMES, e.getMessage()); - //Assertions.assertEquals(IllegalArgumentException.class.getName(), e.getType()); - } + given() + .contentType("application/json") + .accept("application/json") + .body(in) + .when() + .post() + .then() + .statusCode(500) + .body("errorMessage", equalTo(ProcessingService.CAN_ONLY_GREET_NICKNAMES)); assertCounter(1); } diff --git a/integration-tests/funqy-amazon-lambda/pom.xml b/integration-tests/funqy-amazon-lambda/pom.xml index b0e33dd4707080..3b9310bc5c225d 100644 --- a/integration-tests/funqy-amazon-lambda/pom.xml +++ b/integration-tests/funqy-amazon-lambda/pom.xml @@ -33,8 +33,8 @@ test - io.quarkus - quarkus-test-amazon-lambda + io.rest-assured + rest-assured test diff --git a/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/GreetTestBase.java b/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/GreetTestBase.java index 90cec435c494dd..52b48ac52df61c 100644 --- a/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/GreetTestBase.java +++ b/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/GreetTestBase.java @@ -1,30 +1,36 @@ package io.quarkus.funqy.test; -import static io.quarkus.funqy.test.GreetingFunctions.ERR_MSG; +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.quarkus.amazon.lambda.test.LambdaClient; -import io.quarkus.amazon.lambda.test.LambdaException; - public abstract class GreetTestBase { @Test public void testGreet() { - Greeting expectedGreeting = new Greeting("Matej", "Hello Matej!"); Identity identity = new Identity(); identity.setName("Matej"); - Greeting actualGreeting = LambdaClient.invoke(Greeting.class, identity); - - Assertions.assertEquals(expectedGreeting, actualGreeting); + given() + .contentType("application/json") + .accept("application/json") + .body(identity) + .when() + .post() + .then() + .statusCode(200) + .body("name", equalTo("Matej")) + .body("message", equalTo("Hello Matej!")); } @Test public void testGreetNPE() { - try { - LambdaClient.invoke(Greeting.class, null); - } catch (LambdaException e) { - Assertions.assertTrue(e.getMessage().contains(ERR_MSG)); - } + given() + .when() + .post() + .then() + .statusCode(500) + .body("errorMessage", containsString("end-of-input")); } + } diff --git a/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/NoArgFunTest.java b/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/NoArgFunTest.java index 1fb94529c86a88..e5695c1935f0ee 100644 --- a/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/NoArgFunTest.java +++ b/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/NoArgFunTest.java @@ -1,11 +1,11 @@ package io.quarkus.funqy.test; -import java.time.Duration; +import static io.restassured.RestAssured.given; +import static org.hamcrest.Matchers.containsString; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import io.quarkus.amazon.lambda.test.LambdaClient; import io.quarkus.test.junit.QuarkusTest; @QuarkusTest @@ -14,6 +14,11 @@ public class NoArgFunTest { @Test public void testNoArgFun() throws Exception { - LambdaClient.invoke(String.class, null, Duration.ofSeconds(5)); + given() + .when() + .post() + .then() + .statusCode(200) + .body(containsString("noArgFun")); } } diff --git a/integration-tests/funqy-amazon-lambda/src/test/resources/application.properties b/integration-tests/funqy-amazon-lambda/src/test/resources/application.properties deleted file mode 100644 index e04a99c3c9f730..00000000000000 --- a/integration-tests/funqy-amazon-lambda/src/test/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -quarkus.lambda.enable-polling-jvm-mode=true \ No newline at end of file diff --git a/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaClient.java b/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaClient.java index e2c0e21be8d4e6..f02da622f45545 100644 --- a/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaClient.java +++ b/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaClient.java @@ -8,6 +8,8 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; +import org.jboss.logging.Logger; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -15,7 +17,9 @@ import io.quarkus.arc.ArcContainer; import io.quarkus.arc.InstanceHandle; +@Deprecated public class LambdaClient { + protected static final Logger log = Logger.getLogger(LambdaClient.class); private static final AtomicInteger REQUEST_ID_GENERATOR = new AtomicInteger(); public static final ConcurrentHashMap> REQUESTS; @@ -47,7 +51,10 @@ public class LambdaClient { } + @Deprecated public static void invoke(InputStream inputStream, OutputStream outputStream) { + log.warn( + "LambdaClient has been deprecated and will be removed in future Quarkus versions. You can now invoke using a built in test http server. See docs for more details"); if (problem != null) { throw new RuntimeException(problem); } @@ -99,10 +106,12 @@ public String setValue(String value) { * @param * @return */ + @Deprecated public static T invoke(Class returnType, Object input) { return invoke(returnType, input, Duration.ofNanos(Long.MAX_VALUE)); } + @Deprecated public static T invoke(Class returnType, Object input, Duration timeout) { try { return invokeAsync(returnType, input).get(timeout.toMillis(), TimeUnit.MILLISECONDS); @@ -117,7 +126,10 @@ public static T invoke(Class returnType, Object input, Duration timeout) } } + @Deprecated public static CompletableFuture invokeAsync(Class returnType, Object input) { + log.warn( + "LambdaClient has been deprecated and will be removed in future Quarkus versions. You can now invoke using a built in test http server. See docs for more details"); if (problem != null) { CompletableFuture failed = new CompletableFuture<>(); failed.completeExceptionally(problem); @@ -151,7 +163,10 @@ public static CompletableFuture invokeAsync(Class returnType, Object i * @param * @return */ + @Deprecated public static T invokeJson(Class returnType, String json) { + log.warn( + "LambdaClient has been deprecated and will be removed in future Quarkus versions. You can now invoke using a built in test http server. See docs for more details"); if (problem != null) { throw new RuntimeException(problem); } diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/RestAssuredURLManager.java b/test-framework/common/src/main/java/io/quarkus/test/common/RestAssuredURLManager.java index 5750bcbb81fdf1..5ddebf1d371b9b 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/RestAssuredURLManager.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/RestAssuredURLManager.java @@ -89,8 +89,13 @@ private RestAssuredURLManager() { } - private static int getPortFromConfig(String key, int defaultValue) { - return ConfigProvider.getConfig().getOptionalValue(key, Integer.class).orElse(defaultValue); + private static int getPortFromConfig(int defaultValue, String... keys) { + for (String key : keys) { + Optional port = ConfigProvider.getConfig().getOptionalValue(key, Integer.class); + if (port.isPresent()) + return port.get(); + } + return defaultValue; } public static void setURL(boolean useSecureConnection) { @@ -110,8 +115,9 @@ public static void setURL(boolean useSecureConnection, Integer port, String addi try { oldPort = (Integer) portField.get(null); if (port == null) { - port = useSecureConnection ? getPortFromConfig("quarkus.https.test-port", DEFAULT_HTTPS_PORT) - : getPortFromConfig("quarkus.http.test-port", DEFAULT_HTTP_PORT); + port = useSecureConnection ? getPortFromConfig(DEFAULT_HTTPS_PORT, "quarkus.https.test-port") + : getPortFromConfig(DEFAULT_HTTP_PORT, "quarkus.http.test-port", + "quarkus.lambda.mock-event-server.test-port"); } portField.set(null, port); } catch (IllegalAccessException e) { From 87d8bc937709a46643af6b0dcb13ade9033572fa Mon Sep 17 00:00:00 2001 From: Alexey Loubyansky Date: Wed, 1 Sep 2021 20:16:14 +0200 Subject: [PATCH 062/138] Removed duplicate dependency on asm-commons, trigerring a warning during the build --- bom/application/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 78072e762bfc9c..d01af9718fb2bc 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -4358,11 +4358,6 @@ asm-analysis ${asm.version} - - org.ow2.asm - asm-commons - ${asm.version} - org.slf4j slf4j-api From fab4d7045544a3170916cb316028c036b97ae405 Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Wed, 1 Sep 2021 20:42:17 +0200 Subject: [PATCH 063/138] Dev UI Keykloak - Make the logout button visible Signed-off-by:Phillip Kruger --- .../src/main/resources/dev-templates/provider.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/extensions/oidc/deployment/src/main/resources/dev-templates/provider.html b/extensions/oidc/deployment/src/main/resources/dev-templates/provider.html index 14779285ad7470..3ab9b02730c080 100644 --- a/extensions/oidc/deployment/src/main/resources/dev-templates/provider.html +++ b/extensions/oidc/deployment/src/main/resources/dev-templates/provider.html @@ -178,7 +178,7 @@ userName = jsonPayload.preferred_username; } if (userName) { - $('#loggedInUser').append(" Logged in as " + userName); + $('#loggedInUser').append("Logged in as " + userName + " "); } } return "
    " + 
@@ -289,8 +289,9 @@
                     Your tokens
    - - + + +
    From 0b18024b6f10fea094688f37540ad03c90ab5a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szynkiewicz?= Date: Wed, 1 Sep 2021 22:34:57 +0200 Subject: [PATCH 064/138] Rest Client Reactive: improve error on invalid subresource return type --- .../reactive/deployment/JaxrsClientReactiveProcessor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java index 815441cbad7502..f04ee175337213 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java @@ -502,7 +502,11 @@ A more full example of generated client (with sub-resource) can is at the bottom ClassInfo subResourceInterface = index.getClassByName(returnType.name()); if (!Modifier.isInterface(subResourceInterface.flags())) { throw new IllegalArgumentException( - "Sub resource type is not an interface: " + returnType.name().toString()); + "Client interface method: " + jandexMethod.declaringClass().name() + "#" + jandexMethod + + " has no HTTP method annotation (@GET, @POST, etc) and it's return type: " + + returnType.name().toString() + " is not an interface. " + + "If it's a sub resource method, it has to return an interface. " + + "If it's not, it has to have one of the HTTP method annotations."); } // generate implementation for a method from the jaxrs interface: MethodCreator methodCreator = c.getMethodCreator(method.getName(), method.getSimpleReturnType(), From cf430d0f422f7e8ef208de85d61623990684b4be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Sep 2021 21:18:05 +0000 Subject: [PATCH 065/138] Bump awssdk.version from 2.17.31 to 2.17.32 Bumps `awssdk.version` from 2.17.31 to 2.17.32. Updates `software.amazon.awssdk:bom` from 2.17.31 to 2.17.32 - [Release notes](https://github.com/aws/aws-sdk-java-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java-v2/compare/2.17.31...2.17.32) Updates `apache-client` from 2.17.31 to 2.17.32 --- updated-dependencies: - dependency-name: software.amazon.awssdk:bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:apache-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index d01af9718fb2bc..30f5cb8fd43c89 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -145,7 +145,7 @@ 3.10.0 1.6 2.9.1 - 2.17.31 + 2.17.32 2.40.0 1.4.2 1.5.30 From e9fb81dc7f21dababd82b1928964c58db5431e1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Sep 2021 21:22:06 +0000 Subject: [PATCH 066/138] Bump flyway-core from 7.14.0 to 7.14.1 Bumps [flyway-core](https://github.com/flyway/flyway) from 7.14.0 to 7.14.1. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.14.0...flyway-7.14.1) --- updated-dependencies: - dependency-name: org.flywaydb:flyway-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index d01af9718fb2bc..1967ee42f94d50 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -156,7 +156,7 @@ 4.1.0 1.0.9 5.12.0.202106070339-r - 7.14.0 + 7.14.1 1.0.9 4.4.3 4.4.3 From ebddbc3bc1d22753c23d198ed7d8df0ffa6315ab Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Thu, 2 Sep 2021 10:51:13 +1000 Subject: [PATCH 067/138] Clean up hang detection on failed start This can cause a false positive in the vertx-http-deployment tests where a continuous test fails to start, then spits out a hang detection warning a minute later. --- .../test/junit/QuarkusTestExtension.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java index edc69c08052312..a3f00de8224aad 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java @@ -435,15 +435,7 @@ public void close() throws IOException { } finally { tcclMethodCache.clear(); GroovyCacheCleaner.clearGroovyCache(); - if (hangTaskKey != null) { - hangTaskKey.cancel(true); - hangTaskKey = null; - } - var h = hangDetectionExecutor; - if (h != null) { - h.shutdownNow(); - hangDetectionExecutor = null; - } + shutdownHangDetection(); } } try { @@ -472,6 +464,18 @@ public void close() throws IOException { } } + private void shutdownHangDetection() { + if (hangTaskKey != null) { + hangTaskKey.cancel(true); + hangTaskKey = null; + } + var h = hangDetectionExecutor; + if (h != null) { + h.shutdownNow(); + hangDetectionExecutor = null; + } + } + private void populateDeepCloneField(StartupAction startupAction) { deepClone = new SerializationWithXStreamFallbackDeepClone(startupAction.getClassLoader()); } @@ -1333,6 +1337,7 @@ class FailedCleanup implements ExtensionContext.Store.CloseableResource { @Override public void close() { + resetHangTimeout(); firstException = null; failedBoot = false; ConfigProviderResolver.setInstance(null); From 07f9e8741d35016df1727ffd834412b8d2bb1b15 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Wed, 1 Sep 2021 18:47:08 +0300 Subject: [PATCH 068/138] Take @TestSecurity(authorizationEnabled = false) into account for RESTEasy Reactive Relates to: #19834 --- .../interceptor/check/AuthenticatedCheck.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/check/AuthenticatedCheck.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/check/AuthenticatedCheck.java index 4b236929889147..ac80cbf0249d9e 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/check/AuthenticatedCheck.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/check/AuthenticatedCheck.java @@ -2,21 +2,47 @@ import java.lang.reflect.Method; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.InstanceHandle; import io.quarkus.security.UnauthorizedException; import io.quarkus.security.identity.SecurityIdentity; +import io.quarkus.security.spi.runtime.AuthorizationController; import io.quarkus.security.spi.runtime.SecurityCheck; public class AuthenticatedCheck implements SecurityCheck { public static final AuthenticatedCheck INSTANCE = new AuthenticatedCheck(); + private volatile AuthorizationController authorizationController; + private AuthenticatedCheck() { } @Override public void apply(SecurityIdentity identity, Method method, Object[] parameters) { + if (isAuthorizationDisabled()) { + return; + } if (identity.isAnonymous()) { throw new UnauthorizedException(); } } + + private boolean isAuthorizationDisabled() { + if (authorizationController != null) { + return !authorizationController.isAuthorizationEnabled(); + } + + ArcContainer container = Arc.container(); + if ((container == null) || !container.isRunning()) { + return false; + } + InstanceHandle instance = container.instance(AuthorizationController.class); + if (instance.isAvailable()) { + authorizationController = instance.get(); + return !instance.get().isAuthorizationEnabled(); + } + return false; + } } From 54ee32272cd5e387bcc0c58511608c6ad476f98c Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Wed, 1 Sep 2021 17:35:41 +0300 Subject: [PATCH 069/138] Replace runtime reflection usage in rest-links with build time metadata capturing --- .../reactive/links/deployment/DotNames.java | 15 ++++ .../deployment/LinksContainerFactory.java | 4 +- .../links/deployment/LinksMethodScanner.java | 59 +++++++++++++ .../links/deployment/LinksProcessor.java | 13 ++- .../reactive/links/RestLinksHandler.java | 82 +++++++++++++++++++ .../links/RestLinksResponseFilter.java | 76 ----------------- 6 files changed, 163 insertions(+), 86 deletions(-) create mode 100644 extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/DotNames.java create mode 100644 extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksMethodScanner.java create mode 100644 extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksHandler.java delete mode 100644 extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksResponseFilter.java diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/DotNames.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/DotNames.java new file mode 100644 index 00000000000000..4a493e9584a468 --- /dev/null +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/DotNames.java @@ -0,0 +1,15 @@ +package io.quarkus.resteasy.reactive.links.deployment; + +import org.jboss.jandex.DotName; + +import io.quarkus.resteasy.reactive.links.InjectRestLinks; +import io.quarkus.resteasy.reactive.links.RestLink; + +final class DotNames { + + static final DotName INJECT_REST_LINKS_ANNOTATION = DotName.createSimple(InjectRestLinks.class.getName()); + static final DotName REST_LINK_ANNOTATION = DotName.createSimple(RestLink.class.getName()); + + private DotNames() { + } +} diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java index 0a28fd73829975..6e9142867e5689 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java @@ -24,8 +24,6 @@ final class LinksContainerFactory { - private static final DotName REST_LINK_ANNOTATION = DotName.createSimple(RestLink.class.getName()); - private final IndexView index; LinksContainerFactory(IndexView index) { @@ -41,7 +39,7 @@ LinksContainer getLinksContainer(List resourceClasses) { for (ResourceClass resourceClass : resourceClasses) { for (ResourceMethod resourceMethod : resourceClass.getMethods()) { MethodInfo resourceMethodInfo = getResourceMethodInfo(resourceClass, resourceMethod); - AnnotationInstance restLinkAnnotation = resourceMethodInfo.annotation(REST_LINK_ANNOTATION); + AnnotationInstance restLinkAnnotation = resourceMethodInfo.annotation(DotNames.REST_LINK_ANNOTATION); if (restLinkAnnotation != null) { LinkInfo linkInfo = getLinkInfo(resourceClass, resourceMethod, resourceMethodInfo, restLinkAnnotation); diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksMethodScanner.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksMethodScanner.java new file mode 100644 index 00000000000000..59d54071640ad2 --- /dev/null +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksMethodScanner.java @@ -0,0 +1,59 @@ +package io.quarkus.resteasy.reactive.links.deployment; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import org.jboss.jandex.AnnotationInstance; +import org.jboss.jandex.AnnotationValue; +import org.jboss.jandex.ClassInfo; +import org.jboss.jandex.MethodInfo; +import org.jboss.resteasy.reactive.server.model.FixedHandlerChainCustomizer; +import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer; +import org.jboss.resteasy.reactive.server.processor.scanning.MethodScanner; + +import io.quarkus.resteasy.reactive.links.RestLinkType; +import io.quarkus.resteasy.reactive.links.RestLinksHandler; + +public class LinksMethodScanner implements MethodScanner { + + @Override + public List scan(MethodInfo method, ClassInfo actualEndpointClass, + Map methodContext) { + AnnotationInstance injectRestLinksInstance = getInjectRestLinksAnnotation(method, actualEndpointClass); + if (injectRestLinksInstance == null) { + return Collections.emptyList(); + } + + RestLinkType restLinkType = RestLinkType.TYPE; + AnnotationValue injectRestLinksValue = injectRestLinksInstance.value(); + if (injectRestLinksValue != null) { + restLinkType = RestLinkType.valueOf(injectRestLinksValue.asEnum()); + } + + AnnotationInstance restLinkInstance = method.annotation(DotNames.REST_LINK_ANNOTATION); + String entityType = null; + if (restLinkInstance != null) { + AnnotationValue restInstanceValue = restLinkInstance.value("entityType"); + if (restInstanceValue != null) { + entityType = restInstanceValue.asClass().name().toString(); + } + } + + RestLinksHandler handler = new RestLinksHandler(); + handler.setRestLinkData(new RestLinksHandler.RestLinkData(restLinkType, entityType)); + return Collections.singletonList(new FixedHandlerChainCustomizer(handler, + HandlerChainCustomizer.Phase.AFTER_RESPONSE_CREATED)); + } + + private AnnotationInstance getInjectRestLinksAnnotation(MethodInfo method, ClassInfo actualEndpointClass) { + AnnotationInstance annotationInstance = method.annotation(DotNames.INJECT_REST_LINKS_ANNOTATION); + if (annotationInstance == null) { + annotationInstance = method.declaringClass().classAnnotation(DotNames.INJECT_REST_LINKS_ANNOTATION); + if ((annotationInstance == null) && !actualEndpointClass.equals(method.declaringClass())) { + annotationInstance = actualEndpointClass.classAnnotation(DotNames.INJECT_REST_LINKS_ANNOTATION); + } + } + return annotationInstance; + } +} diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksProcessor.java index c3733000d26f11..380e9086b5598e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksProcessor.java @@ -22,7 +22,6 @@ import io.quarkus.deployment.builditem.GeneratedClassBuildItem; import io.quarkus.gizmo.ClassOutput; import io.quarkus.resteasy.reactive.common.deployment.JaxRsResourceIndexBuildItem; -import io.quarkus.resteasy.reactive.links.RestLinksResponseFilter; import io.quarkus.resteasy.reactive.links.runtime.GetterAccessorsContainer; import io.quarkus.resteasy.reactive.links.runtime.GetterAccessorsContainerRecorder; import io.quarkus.resteasy.reactive.links.runtime.LinkInfo; @@ -30,7 +29,7 @@ import io.quarkus.resteasy.reactive.links.runtime.LinksProviderRecorder; import io.quarkus.resteasy.reactive.links.runtime.RestLinksProviderProducer; import io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveDeploymentInfoBuildItem; -import io.quarkus.resteasy.reactive.spi.CustomContainerResponseFilterBuildItem; +import io.quarkus.resteasy.reactive.server.spi.MethodScannerBuildItem; import io.quarkus.runtime.RuntimeValue; final class LinksProcessor { @@ -42,6 +41,11 @@ void feature(BuildProducer feature) { feature.produce(new FeatureBuildItem(Feature.RESTEASY_REACTIVE_LINKS)); } + @BuildStep + MethodScannerBuildItem linksSupport() { + return new MethodScannerBuildItem(new LinksMethodScanner()); + } + @BuildStep @Record(STATIC_INIT) void initializeLinksProvider(JaxRsResourceIndexBuildItem indexBuildItem, @@ -68,11 +72,6 @@ AdditionalBeanBuildItem registerRestLinksProviderProducer() { return AdditionalBeanBuildItem.unremovableOf(RestLinksProviderProducer.class); } - @BuildStep - CustomContainerResponseFilterBuildItem registerRestLinksResponseFilter() { - return new CustomContainerResponseFilterBuildItem(RestLinksResponseFilter.class.getName()); - } - private LinksContainer getLinksContainer(IndexView index, ResteasyReactiveDeploymentInfoBuildItem deploymentInfoBuildItem) { LinksContainerFactory linksContainerFactory = new LinksContainerFactory(index); diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksHandler.java new file mode 100644 index 00000000000000..10c2e24571c8e3 --- /dev/null +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksHandler.java @@ -0,0 +1,82 @@ +package io.quarkus.resteasy.reactive.links; + +import java.util.Collection; + +import javax.ws.rs.core.Link; +import javax.ws.rs.core.Response; + +import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; +import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; + +import io.quarkus.arc.Arc; + +public class RestLinksHandler implements ServerRestHandler { + + private RestLinkData restLinkData; + + public RestLinkData getRestLinkData() { + return restLinkData; + } + + public void setRestLinkData(RestLinkData restLinkData) { + this.restLinkData = restLinkData; + } + + @Override + public void handle(ResteasyReactiveRequestContext context) { + Response response = context.getResponse().get(); + for (Link link : getLinks(response)) { + response.getHeaders().add("Link", link); + } + } + + private Collection getLinks(Response response) { + if ((restLinkData.getRestLinkType() == RestLinkType.INSTANCE) && response.hasEntity()) { + return getTestLinksProvider().getInstanceLinks(response.getEntity()); + } + return getTestLinksProvider() + .getTypeLinks(restLinkData.getEntityType() != null ? entityTypeClass() : response.getEntity().getClass()); + } + + private Class entityTypeClass() { + try { + return Thread.currentThread().getContextClassLoader().loadClass(restLinkData.getEntityType()); + } catch (ClassNotFoundException e) { + throw new IllegalStateException("Unable load class '" + restLinkData.getEntityType() + "'", e); + } + } + + private RestLinksProvider getTestLinksProvider() { + return Arc.container().instance(RestLinksProvider.class).get(); + } + + public static class RestLinkData { + + public RestLinkData(RestLinkType restLinkType, String entityType) { + this.restLinkType = restLinkType; + this.entityType = entityType; + } + + public RestLinkData() { + } + + private RestLinkType restLinkType; + private String entityType; + + public RestLinkType getRestLinkType() { + return restLinkType; + } + + public void setRestLinkType(RestLinkType restLinkType) { + this.restLinkType = restLinkType; + } + + public String getEntityType() { + return entityType; + } + + public void setEntityType(String entityType) { + this.entityType = entityType; + } + } +} diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksResponseFilter.java deleted file mode 100644 index 09b275d0d7a15a..00000000000000 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksResponseFilter.java +++ /dev/null @@ -1,76 +0,0 @@ -package io.quarkus.resteasy.reactive.links; - -import java.lang.annotation.Annotation; -import java.util.Collection; -import java.util.Collections; - -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Link; - -import org.jboss.resteasy.reactive.server.ServerResponseFilter; -import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; - -public class RestLinksResponseFilter { - - private final RestLinksProvider linksProvider; - - public RestLinksResponseFilter(RestLinksProvider linksProvider) { - this.linksProvider = linksProvider; - } - - @ServerResponseFilter - public void filter(ResourceInfo resourceInfo, ContainerResponseContext responseContext) { - if (!(resourceInfo instanceof ResteasyReactiveResourceInfo)) { - return; - } - for (Link link : getLinks((ResteasyReactiveResourceInfo) resourceInfo, responseContext)) { - responseContext.getHeaders().add("Link", link); - } - } - - private Collection getLinks(ResteasyReactiveResourceInfo resourceInfo, - ContainerResponseContext responseContext) { - InjectRestLinks injectRestLinksAnnotation = getInjectRestLinksAnnotation(resourceInfo); - if (injectRestLinksAnnotation == null) { - return Collections.emptyList(); - } - - if (injectRestLinksAnnotation.value() == RestLinkType.INSTANCE && responseContext.hasEntity()) { - return linksProvider.getInstanceLinks(responseContext.getEntity()); - } - - return linksProvider.getTypeLinks(getEntityType(resourceInfo, responseContext)); - } - - private InjectRestLinks getInjectRestLinksAnnotation(ResteasyReactiveResourceInfo resourceInfo) { - if (resourceInfo.getMethodAnnotationNames().contains(InjectRestLinks.class.getName())) { - for (Annotation annotation : resourceInfo.getAnnotations()) { - if (annotation instanceof InjectRestLinks) { - return (InjectRestLinks) annotation; - } - } - } - if (resourceInfo.getClassAnnotationNames().contains(InjectRestLinks.class.getName())) { - for (Annotation annotation : resourceInfo.getClassAnnotations()) { - if (annotation instanceof InjectRestLinks) { - return (InjectRestLinks) annotation; - } - } - } - return null; - } - - private Class getEntityType(ResteasyReactiveResourceInfo resourceInfo, - ContainerResponseContext responseContext) { - for (Annotation annotation : resourceInfo.getAnnotations()) { - if (annotation instanceof RestLink) { - Class entityType = ((RestLink) annotation).entityType(); - if (entityType != Object.class) { - return entityType; - } - } - } - return responseContext.getEntityClass(); - } -} From 09a8a4f7ac7edaf7199f99c3abbe995227d8cef0 Mon Sep 17 00:00:00 2001 From: Ioannis Canellos Date: Thu, 2 Sep 2021 12:15:12 +0300 Subject: [PATCH 070/138] chore: remove useless code from KuberentesProcessor --- .../io/quarkus/kubernetes/deployment/KubernetesProcessor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java index 0f8251b1cc9064..d9b05f5a4123a6 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java @@ -169,7 +169,6 @@ public void build(ApplicationInfoBuildItem applicationInfo, Path targetPath = outputTarget.getOutputDirectory().resolve(KUBERNETES).resolve(fileName); String relativePath = targetPath.toAbsolutePath().toString().replace(root.toAbsolutePath().toString(), ""); - resourceEntry.getKey().replace(root.toAbsolutePath().toString(), KUBERNETES); if (fileName.endsWith(".yml") || fileName.endsWith(".json")) { String target = fileName.substring(0, fileName.lastIndexOf(".")); if (!deploymentTargets.contains(target)) { From 57b1ffd5135de82017fe6398e87c67aa09f82c02 Mon Sep 17 00:00:00 2001 From: Ioannis Canellos Date: Thu, 2 Sep 2021 16:21:05 +0300 Subject: [PATCH 071/138] fix: KubernetesClientErrorHandler always throws a RuntimeException --- .../deployment/KubernetesClientErrorHandler.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHandler.java b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHandler.java index ed127a722a83bb..58f3eff0b634ef 100644 --- a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHandler.java +++ b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHandler.java @@ -12,11 +12,11 @@ public static void handle(Exception e) { if (e.getCause() instanceof SSLHandshakeException) { LOG.error( "The application could not be deployed to the cluster because the Kubernetes API Server certificates are not trusted. The certificates can be configured using the relevant configuration properties under the 'quarkus.kubernetes-client' config root, or \"quarkus.kubernetes-client.trust-certs=true\" can be set to explicitly trust the certificates (not recommended)"); - if (e instanceof RuntimeException) { - throw (RuntimeException) e; - } else { - throw new RuntimeException(e); - } + } + if (e instanceof RuntimeException) { + throw (RuntimeException) e; + } else { + throw new RuntimeException(e); } } } From f3c65afa052980b53acbff5d3d4757e91d970cf2 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Thu, 2 Sep 2021 16:31:16 +0300 Subject: [PATCH 072/138] Improve documentation for token propagation --- .../src/main/asciidoc/security-openid-connect-client.adoc | 8 +++++--- .../io/quarkus/oidc/token/propagation/AccessToken.java | 7 +++++++ .../oidc/token/propagation/AccessTokenRequestFilter.java | 3 +++ .../io/quarkus/oidc/token/propagation/JsonWebToken.java | 7 +++++++ .../oidc/token/propagation/JsonWebTokenRequestFilter.java | 4 ++++ 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/docs/src/main/asciidoc/security-openid-connect-client.adoc b/docs/src/main/asciidoc/security-openid-connect-client.adoc index c83c738171186e..f0714df598d158 100644 --- a/docs/src/main/asciidoc/security-openid-connect-client.adoc +++ b/docs/src/main/asciidoc/security-openid-connect-client.adoc @@ -596,15 +596,17 @@ quarkus.oidc-client.token-path=/protocol/openid-connect/tokens [[token-propagation]] == Token Propagation in MicroProfile RestClient client filter -`quarkus-oidc-token-propagation` extension provide `io.quarkus.oidc.token.propagation.AccessTokenRequestFilter` and `io.quarkus.oidc.token.propagation.JsonWebTokenRequestFilter` JAX-RS ClientRequestFilters which propagates the current link:security-openid-connect[Bearer] or link:security-openid-connect-web-authentication[Authorization Code Flow] access token as an HTTP `Authorization` `Bearer` scheme value. +The `quarkus-oidc-token-propagation` extension provides two JAX-RS `javax.ws.rs.client.ClientRequestFilter` class implementations that simplify the propagation of authentication information. +`io.quarkus.oidc.token.propagation.AccessTokenRequestFilter` propagates the link:security-openid-connect[Bearer] token present in the current active request or the token acquired from the link:security-openid-connect-web-authentication[Authorization Code Flow], as the HTTP `Authorization` header's `Bearer` scheme value. +The `io.quarkus.oidc.token.propagation.JsonWebTokenRequestFilter` provides the same functionality, but in addition provides support for JWT tokens. When you need to propagate the current Authorization Code Flow access token then the immediate token propagation will work well - as the code flow access tokens (as opposed to ID tokens) are meant to be propagated for the current Quarkus endpoint to access the remote services on behalf of the currently authenticated user. However, the direct end to end Bearer token propagation should be avoided if possible. For example, `Client -> Service A -> Service B` where `Service B` receives a token sent by `Client` to `Service A`. In such cases `Service B` will not be able to distinguish if the token came from `Service A` or from `Client` directly. For `Service B` to verify the token came from `Service A` it should be able to assert a new issuer and audience claims. -Additionally, a complex application may need to exchange or update the tokens before propagating them. For example, the access context might be different when Service A is accessing Service B. In this case, Service A might be granted a narrow or a completely different set of scopes to access Service B. +Additionally, a complex application may need to exchange or update the tokens before propagating them. For example, the access context might be different when `Service A` is accessing `Service B`. In this case, `Service A` might be granted a narrow or a completely different set of scopes to access `Service B`. -Please see below how both `AccessTokenRequestFilter` and `JsonWebTokenRequestFilter` can help. +The following sections show how `AccessTokenRequestFilter` and `JsonWebTokenRequestFilter` can help. === AccessTokenRequestFilter diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessToken.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessToken.java index a3075712a3bfe5..2debaf34ecd775 100644 --- a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessToken.java +++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessToken.java @@ -6,6 +6,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * When this annotation is added to a MicroProfile REST Client interface, the {@link AccessTokenRequestFilter} will be added to + * the request pipeline. + * The end result is that the request propagates the Bearer token present in the current active request or the token acquired + * from the Authorization Code Flow, + * as the HTTP {@code Authorization} header's {@code Bearer} scheme value. + */ @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java index 0a5df9d7a98e10..0ec0b0877ae9b0 100644 --- a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java +++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java @@ -20,6 +20,9 @@ public class AccessTokenRequestFilter extends AbstractTokenRequestFilter { private static final String EXCHANGE_SUBJECT_TOKEN = "subject_token"; + // note: We can't use constructor injection for these fields because they are registered by RESTEasy + // which doesn't know about CDI at the point of registration + @Inject Instance accessToken; diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebToken.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebToken.java index e7b8601602bd62..81649761f76cf6 100644 --- a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebToken.java +++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebToken.java @@ -6,6 +6,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * When this annotation is added to a MicroProfile REST Client interface, the {@link JsonWebTokenRequestFilter} will be added to + * the request pipeline. + * The end result is that the request propagates the JWT token present in the current active request or the token acquired from + * the Authorization Code Flow, + * as the HTTP {@code Authorization} header's {@code Bearer} scheme value. + */ @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java index 4151e696ac946e..1be3a3795359c3 100644 --- a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java +++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java @@ -12,6 +12,10 @@ import io.smallrye.jwt.build.Jwt; public class JsonWebTokenRequestFilter extends AbstractTokenRequestFilter { + + // note: We can't use constructor injection for these fields because they are registered by RESTEasy + // which doesn't know about CDI at the point of registration + @Inject Instance jwtAccessToken; From 679561e16faa0da7a9e8031716652b19981b2130 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Wed, 1 Sep 2021 14:53:43 +0200 Subject: [PATCH 073/138] Bump kubernetes-client-bom from 5.7.0 to 5.7.2 Signed-off-by: Marc Nuri --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index d01af9718fb2bc..1616d177288c42 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -170,7 +170,7 @@ 3.14.9 5.1.2 0.1.0 - 5.7.0 + 5.7.2 2.2.0 5.2.SP4 2.1.SP2 From 3f37b7f8411bd87f450f83432fbcb99187fce12b Mon Sep 17 00:00:00 2001 From: barreiro Date: Thu, 2 Sep 2021 15:22:40 +0100 Subject: [PATCH 074/138] Expose Agroal feature: idle validation --- .../quarkus/agroal/runtime/DataSourceJdbcRuntimeConfig.java | 6 ++++++ .../main/java/io/quarkus/agroal/runtime/DataSources.java | 3 +++ 2 files changed, 9 insertions(+) diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcRuntimeConfig.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcRuntimeConfig.java index d586ddb8bb388d..0d4b4c50470a50 100644 --- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcRuntimeConfig.java +++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcRuntimeConfig.java @@ -47,6 +47,12 @@ public class DataSourceJdbcRuntimeConfig { @ConfigItem(defaultValue = "2M") public Optional backgroundValidationInterval = Optional.of(Duration.ofMinutes(2)); + /** + * Perform foreground validation on connections that have been idle for longer than the specified interval. + */ + @ConfigItem + public Optional foregroundValidationInterval = Optional.empty(); + /** * The timeout before cancelling the acquisition of a new connection */ diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSources.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSources.java index e5a1d8c5e9e315..fa6c4290da30e1 100644 --- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSources.java +++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSources.java @@ -276,6 +276,9 @@ private void applyNewConfiguration(AgroalDataSourceConfigurationSupplier dataSou if (dataSourceJdbcRuntimeConfig.backgroundValidationInterval.isPresent()) { poolConfiguration.validationTimeout(dataSourceJdbcRuntimeConfig.backgroundValidationInterval.get()); } + if (dataSourceJdbcRuntimeConfig.foregroundValidationInterval.isPresent()) { + poolConfiguration.idleValidationTimeout(dataSourceJdbcRuntimeConfig.foregroundValidationInterval.get()); + } if (dataSourceJdbcRuntimeConfig.validationQuerySql.isPresent()) { String validationQuery = dataSourceJdbcRuntimeConfig.validationQuerySql.get(); poolConfiguration.connectionValidator(new ConnectionValidator() { From 3ab5867fd0b9910151d9c674e43d64c75be0c07b Mon Sep 17 00:00:00 2001 From: Ladislav Thon Date: Thu, 2 Sep 2021 16:43:22 +0200 Subject: [PATCH 075/138] More descriptive error messages for unsupported Jandex storage format versions --- .../java/io/quarkus/deployment/index/IndexingUtil.java | 7 ++++++- .../main/java/io/quarkus/test/common/TestClassIndexer.java | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/index/IndexingUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/index/IndexingUtil.java index bf57c34763c835..84c056ff863ea8 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/index/IndexingUtil.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/index/IndexingUtil.java @@ -21,6 +21,7 @@ import org.jboss.jandex.IndexReader; import org.jboss.jandex.IndexView; import org.jboss.jandex.Indexer; +import org.jboss.jandex.UnsupportedVersion; import org.jboss.logging.Logger; import io.quarkus.deployment.util.IoUtil; @@ -61,7 +62,11 @@ public static Index indexJar(File file, Set removed) throws IOException file); return indexJar(jarFile, removed); } else { - return reader.read(); + try { + return reader.read(); + } catch (UnsupportedVersion e) { + throw new UnsupportedVersion("Can't read Jandex index from " + file + ": " + e.getMessage()); + } } } } diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/TestClassIndexer.java b/test-framework/common/src/main/java/io/quarkus/test/common/TestClassIndexer.java index c0f39e31a29a71..c278c35f2ff727 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/TestClassIndexer.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/TestClassIndexer.java @@ -20,6 +20,7 @@ import org.jboss.jandex.IndexReader; import org.jboss.jandex.IndexWriter; import org.jboss.jandex.Indexer; +import org.jboss.jandex.UnsupportedVersion; public final class TestClassIndexer { @@ -60,6 +61,8 @@ public static Index readIndex(Class testClass) { if (path.toFile().exists()) { try (FileInputStream fis = new FileInputStream(path.toFile())) { return new IndexReader(fis).read(); + } catch (UnsupportedVersion e) { + throw new UnsupportedVersion("Can't read Jandex index from " + path + ": " + e.getMessage()); } catch (IOException e) { // be lenient since the error is recoverable return indexTestClasses(testClass); From c93e1d95371e1973b574d81a1c06027b5c85bdb6 Mon Sep 17 00:00:00 2001 From: Stephane Epardaud Date: Thu, 2 Sep 2021 15:19:29 +0200 Subject: [PATCH 076/138] Make sure we respect and document the MP config settings for overriding Context Propagation --- .../main/asciidoc/context-propagation.adoc | 115 ++++++++++++++++++ .../deployment/pom.xml | 5 + .../deployment/test/AllClearedConfigTest.java | 31 +++++ .../test/AllUnchangedConfigTest.java | 32 +++++ .../context/deployment/test/NoConfigTest.java | 30 +++++ .../SmallRyeContextPropagationProvider.java | 3 +- 6 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java create mode 100644 extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java create mode 100644 extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java diff --git a/docs/src/main/asciidoc/context-propagation.adoc b/docs/src/main/asciidoc/context-propagation.adoc index e9b2effc86227a..d798e9bd9dbf42 100644 --- a/docs/src/main/asciidoc/context-propagation.adoc +++ b/docs/src/main/asciidoc/context-propagation.adoc @@ -156,6 +156,121 @@ in order to get context propagated. The injected `ManagedExecutor` uses the Quarkus thread pool. ==== +== Overriding which contexts are propagated + +By default, all available contexts are propagated. However, you can override this behaviour in several ways. + +=== Using configuration + +The following configuration properties allow you to specify the default sets of propagated contexts: + +[cols="1,1,1"] +|=== +|Configuration Key|Description|Default Value + +|`mp.context.ThreadContext.propagated` +|The comma-separated set of propagated contexts +|`Remaining` (all non-explicitly list contexts) + +|`mp.context.ThreadContext.cleared` +|The comma-separated set of cleared contexts +|`None` (no context), unless neither the propagated nor cleared sets contain `Remaining`, in which case the default is `Remaining` (all non-explicitly listed contexts) + +|`mp.context.ThreadContext.unchanged` +|The comma-separated set of unchanged contexts +|`None` (no context) +|=== + +The following contexts are available in Quarkus either out of the box, or depending on whether you include +their extensions: + +[cols="1,1,1"] +|=== +|Context Name|Name Constant|Description + +|`None` +|https://javadoc.io/static/org.eclipse.microprofile.context-propagation/microprofile-context-propagation-api/1.2/org/eclipse/microprofile/context/ThreadContext.html#NONE[`ThreadContext.NONE`] +|Can be used to specify an empty set of contexts, but setting the value to empty works too + +|`Remaining` +|https://javadoc.io/static/org.eclipse.microprofile.context-propagation/microprofile-context-propagation-api/1.2/org/eclipse/microprofile/context/ThreadContext.html#ALL_REMAINING[`ThreadContext.ALL_REMAINING`] +|All the contexts that are not explicitly listed in other sets + +|`Transaction` +|https://javadoc.io/static/org.eclipse.microprofile.context-propagation/microprofile-context-propagation-api/1.2/org/eclipse/microprofile/context/ThreadContext.html#TRANSACTION[`ThreadContext.TRANSACTION`] +|The JTA transaction context + +|`CDI` +|https://javadoc.io/static/org.eclipse.microprofile.context-propagation/microprofile-context-propagation-api/1.2/org/eclipse/microprofile/context/ThreadContext.html#CDI[`ThreadContext.CDI`] +|The CDI (ArC) context + +|`Servlet` +|N/A +|The servlet context + +|`JAX-RS` +|N/A +|The RESTEasy Classic context + +|`Application` +|https://javadoc.io/static/org.eclipse.microprofile.context-propagation/microprofile-context-propagation-api/1.2/org/eclipse/microprofile/context/ThreadContext.html#APPLICATION[`ThreadContext.APPLICATION`] +|The current `ThreadContextClassLoader` +|=== + +=== Overriding the propagated contexts using annotations + +In order for automatic context propagation, such as Mutiny uses, to be overridden in specific methods, +you can use the https://javadoc.io/doc/io.smallrye/smallrye-context-propagation-api/latest/io/smallrye/context/api/CurrentThreadContext.html[`@CurrentThreadContext`] +annotation: + +[source,java] +---- + // Get the prices stream + @Inject + @Channel("prices") Publisher prices; + + @GET + @Path("/prices") + @Produces(MediaType.SERVER_SENT_EVENTS) + @SseElementType(MediaType.TEXT_PLAIN) + // Get rid of all context propagation, since we don't need it here + @CurrentThreadContext(unchanged = ThreadContext.ALL_REMAINING) + public Publisher prices() { + // get the next three prices from the price stream + return Multi.createFrom().publisher(prices) + .select().first(3); + } +---- + +=== Overriding the propagated contexts using CDI injection + +You can also inject a custom-built `ThreadContext` using the https://javadoc.io/doc/io.smallrye/smallrye-context-propagation-api/latest/io/smallrye/context/api/ThreadContextConfig.html[`@ThreadContextConfig`] annotation on your injection point: + +[source,java] +---- + // Get the prices stream + @Inject + @Channel("prices") Publisher prices; + // Get a ThreadContext that doesn't propagate context + @Inject + @ThreadContextConfig(unchanged = ThreadContext.ALL_REMAINING) + SmallRyeThreadContext threadContext; + + @GET + @Path("/prices") + @Produces(MediaType.SERVER_SENT_EVENTS) + @SseElementType(MediaType.TEXT_PLAIN) + public Publisher prices() { + // Get rid of all context propagation, since we don't need it here + try(CleanAutoCloseable ac = SmallRyeThreadContext.withThreadContext(threadContext)){ + // get the next three prices from the price stream + return Multi.createFrom().publisher(prices) + .select().first(3); + } + } +---- + + == Adding support for RxJava2 You need to include the following modules to get RxJava2 support: diff --git a/extensions/smallrye-context-propagation/deployment/pom.xml b/extensions/smallrye-context-propagation/deployment/pom.xml index 1cc9af0cfcb62f..2532ae391f4b1d 100644 --- a/extensions/smallrye-context-propagation/deployment/pom.xml +++ b/extensions/smallrye-context-propagation/deployment/pom.xml @@ -24,6 +24,11 @@ io.quarkus quarkus-smallrye-context-propagation + + io.quarkus + quarkus-junit5-internal + test + diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java new file mode 100644 index 00000000000000..b93d0b1b160e8b --- /dev/null +++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java @@ -0,0 +1,31 @@ +package io.quarkus.smallrye.context.deployment.test; + +import javax.inject.Inject; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.QuarkusUnitTest; +import io.smallrye.context.SmallRyeThreadContext; +import io.smallrye.context.impl.ThreadContextProviderPlan; + +public class AllClearedConfigTest { + @RegisterExtension + static final QuarkusUnitTest config = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .overrideConfigKey("mp.context.ThreadContext.propagated", ""); + + @Inject + SmallRyeThreadContext ctx; + + @Test + public void test() { + ThreadContextProviderPlan plan = ctx.getPlan(); + Assertions.assertTrue(plan.propagatedProviders.isEmpty()); + Assertions.assertFalse(plan.clearedProviders.isEmpty()); + Assertions.assertTrue(plan.unchangedProviders.isEmpty()); + } +} diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java new file mode 100644 index 00000000000000..25f9615d385abb --- /dev/null +++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java @@ -0,0 +1,32 @@ +package io.quarkus.smallrye.context.deployment.test; + +import javax.inject.Inject; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.QuarkusUnitTest; +import io.smallrye.context.SmallRyeThreadContext; +import io.smallrye.context.impl.ThreadContextProviderPlan; + +public class AllUnchangedConfigTest { + @RegisterExtension + static final QuarkusUnitTest config = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .overrideConfigKey("mp.context.ThreadContext.unchanged", "Remaining") + .overrideConfigKey("mp.context.ThreadContext.propagated", ""); + + @Inject + SmallRyeThreadContext ctx; + + @Test + public void test() { + ThreadContextProviderPlan plan = ctx.getPlan(); + Assertions.assertTrue(plan.propagatedProviders.isEmpty()); + Assertions.assertTrue(plan.clearedProviders.isEmpty()); + Assertions.assertFalse(plan.unchangedProviders.isEmpty()); + } +} diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java new file mode 100644 index 00000000000000..f24efdd7ec7478 --- /dev/null +++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java @@ -0,0 +1,30 @@ +package io.quarkus.smallrye.context.deployment.test; + +import javax.inject.Inject; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.QuarkusUnitTest; +import io.smallrye.context.SmallRyeThreadContext; +import io.smallrye.context.impl.ThreadContextProviderPlan; + +public class NoConfigTest { + @RegisterExtension + static final QuarkusUnitTest config = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + + @Inject + SmallRyeThreadContext ctx; + + @Test + public void test() { + ThreadContextProviderPlan plan = ctx.getPlan(); + Assertions.assertFalse(plan.propagatedProviders.isEmpty()); + Assertions.assertTrue(plan.clearedProviders.isEmpty()); + Assertions.assertTrue(plan.unchangedProviders.isEmpty()); + } +} diff --git a/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java b/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java index 8324186dbca2ea..d47a7f087cd2ac 100644 --- a/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java +++ b/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java @@ -16,7 +16,8 @@ public class SmallRyeContextPropagationProvider { @Singleton @DefaultBean public SmallRyeThreadContext getAllThreadContext() { - return (SmallRyeThreadContext) ThreadContext.builder().propagated(ThreadContext.ALL_REMAINING).cleared().unchanged() + // Make sure we use the default values, which use the MP Config keys to allow users to override them + return (SmallRyeThreadContext) ThreadContext.builder() .build(); } From 4fb43ca726fe7e9a3c0219ec44389afc3f0ba075 Mon Sep 17 00:00:00 2001 From: olivier dufour Date: Sun, 29 Aug 2021 13:42:24 +0200 Subject: [PATCH 077/138] stereotype and qualifier inheritence and transitive stereotype in arc --- .../quarkus/arc/processor/BeanDeployment.java | 17 +- .../java/io/quarkus/arc/processor/Beans.java | 179 +++++++++++++----- .../io/quarkus/arc/processor/DotNames.java | 2 + .../quarkus/arc/processor/StereotypeInfo.java | 18 +- .../MemberLevelInheritanceTest.java | 1 - .../inheritance/TypeLevelInheritanceTest.java | 54 +++++- .../StereotypeInheritanceTest.java | 99 ++++++++++ .../stereotypes/TransitiveStereotypeTest.java | 93 +++++++++ 8 files changed, 400 insertions(+), 63 deletions(-) create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java index 092d0b22a4e5de..0a814bda4d4862 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java @@ -483,6 +483,10 @@ ClassInfo getQualifier(DotName name) { return qualifiers.get(name); } + boolean isInheritedQualifier(DotName name) { + return (getQualifier(name).classAnnotation(DotNames.INHERITED) != null); + } + /** * Extracts qualifiers from given annotation instance. * This returns a collection because in case of repeating qualifiers there can be multiple. @@ -673,6 +677,10 @@ private Map findStereotypes(IndexView index, Map annotations : additionalStereotypes.values()) { stereotypeAnnotations.addAll(annotations); } + Set stereotypeNames = new HashSet<>(); + for (AnnotationInstance stereotype : stereotypeAnnotations) { + stereotypeNames.add(stereotype.target().asClass().name()); + } for (AnnotationInstance stereotype : stereotypeAnnotations) { final DotName stereotypeName = stereotype.target().asClass().name(); ClassInfo stereotypeClass = getClassByName(index, stereotypeName); @@ -682,6 +690,7 @@ private Map findStereotypes(IndexView index, Map scopes = new ArrayList<>(); List bindings = new ArrayList<>(); + List parentStereotypes = new ArrayList<>(); boolean isNamed = false; for (AnnotationInstance annotation : annotationStore.getAnnotations(stereotypeClass)) { @@ -689,6 +698,8 @@ private Map findStereotypes(IndexView index, Map findStereotypes(IndexView index, Map findStereotypes(IndexView index, Map qualifiers = new HashSet<>(); - List scopes = new ArrayList<>(); - Set types = Types.getClassBeanTypeClosure(beanClass, beanDeployment); - Integer alternativePriority = null; - boolean isAlternative = false; - boolean isDefaultBean = false; - List stereotypes = new ArrayList<>(); - String name = null; + private static class BeanInfoBuilder { + private static String name; + private static Integer alternativePriority; + private static boolean isAlternative; + private static boolean isDefaultBean; + + static void processInheritedAnnotation( + AnnotationInstance annotation, + BeanDeployment beanDeployment, + Set qualifiers, + List stereotypes) { + Collection qualifierCollection = beanDeployment.extractQualifiers(annotation); + for (AnnotationInstance qualifierAnnotation : qualifierCollection) { + if (beanDeployment.isInheritedQualifier(qualifierAnnotation.name())) { + qualifiers.add(qualifierAnnotation); + } + } + StereotypeInfo stereotype = beanDeployment.getStereotype(annotation.name()); + if (stereotype != null) { + if (stereotype.isInherited()) { + stereotypes.add(stereotype); + } + } + } - for (AnnotationInstance annotation : beanDeployment.getAnnotations(beanClass)) { + static void processAnnotation(AnnotationInstance annotation, + ClassInfo beanClass, + BeanDeployment beanDeployment, + Set qualifiers, + List stereotypes, + List scopes) { if (DotNames.NAMED.equals(annotation.name())) { AnnotationValue nameValue = annotation.value(); if (nameValue != null) { @@ -71,76 +91,119 @@ static BeanInfo createClassBean(ClassInfo beanClass, BeanDeployment beanDeployme StereotypeInfo stereotype = beanDeployment.getStereotype(annotation.name()); if (stereotype != null) { stereotypes.add(stereotype); - continue; + return; } if (!qualifierCollection.isEmpty()) { // we needn't process it further, the annotation was a qualifier (or multiple repeating ones) - continue; + return; } if (annotation.name() .equals(DotNames.ALTERNATIVE)) { isAlternative = true; - continue; + return; } if (annotation.name() .equals(DotNames.ALTERNATIVE_PRIORITY)) { isAlternative = true; alternativePriority = annotation.value().asInt(); - continue; + return; } if (DotNames.DEFAULT_BEAN.equals(annotation.name())) { isDefaultBean = true; - continue; + return; } if (annotation.name() .equals(DotNames.PRIORITY) && alternativePriority == null) { alternativePriority = annotation.value() .asInt(); - continue; + return; } ScopeInfo scopeAnnotation = beanDeployment.getScope(annotation.name()); if (scopeAnnotation != null) { - scopes.add(scopeAnnotation); - continue; + if (!scopes.contains(scopeAnnotation)) { + scopes.add(scopeAnnotation); + } } } - if (scopes.size() > 1) { - throw multipleScopesFound("Bean class " + beanClass, scopes); - } - ScopeInfo scope; - if (scopes.isEmpty()) { - // try to search stereotypes for scope - scope = initStereotypeScope(stereotypes, beanClass); - // if that fails, try inheriting them - if (scope == null) { - scope = inheritScope(beanClass, beanDeployment); + static BeanInfo build(ClassInfo beanClass, + BeanDeployment beanDeployment, + InjectionPointModifier transformer) { + Set qualifiers = new HashSet<>(); + List scopes = new ArrayList<>(); + Set types = Types.getClassBeanTypeClosure(beanClass, beanDeployment); + alternativePriority = null; + isAlternative = false; + isDefaultBean = false; + List stereotypes = new ArrayList<>(); + name = null; + Collection annotations = beanDeployment.getAnnotations(beanClass); + + processSuperClass(beanClass, beanDeployment, qualifiers, stereotypes); + for (AnnotationInstance annotation : annotations) { + processAnnotation(annotation, beanClass, beanDeployment, qualifiers, stereotypes, scopes); } - } else { - scope = scopes.get(0); - } - if (!isAlternative) { - isAlternative = initStereotypeAlternative(stereotypes); - } - if (name == null) { - name = initStereotypeName(stereotypes, beanClass); + + if (scopes.size() > 1) { + throw multipleScopesFound("Bean class " + beanClass, scopes); + } + ScopeInfo scope; + if (scopes.isEmpty()) { + // try to search stereotypes for scope + scope = initStereotypeScope(stereotypes, beanClass, beanDeployment); + // if that fails, try inheriting them + if (scope == null) { + scope = inheritScope(beanClass, beanDeployment); + } + } else { + scope = scopes.get(0); + } + if (!isAlternative) { + isAlternative = initStereotypeAlternative(stereotypes); + } + if (name == null) { + name = initStereotypeName(stereotypes, beanClass); + } + + if (isAlternative) { + alternativePriority = initAlternativePriority(beanClass, alternativePriority, stereotypes, beanDeployment); + if (alternativePriority == null) { + // after all attempts, priority is still null, bean will be ignored + LOGGER.debugf( + "Ignoring bean defined via %s - declared as an @Alternative but not selected by @Priority, @AlternativePriority or quarkus.arc.selected-alternatives", + beanClass.name()); + return null; + } + } + + return new BeanInfo(beanClass, beanDeployment, scope, types, qualifiers, + Injection.forBean(beanClass, null, beanDeployment, transformer), null, null, + isAlternative ? alternativePriority : null, stereotypes, name, isDefaultBean); } - if (isAlternative) { - alternativePriority = initAlternativePriority(beanClass, alternativePriority, stereotypes, beanDeployment); - if (alternativePriority == null) { - // after all attempts, priority is still null, bean will be ignored - LOGGER.debugf( - "Ignoring bean defined via %s - declared as an @Alternative but not selected by @Priority, @AlternativePriority or quarkus.arc.selected-alternatives", - beanClass.name()); - return null; + private static void processSuperClass(ClassInfo beanClass, BeanDeployment beanDeployment, + Set qualifiers, List stereotypes) { + DotName superClassName = beanClass.superName(); + while (!superClassName.equals(DotNames.OBJECT)) { + ClassInfo classFromIndex = getClassByName(beanDeployment.getBeanArchiveIndex(), superClassName); + if (classFromIndex == null) { + // class not in index + LOGGER.warnf("Unable to get inherited qualifier of stereotype for bean %s because its " + + "super class %s is not part of Jandex index. This inheritance will not apply.", + beanClass, + superClassName); + break; + } + for (AnnotationInstance annotation : beanDeployment.getAnnotationStore().getAnnotations(classFromIndex)) { + processInheritedAnnotation(annotation, beanDeployment, qualifiers, stereotypes); + } + superClassName = classFromIndex.superName(); } } + } - BeanInfo bean = new BeanInfo(beanClass, beanDeployment, scope, types, qualifiers, - Injection.forBean(beanClass, null, beanDeployment, transformer), null, null, - isAlternative ? alternativePriority : null, stereotypes, name, isDefaultBean); - return bean; + static BeanInfo createClassBean(ClassInfo beanClass, BeanDeployment beanDeployment, InjectionPointModifier transformer) { + return BeanInfoBuilder.build(beanClass, beanDeployment, transformer); } private static ScopeInfo inheritScope(ClassInfo beanClass, BeanDeployment beanDeployment) { @@ -231,7 +294,7 @@ static BeanInfo createProducerMethod(MethodInfo producerMethod, BeanInfo declari } ScopeInfo scope; if (scopes.isEmpty()) { - scope = initStereotypeScope(stereotypes, producerMethod); + scope = initStereotypeScope(stereotypes, producerMethod, beanDeployment); } else { scope = scopes.get(0); } @@ -322,7 +385,7 @@ static BeanInfo createProducerField(FieldInfo producerField, BeanInfo declaringB } ScopeInfo scope; if (scopes.isEmpty()) { - scope = initStereotypeScope(stereotypes, producerField); + scope = initStereotypeScope(stereotypes, producerField, beanDeployment); } else { scope = scopes.get(0); } @@ -364,7 +427,8 @@ private static DefinitionException multipleScopesFound(String baseMessage, List< + scopes.stream().map(s -> s.getDotName().toString()).collect(Collectors.joining(", "))); } - private static ScopeInfo initStereotypeScope(List stereotypes, AnnotationTarget target) { + private static ScopeInfo initStereotypeScope(List stereotypes, AnnotationTarget target, + BeanDeployment beanDeployment) { if (stereotypes.isEmpty()) { return null; } @@ -372,7 +436,18 @@ private static ScopeInfo initStereotypeScope(List stereotypes, A final Set additionalBDAScopes = new HashSet<>(); for (StereotypeInfo stereotype : stereotypes) { if (!stereotype.isAdditionalBeanDefiningAnnotation()) { - stereotypeScopes.add(stereotype.getDefaultScope()); + ScopeInfo defaultScope = stereotype.getDefaultScope(); + if (defaultScope == null) { + List parentStereotypes = new ArrayList<>(stereotype.getParentStereotypes().size()); + for (AnnotationInstance annotation : stereotype.getParentStereotypes()) { + StereotypeInfo parentStereotype = beanDeployment.getStereotype(annotation.name()); + parentStereotypes.add(parentStereotype); + } + defaultScope = initStereotypeScope(parentStereotypes, target, beanDeployment); + } + if (defaultScope != null) { + stereotypeScopes.add(defaultScope); + } } else { additionalBDAScopes.add(stereotype.getDefaultScope()); } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java index ed4c848622314c..6d6112e4db772f 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java @@ -9,6 +9,7 @@ import io.quarkus.arc.VetoedProducer; import io.quarkus.arc.impl.ComputingCache; import java.io.Serializable; +import java.lang.annotation.Inherited; import java.lang.annotation.Repeatable; import java.util.Optional; import java.util.OptionalDouble; @@ -67,6 +68,7 @@ public final class DotNames { public static final DotName DISPOSES = create(Disposes.class); public static final DotName QUALIFIER = create(Qualifier.class); public static final DotName REPEATABLE = create(Repeatable.class); + public static final DotName INHERITED = create(Inherited.class); public static final DotName NONBINDING = create(Nonbinding.class); public static final DotName INJECT = create(Inject.class); public static final DotName POST_CONSTRUCT = create(PostConstruct.class); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java index 13e841e14c1c76..ad7c96239bcce1 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java @@ -12,6 +12,8 @@ public class StereotypeInfo { private final boolean alternative; private final Integer alternativePriority; private final boolean isNamed; + private final boolean isInherited; + private final List parentStereotypes; private final ClassInfo target; // allows to differentiate between standard stereotype and one that is in fact additional bean defining annotation private final boolean isAdditionalBeanDefiningAnnotation; @@ -21,7 +23,7 @@ public class StereotypeInfo { public StereotypeInfo(ScopeInfo defaultScope, List interceptorBindings, boolean alternative, Integer alternativePriority, boolean isNamed, boolean isAdditionalBeanDefiningAnnotation, boolean isAdditionalStereotypeBuildItem, - ClassInfo target) { + ClassInfo target, boolean isInherited, List parentStereotypes) { this.defaultScope = defaultScope; this.interceptorBindings = interceptorBindings; this.alternative = alternative; @@ -30,12 +32,15 @@ public StereotypeInfo(ScopeInfo defaultScope, List intercept this.target = target; this.isAdditionalBeanDefiningAnnotation = isAdditionalBeanDefiningAnnotation; this.isAdditionalStereotypeBuildItem = isAdditionalStereotypeBuildItem; + this.isInherited = isInherited; + this.parentStereotypes = parentStereotypes; } public StereotypeInfo(ScopeInfo defaultScope, List interceptorBindings, boolean alternative, Integer alternativePriority, - boolean isNamed, ClassInfo target) { - this(defaultScope, interceptorBindings, alternative, alternativePriority, isNamed, false, false, target); + boolean isNamed, ClassInfo target, boolean isInherited, List parentStereotype) { + this(defaultScope, interceptorBindings, alternative, alternativePriority, isNamed, false, false, target, isInherited, + parentStereotype); } public ScopeInfo getDefaultScope() { @@ -50,6 +55,10 @@ public boolean isAlternative() { return alternative; } + public boolean isInherited() { + return isInherited; + } + public Integer getAlternativePriority() { return alternativePriority; } @@ -78,4 +87,7 @@ public boolean isGenuine() { return !isAdditionalBeanDefiningAnnotation && !isAdditionalStereotypeBuildItem; } + public List getParentStereotypes() { + return parentStereotypes; + } } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java index 1560a143aa3858..27cd06dd332c70 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java @@ -76,7 +76,6 @@ public DummyBean getBeanFromInitMethod() { @Inject public void initializerMethod(DummyBean bean) { - System.err.println("Initializer invoked!"); this.beanFromInitMethod = bean; } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java index 20865635ca6a7b..289688b8c8cad1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java @@ -7,6 +7,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; @@ -37,8 +38,9 @@ public class TypeLevelInheritanceTest { @RegisterExtension public ArcTestContainer container = ArcTestContainer.builder().removeUnusedBeans(false) - .beanClasses(BasicBean.class, SubBean.class, FirstInterceptor.class, - SecondInterceptor.class, MyBinding.class, MyStereotype.class, SecondaryBinding.class, MyQualifier.class) + .beanClasses(BasicBean.class, SubBean.class, FirstInterceptor.class, SecondInterceptor.class, + ThirdInterceptor.class, MyBinding.class, MyStereotype.class, MyStereotype2.class, + SecondaryBinding.class, MyQualifier.class, ThirdBinding.class, MyQualifier2.class) .build(); @Test @@ -47,23 +49,30 @@ public void testTypeInheritance() { assertEquals(0, FirstInterceptor.timesInvoked); assertEquals(0, SecondInterceptor.timesInvoked); + assertEquals(0, ThirdInterceptor.timesInvoked); - BasicBean basicBean = container.instance(BasicBean.class, new MyQualifier.Literal()).get(); + BasicBean basicBean = container.instance(BasicBean.class, new MyQualifier.Literal(), new MyQualifier2.Literal()).get(); assertNotNull(basicBean); basicBean.ping(); assertEquals(1, FirstInterceptor.timesInvoked); assertEquals(1, SecondInterceptor.timesInvoked); + assertEquals(1, ThirdInterceptor.timesInvoked); - SubBean subBean = container.instance(SubBean.class, new MyQualifier.Literal()).get(); + SubBean subBean = container.instance(SubBean.class, new MyQualifier.Literal(), new MyQualifier2.Literal()).get(); + assertNull(subBean); + subBean = container.instance(SubBean.class, new MyQualifier.Literal()).get(); assertNotNull(subBean); subBean.ping(); assertEquals(2, FirstInterceptor.timesInvoked); assertEquals(2, SecondInterceptor.timesInvoked); + assertEquals(1, ThirdInterceptor.timesInvoked); } @ApplicationScoped @MyBinding @MyQualifier + @MyQualifier2 + @MyStereotype2 @MyStereotype static class BasicBean { public void ping() { @@ -90,6 +99,19 @@ Object aroundInvoke(InvocationContext ctx) throws Exception { } } + @ThirdBinding + @Interceptor + @Priority(2) + static class ThirdInterceptor { + public static int timesInvoked = 0; + + @AroundInvoke + Object aroundInvoke(InvocationContext ctx) throws Exception { + timesInvoked++; + return ctx.proceed(); + } + } + @SecondaryBinding @Interceptor @Priority(1) @@ -118,13 +140,25 @@ Object aroundInvoke(InvocationContext ctx) throws Exception { @interface MyStereotype { } + @Stereotype + @ThirdBinding + @Target({ TYPE, METHOD, FIELD, PARAMETER }) + @Retention(RUNTIME) + @interface MyStereotype2 { + } + @Target({ TYPE, METHOD, FIELD, PARAMETER }) @Retention(RUNTIME) - @Inherited @InterceptorBinding @interface SecondaryBinding { } + @Target({ TYPE, METHOD, FIELD, PARAMETER }) + @Retention(RUNTIME) + @InterceptorBinding + @interface ThirdBinding { + } + @Inherited @Qualifier @Target({ TYPE, METHOD, FIELD, PARAMETER }) @@ -135,4 +169,14 @@ static class Literal extends AnnotationLiteral implements MyQualifi } } + + @Qualifier + @Target({ TYPE, METHOD, FIELD, PARAMETER }) + @Retention(RUNTIME) + @interface MyQualifier2 { + + static class Literal extends AnnotationLiteral implements MyQualifier2 { + + } + } } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java new file mode 100644 index 00000000000000..9945e7cb774913 --- /dev/null +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java @@ -0,0 +1,99 @@ +package io.quarkus.arc.test.stereotypes; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import java.util.Set; +import java.util.UUID; +import javax.annotation.PostConstruct; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +public class StereotypeInheritanceTest { + @RegisterExtension + public ArcTestContainer container = new ArcTestContainer(MyStereotype.class, MyBeanDefiningAnnotation.class, + MySuperclass.class, MyBean.class); + + @Test + public void test() { + ArcContainer container = Arc.container(); + BeanManager bm = container.beanManager(); + + String beanId; + + { + container.requestContext().activate(); + MyBean bean = container.instance(MyBean.class).get(); + assertNotNull(bean); + beanId = bean.getId(); + assertNotNull(beanId); + + Set> metadata = bm.getBeans(MyBean.class); + assertEquals(1, metadata.size()); + assertEquals(RequestScoped.class, metadata.iterator().next().getScope()); + + container.requestContext().deactivate(); + } + + { + container.requestContext().activate(); + MyBean bean = container.instance(MyBean.class).get(); + assertNotNull(bean); + assertNotNull(bean.getId()); + assertNotEquals(beanId, bean.getId()); + + Set> metadata = bm.getBeans(MyBean.class); + assertEquals(1, metadata.size()); + assertEquals(RequestScoped.class, metadata.iterator().next().getScope()); + + container.requestContext().deactivate(); + } + } + + @RequestScoped + @Stereotype + @Target({ TYPE, METHOD, FIELD }) + @Retention(RUNTIME) + @Inherited + @interface MyStereotype { + } + + @Stereotype + @Target({ TYPE, METHOD, FIELD }) + @Retention(RUNTIME) + @interface MyBeanDefiningAnnotation { + } + + @MyStereotype + static class MySuperclass { + } + + @MyBeanDefiningAnnotation + static class MyBean extends MySuperclass { + private String id; + + @PostConstruct + void init() { + id = UUID.randomUUID().toString(); + } + + public String getId() { + return id; + } + } +} \ No newline at end of file diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java new file mode 100644 index 00000000000000..f6374f3b3395c5 --- /dev/null +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java @@ -0,0 +1,93 @@ +package io.quarkus.arc.test.stereotypes; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import java.util.Set; +import java.util.UUID; +import javax.annotation.PostConstruct; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +public class TransitiveStereotypeTest { + @RegisterExtension + public ArcTestContainer container = new ArcTestContainer(MyStereotype.class, MyOtherStereotype.class, MyBean.class); + + @Test + public void test() { + ArcContainer container = Arc.container(); + BeanManager bm = container.beanManager(); + + String beanId; + + { + container.requestContext().activate(); + MyBean bean = container.instance(MyBean.class).get(); + assertNotNull(bean); + beanId = bean.getId(); + assertNotNull(beanId); + + Set> metadata = bm.getBeans(MyBean.class); + assertEquals(1, metadata.size()); + assertEquals(RequestScoped.class, metadata.iterator().next().getScope()); + + container.requestContext().deactivate(); + } + + { + container.requestContext().activate(); + MyBean bean = container.instance(MyBean.class).get(); + assertNotNull(bean); + assertNotNull(bean.getId()); + assertNotEquals(beanId, bean.getId()); + + Set> metadata = bm.getBeans(MyBean.class); + assertEquals(1, metadata.size()); + assertEquals(RequestScoped.class, metadata.iterator().next().getScope()); + + container.requestContext().deactivate(); + } + } + + @RequestScoped + @Stereotype + @Target({ TYPE, METHOD, FIELD }) + @Retention(RUNTIME) + @interface MyStereotype { + } + + @MyStereotype + @Stereotype + @Target({ TYPE, METHOD, FIELD }) + @Retention(RUNTIME) + @interface MyOtherStereotype { + } + + @MyOtherStereotype + static class MyBean { + private String id; + + @PostConstruct + void init() { + id = UUID.randomUUID().toString(); + } + + public String getId() { + return id; + } + } +} \ No newline at end of file From df57f2d26ea9a4a3bf375aa2656a92c6ed01f2ac Mon Sep 17 00:00:00 2001 From: Kevin Wooten Date: Thu, 2 Sep 2021 12:31:20 -0700 Subject: [PATCH 078/138] Update JNA to work with Apple M1 --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 5c39069a07e687..f9f59ab2500786 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -177,7 +177,7 @@ 5.2.Final 2.1.SP1 3.12.4 - 5.3.1 + 5.8.0 4.9.2 1.1.4.Final 14.0.0 From 6d139823c84291ea9b204e252080f0247c17067d Mon Sep 17 00:00:00 2001 From: Mahaswami Software Date: Fri, 3 Sep 2021 01:13:38 +0530 Subject: [PATCH 079/138] Remove Standalone lines should be true by default as doc says it is --- .../qute/core/src/main/java/io/quarkus/qute/EngineBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineBuilder.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineBuilder.java index 4f66378b5e3ec1..638e1777996fe4 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineBuilder.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineBuilder.java @@ -31,6 +31,7 @@ public final class EngineBuilder { this.resultMappers = new ArrayList<>(); this.parserHooks = new ArrayList<>(); this.strictRendering = true; + this.removeStandaloneLines = true; } public EngineBuilder addSectionHelper(SectionHelperFactory factory) { @@ -175,4 +176,4 @@ public Engine build() { return new EngineImpl(this); } -} \ No newline at end of file +} From e9e4d4832e227b9712c2d51a8c7e823cc126978d Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Thu, 2 Sep 2021 22:18:02 -0300 Subject: [PATCH 080/138] Test execution message is now copy/paste friendly The "Executing" message shown in the ArtifactLauncher implementations now allows you to copy/paste the command easily --- .../io/quarkus/test/common/DefaultDockerContainerLauncher.java | 2 +- .../main/java/io/quarkus/test/common/DefaultJarLauncher.java | 2 +- .../java/io/quarkus/test/common/DefaultNativeImageLauncher.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java index 2fa691ad88a106..25bee7ee66de85 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java @@ -104,7 +104,7 @@ public void start() throws IOException { Files.deleteIfExists(logFile); Files.createDirectories(logFile.getParent()); - System.out.println("Executing " + args); + System.out.println("Executing \"" + String.join(" ", args) + "\""); Function startedFunction = createStartedFunction(); diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java index a90a4d30b44288..c5b0df5c7b765c 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java @@ -66,7 +66,7 @@ public void start() throws IOException { args.add("-jar"); args.add(jarPath.toAbsolutePath().toString()); - System.out.println("Executing " + args); + System.out.println("Executing \"" + String.join(" ", args) + "\""); Files.deleteIfExists(logFile); Files.createDirectories(logFile.getParent()); diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java index 584d8f9ca73cc7..0f95cf6a3778c9 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java @@ -96,7 +96,7 @@ public void start() throws IOException { args.add("-D" + e.getKey() + "=" + e.getValue()); } - System.out.println("Executing " + args); + System.out.println("Executing \"" + String.join(" ", args) + "\""); Files.deleteIfExists(logFile); Files.createDirectories(logFile.getParent()); From d35a89a40e5a1036de54697b45c5bad21cc7366c Mon Sep 17 00:00:00 2001 From: Michal Karm Babacek Date: Fri, 3 Sep 2021 09:14:03 +0200 Subject: [PATCH 081/138] LambdaContainerHandlerSubstitution class must be marked final --- .../lambda/http/graal/LambdaContainerHandlerSubstitution.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/graal/LambdaContainerHandlerSubstitution.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/graal/LambdaContainerHandlerSubstitution.java index e2f2ede57953ab..d1c9ffebdd1960 100644 --- a/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/graal/LambdaContainerHandlerSubstitution.java +++ b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/graal/LambdaContainerHandlerSubstitution.java @@ -5,7 +5,7 @@ import com.oracle.svm.core.annotate.TargetClass; @TargetClass(LambdaContainerHandler.class) -public class LambdaContainerHandlerSubstitution { +public final class LambdaContainerHandlerSubstitution { // afterburner does not work in native mode, so let's ensure it's never registered @Substitute From 690210e6db847c84736d0cf63c255958943e7c40 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Fri, 3 Sep 2021 10:54:48 +0300 Subject: [PATCH 082/138] Ensure that eager security handling works in native mode Fixes: #19878 --- .../deployment/ResteasyReactiveProcessor.java | 49 ++++++++++++------- .../common/processor/EndpointIndexer.java | 32 ++++++++++-- .../io/quarkus/it/keycloak/HelloResource.java | 4 ++ .../it/keycloak/HelloResourceBase.java | 11 +++++ .../quarkus/it/keycloak/IHelloResource.java | 14 ++++++ .../quarkus/it/keycloak/HelloResourceIT.java | 7 +++ .../it/keycloak/HelloResourceTest.java | 18 +++++++ 7 files changed, 114 insertions(+), 21 deletions(-) create mode 100644 integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/HelloResource.java create mode 100644 integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/HelloResourceBase.java create mode 100644 integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/IHelloResource.java create mode 100644 integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/HelloResourceIT.java create mode 100644 integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/HelloResourceTest.java diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java index d9b37a93faab06..62fac03831ff8b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java @@ -10,11 +10,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.ws.rs.Priorities; @@ -41,13 +41,13 @@ import org.jboss.resteasy.reactive.common.model.ResourceDynamicFeature; import org.jboss.resteasy.reactive.common.model.ResourceFeature; import org.jboss.resteasy.reactive.common.model.ResourceInterceptors; -import org.jboss.resteasy.reactive.common.model.ResourceMethod; import org.jboss.resteasy.reactive.common.model.ResourceReader; import org.jboss.resteasy.reactive.common.model.ResourceWriter; import org.jboss.resteasy.reactive.common.processor.AdditionalReaderWriter; import org.jboss.resteasy.reactive.common.processor.AdditionalReaders; import org.jboss.resteasy.reactive.common.processor.AdditionalWriters; import org.jboss.resteasy.reactive.common.processor.DefaultProducesHandler; +import org.jboss.resteasy.reactive.common.processor.EndpointIndexer; import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames; import org.jboss.resteasy.reactive.common.processor.scanning.ApplicationScanningResult; import org.jboss.resteasy.reactive.common.processor.scanning.ResourceScanningResult; @@ -335,7 +335,7 @@ public void setupEndpoints(Capabilities capabilities, BeanArchiveIndexBuildItem QuarkusServerEndpointIndexer.Builder serverEndpointIndexerBuilder = new QuarkusServerEndpointIndexer.Builder() .addMethodScanners( - methodScanners.stream().map(MethodScannerBuildItem::getMethodScanner).collect(Collectors.toList())) + methodScanners.stream().map(MethodScannerBuildItem::getMethodScanner).collect(toList())) .setIndex(index) .setFactoryCreator(new QuarkusFactoryCreator(recorder, beanContainerBuildItem.getValue())) .setEndpointInvokerFactory(new QuarkusInvokerFactory(generatedClassBuildItemBuildProducer, recorder)) @@ -353,13 +353,20 @@ public void setupEndpoints(Capabilities capabilities, BeanArchiveIndexBuildItem .setClassLevelExceptionMappers( classLevelExceptionMappers.isPresent() ? classLevelExceptionMappers.get().getMappers() : Collections.emptyMap()) - .setResourceMethodCallback(new Consumer>() { + .setResourceMethodCallback(new Consumer<>() { @Override - public void accept(Map.Entry entry) { - MethodInfo method = entry.getKey(); + public void accept(EndpointIndexer.ResourceMethodCallbackData entry) { + MethodInfo method = entry.getMethodInfo(); String source = ResteasyReactiveProcessor.class.getSimpleName() + " > " + method.declaringClass() + "[" + method + "]"; + ClassInfo classInfoWithSecurity = consumeStandardSecurityAnnotations(method, + entry.getActualEndpointInfo(), index, c -> c); + if (classInfoWithSecurity != null) { + reflectiveClass.produce(new ReflectiveClassBuildItem(false, true, false, + entry.getActualEndpointInfo().name().toString())); + } + reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder() .type(method.returnType()) .index(index) @@ -648,21 +655,29 @@ MethodScannerBuildItem integrateEagerSecurity(Capabilities capabilities, Combine @Override public List scan(MethodInfo method, ClassInfo actualEndpointClass, Map methodContext) { - if (SecurityTransformerUtils.hasStandardSecurityAnnotation(method)) { - return Collections.singletonList(new EagerSecurityHandler.Customizer()); - } - ClassInfo c = actualEndpointClass; - while (c.superName() != null) { - if (SecurityTransformerUtils.hasStandardSecurityAnnotation(c)) { - return Collections.singletonList(new EagerSecurityHandler.Customizer()); - } - c = index.getClassByName(c.superName()); - } - return Collections.emptyList(); + return Objects.requireNonNullElse( + consumeStandardSecurityAnnotations(method, actualEndpointClass, index, + (c) -> Collections.singletonList(new EagerSecurityHandler.Customizer())), + Collections.emptyList()); } }); } + private T consumeStandardSecurityAnnotations(MethodInfo methodInfo, ClassInfo classInfo, IndexView index, + Function function) { + if (SecurityTransformerUtils.hasStandardSecurityAnnotation(methodInfo)) { + return function.apply(methodInfo.declaringClass()); + } + ClassInfo c = classInfo; + while (c.superName() != null) { + if (SecurityTransformerUtils.hasStandardSecurityAnnotation(c)) { + return function.apply(c); + } + c = index.getClassByName(c.superName()); + } + return null; + } + private Optional getAppPath(Optional newPropertyValue) { Optional legacyProperty = ConfigProvider.getConfig().getOptionalValue("quarkus.rest.path", String.class); if (legacyProperty.isPresent()) { diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java index 7620df556c91d9..46a374068d1d94 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java @@ -177,7 +177,7 @@ public abstract class EndpointIndexer> classLevelExceptionMappers; private final Function> factoryCreator; - private final Consumer> resourceMethodCallback; + private final Consumer resourceMethodCallback; protected EndpointIndexer(Builder builder) { this.index = builder.index; @@ -549,7 +549,7 @@ private ResourceMethod createResourceMethod(ClassInfo currentClassInfo, ClassInf handleAdditionalMethodProcessing((METHOD) method, currentClassInfo, currentMethodInfo); if (resourceMethodCallback != null) { - resourceMethodCallback.accept(new AbstractMap.SimpleEntry<>(currentMethodInfo, method)); + resourceMethodCallback.accept(new ResourceMethodCallbackData(currentMethodInfo, actualEndpointInfo, method)); } return method; } catch (Exception e) { @@ -1144,7 +1144,7 @@ public static abstract class Builder, B private AdditionalWriters additionalWriters; private boolean hasRuntimeConverters; private Map> classLevelExceptionMappers; - private Consumer> resourceMethodCallback; + private Consumer resourceMethodCallback; public B setDefaultBlocking(BlockingDefault defaultBlocking) { this.defaultBlocking = defaultBlocking; @@ -1206,7 +1206,7 @@ public B setClassLevelExceptionMappers(Map> classLe return (B) this; } - public B setResourceMethodCallback(Consumer> resourceMethodCallback) { + public B setResourceMethodCallback(Consumer resourceMethodCallback) { this.resourceMethodCallback = resourceMethodCallback; return (B) this; } @@ -1214,4 +1214,28 @@ public B setResourceMethodCallback(Consumer Date: Thu, 2 Sep 2021 16:12:37 +0200 Subject: [PATCH 083/138] Arc - transactional observers should register standard synchronization instead of interposed. --- .../CDIDelegatingTransactionManager.java | 3 + .../jta/runtime/NarayanaJtaProducers.java | 3 - .../java/io/quarkus/arc/impl/EventImpl.java | 67 ++++++++++++------- 3 files changed, 44 insertions(+), 29 deletions(-) diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/CDIDelegatingTransactionManager.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/CDIDelegatingTransactionManager.java index db0f965516b85e..d8caf9dc874873 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/CDIDelegatingTransactionManager.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/CDIDelegatingTransactionManager.java @@ -20,12 +20,15 @@ import org.jboss.logging.Logger; +import io.quarkus.arc.Unremovable; + /** * A delegating transaction manager which receives an instance of Narayana transaction manager * and delegates all calls to it. * On top of it the implementation adds the CDI events processing for {@link TransactionScoped}. */ @Singleton +@Unremovable // used by Arc for transactional observers public class CDIDelegatingTransactionManager implements TransactionManager, Serializable { private static final Logger log = Logger.getLogger(CDIDelegatingTransactionManager.class); diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java index a6c13e63d8df23..1a2fcc03bd25fe 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java @@ -14,8 +14,6 @@ import com.arjuna.ats.jbossatx.jta.RecoveryManagerService; import com.arjuna.ats.jta.UserTransaction; -import io.quarkus.arc.Unremovable; - @Dependent public class NarayanaJtaProducers { @@ -39,7 +37,6 @@ public XAResourceRecoveryRegistry xaResourceRecoveryRegistry() { @Produces @ApplicationScoped - @Unremovable // needed by Arc for transactional observers public TransactionSynchronizationRegistry transactionSynchronizationRegistry() { return new TransactionSynchronizationRegistryImple(); } diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java index f1b5672e3220bd..4f220560035027 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java @@ -35,7 +35,8 @@ import javax.enterprise.util.TypeLiteral; import javax.transaction.RollbackException; import javax.transaction.Synchronization; -import javax.transaction.TransactionSynchronizationRegistry; +import javax.transaction.SystemException; +import javax.transaction.TransactionManager; import org.jboss.logging.Logger; /** @@ -56,6 +57,8 @@ class EventImpl implements Event { private transient volatile Notifier lastNotifier; + private static final Logger LOGGER = Logger.getLogger(EventImpl.class); + EventImpl(Type eventType, Set qualifiers) { this.eventType = initEventType(eventType); this.injectionPointTypeHierarchy = new HierarchyDiscovery(this.eventType); @@ -246,35 +249,47 @@ void notify(T event, ObserverExceptionHandler exceptionHandler, boolean async) { if (!async && hasTxObservers) { // Note that tx observers are never async - InstanceHandle registryInstance = Arc.container() - .instance(TransactionSynchronizationRegistry.class); - - if (registryInstance.isAvailable() && - registryInstance.get().getTransactionStatus() == javax.transaction.Status.STATUS_ACTIVE) { - // we have one or more transactional OM, and TransactionSynchronizationRegistry is available - // we attempt to register a JTA synchronization - List> deferredEvents = new ArrayList<>(); - EventContext eventContext = new EventContextImpl<>(event, eventMetadata); - - for (ObserverMethod om : observerMethods) { - if (isTxObserver(om)) { - deferredEvents.add(new DeferredEventNotification<>(om, eventContext, - Status.valueOf(om.getTransactionPhase()))); + InstanceHandle transactionManagerInstance = Arc.container() + .instance(TransactionManager.class); + + try { + if (transactionManagerInstance.isAvailable() && + transactionManagerInstance.get().getStatus() == javax.transaction.Status.STATUS_ACTIVE) { + // we have one or more transactional OM, and TransactionManager is available + // we attempt to register a JTA synchronization + List> deferredEvents = new ArrayList<>(); + EventContext eventContext = new EventContextImpl<>(event, eventMetadata); + + for (ObserverMethod om : observerMethods) { + if (isTxObserver(om)) { + deferredEvents.add(new DeferredEventNotification<>(om, eventContext, + Status.valueOf(om.getTransactionPhase()))); + } } - } - Synchronization sync = new ArcSynchronization(deferredEvents); - TransactionSynchronizationRegistry registry = registryInstance.get(); - try { - registry.registerInterposedSynchronization(sync); - // registration succeeded, notify all non-tx observers synchronously - predicate = predicate.and(this::isNotTxObserver); - } catch (Exception e) { - if (e.getCause() instanceof RollbackException || e.getCause() instanceof IllegalStateException) { - // registration failed, AFTER_SUCCESS OMs are accordingly to CDI spec left out - predicate = predicate.and(this::isNotAfterSuccess); + Synchronization sync = new ArcSynchronization(deferredEvents); + TransactionManager txManager = transactionManagerInstance.get(); + try { + // NOTE - We are using standard synchronization on purpose as that seems more + // fitting than interposed sync. Either way will have some use-cases that won't work. + // See for instance discussions on https://github.com/eclipse-ee4j/cdi/issues/467 + txManager.getTransaction().registerSynchronization(sync); + // registration succeeded, notify all non-tx observers synchronously + predicate = predicate.and(this::isNotTxObserver); + } catch (Exception e) { + if (e.getCause() instanceof RollbackException + || e.getCause() instanceof IllegalStateException + || e.getCause() instanceof SystemException) { + // registration failed, AFTER_SUCCESS OMs are accordingly to CDI spec left out + predicate = predicate.and(this::isNotAfterSuccess); + } } } + } catch (SystemException e) { + // In theory, this can be thrown by TransactionManager#getStatus() at which point we cannot even + // determine if we should register some synchronization, therefore, we only log this + LOGGER.debugf("Failure when trying to invoke TransactionManager#getStatus(). Stacktrace: %s", + e.getCause() != null ? e.getCause() : e); } } From d142b2fe4f201e67583391c2c14ebde110f219db Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Fri, 3 Sep 2021 11:28:21 +0300 Subject: [PATCH 084/138] Fix use of OpenTelemetry OTLP exporter in native mode Essentially the fact that ClientTracingFilter was using a static field for TextMapPropagator was causing GraalVM to initialize the entire telemetry infrastructure at build time Fixes: #19877 --- .../restclient/ClientTracingFilter.java | 2 +- .../resteasy-reactive-rest-client/pom.xml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/restclient/ClientTracingFilter.java b/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/restclient/ClientTracingFilter.java index 9d34efb149b285..5f43898887b75e 100644 --- a/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/restclient/ClientTracingFilter.java +++ b/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/restclient/ClientTracingFilter.java @@ -26,7 +26,7 @@ @Priority(Priorities.HEADER_DECORATOR) public class ClientTracingFilter implements ClientRequestFilter, ClientResponseFilter { - private static final TextMapPropagator TEXT_MAP_PROPAGATOR = GlobalOpenTelemetry.getPropagators().getTextMapPropagator(); + private final TextMapPropagator TEXT_MAP_PROPAGATOR = GlobalOpenTelemetry.getPropagators().getTextMapPropagator(); private static final String SCOPE_KEY = ClientTracingFilter.class.getName() + ".scope"; private static final String SPAN_KEY = ClientTracingFilter.class.getName() + ".span"; diff --git a/integration-tests/resteasy-reactive-rest-client/pom.xml b/integration-tests/resteasy-reactive-rest-client/pom.xml index 2d8b52256bea0a..00b80a5053e236 100644 --- a/integration-tests/resteasy-reactive-rest-client/pom.xml +++ b/integration-tests/resteasy-reactive-rest-client/pom.xml @@ -31,6 +31,11 @@ io.quarkus quarkus-opentelemetry + + + io.quarkus + quarkus-opentelemetry-exporter-otlp + @@ -99,6 +104,19 @@ + + io.quarkus + quarkus-opentelemetry-exporter-otlp-deployment + ${project.version} + pom + test + + + * + * + + + From c91431c9b1eea471d62da10a819be41e279dc7d9 Mon Sep 17 00:00:00 2001 From: Martin Kouba Date: Fri, 3 Sep 2021 13:50:29 +0200 Subject: [PATCH 085/138] ArC - make it possible to identify additional bean archives --- .../BeanArchivePredicateBuildItem.java | 25 +++++++++++ .../arc/deployment/BeanArchiveProcessor.java | 41 +++++++++++++++---- 2 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchivePredicateBuildItem.java diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchivePredicateBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchivePredicateBuildItem.java new file mode 100644 index 00000000000000..26aabbf1797463 --- /dev/null +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchivePredicateBuildItem.java @@ -0,0 +1,25 @@ +package io.quarkus.arc.deployment; + +import java.util.function.Predicate; + +import io.quarkus.builder.item.MultiBuildItem; +import io.quarkus.deployment.ApplicationArchive; + +/** + * + * By default, only explict/implicit bean archives (as defined by the spec) are considered during the bean discovery. However, + * extensions can register a logic to identify additional bean archives. + */ +public final class BeanArchivePredicateBuildItem extends MultiBuildItem { + + private final Predicate predicate; + + public BeanArchivePredicateBuildItem(Predicate predicate) { + this.predicate = predicate; + } + + public Predicate getPredicate() { + return predicate; + } + +} diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java index 2bb662fd5a7b04..8133de96db552a 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java @@ -1,6 +1,11 @@ package io.quarkus.arc.deployment; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; import org.jboss.jandex.AnnotationInstance; @@ -35,12 +40,13 @@ public BeanArchiveIndexBuildItem build(ArcConfig config, ApplicationArchivesBuil List additionalBeanDefiningAnnotations, List additionalBeans, List generatedBeans, LiveReloadBuildItem liveReloadBuildItem, BuildProducer generatedClass, - CustomScopeAnnotationsBuildItem customScopes, List excludeDependencyBuildItems) + CustomScopeAnnotationsBuildItem customScopes, List excludeDependencyBuildItems, + List beanArchivePredicates) throws Exception { // First build an index from application archives IndexView applicationIndex = buildApplicationIndex(config, applicationArchivesBuildItem, - additionalBeanDefiningAnnotations, customScopes, excludeDependencyBuildItems); + additionalBeanDefiningAnnotations, customScopes, excludeDependencyBuildItems, beanArchivePredicates); // Then build additional index for beans added by extensions Indexer additionalBeanIndexer = new Indexer(); @@ -81,7 +87,8 @@ public BeanArchiveIndexBuildItem build(ArcConfig config, ApplicationArchivesBuil private IndexView buildApplicationIndex(ArcConfig config, ApplicationArchivesBuildItem applicationArchivesBuildItem, List additionalBeanDefiningAnnotations, - CustomScopeAnnotationsBuildItem customScopes, List excludeDependencyBuildItems) { + CustomScopeAnnotationsBuildItem customScopes, List excludeDependencyBuildItems, + List beanArchivePredicates) { Set archives = applicationArchivesBuildItem.getAllApplicationArchives(); @@ -116,10 +123,8 @@ private IndexView buildApplicationIndex(ArcConfig config, ApplicationArchivesBui continue; } IndexView index = archive.getIndex(); - // NOTE: Implicit bean archive without beans.xml contains one or more bean classes with a bean defining annotation and no extension - if (archive.getChildPath("META-INF/beans.xml") != null || archive.getChildPath("WEB-INF/beans.xml") != null - || (index.getAllKnownImplementors(DotNames.EXTENSION).isEmpty() - && containsBeanDefiningAnnotation(index, beanDefiningAnnotations))) { + if (isExplicitBeanArchive(archive) || isImplicitBeanArchive(index, beanDefiningAnnotations) + || isAdditionalBeanArchive(archive, beanArchivePredicates)) { indexes.add(index); } } @@ -127,6 +132,26 @@ && containsBeanDefiningAnnotation(index, beanDefiningAnnotations))) { return CompositeIndex.create(indexes); } + private boolean isExplicitBeanArchive(ApplicationArchive archive) { + return archive.getChildPath("META-INF/beans.xml") != null || archive.getChildPath("WEB-INF/beans.xml") != null; + } + + private boolean isImplicitBeanArchive(IndexView index, Set beanDefiningAnnotations) { + // NOTE: Implicit bean archive without beans.xml contains one or more bean classes with a bean defining annotation and no extension + return index.getAllKnownImplementors(DotNames.EXTENSION).isEmpty() + && containsBeanDefiningAnnotation(index, beanDefiningAnnotations); + } + + private boolean isAdditionalBeanArchive(ApplicationArchive archive, + List beanArchivePredicates) { + for (BeanArchivePredicateBuildItem p : beanArchivePredicates) { + if (p.getPredicate().test(archive)) { + return true; + } + } + return false; + } + private boolean isApplicationArchiveExcluded(ArcConfig config, List excludeDependencyBuildItems, ApplicationArchive archive) { if (archive.getArtifactKey() != null) { From 13bc4d27509dad67c6ef4fcfb4148ab23d802214 Mon Sep 17 00:00:00 2001 From: Martin Kouba Date: Fri, 3 Sep 2021 13:52:14 +0200 Subject: [PATCH 086/138] gRPC - register additional bean archives - an application archive that contains a MutinyBean implementor is an additional bean archive - resolves #19864 --- .../grpc/deployment/GrpcServerProcessor.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java index dab50d36a386ca..ec726faa57c9ff 100644 --- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java +++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java @@ -40,6 +40,7 @@ import io.grpc.internal.ServerImpl; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem; +import io.quarkus.arc.deployment.BeanArchivePredicateBuildItem; import io.quarkus.arc.deployment.CustomScopeAnnotationsBuildItem; import io.quarkus.arc.deployment.GeneratedBeanBuildItem; import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor; @@ -49,6 +50,7 @@ import io.quarkus.arc.processor.AnnotationsTransformer; import io.quarkus.arc.processor.BeanInfo; import io.quarkus.arc.processor.BuiltinScope; +import io.quarkus.deployment.ApplicationArchive; import io.quarkus.deployment.IsDevelopment; import io.quarkus.deployment.IsNormal; import io.quarkus.deployment.annotations.BuildProducer; @@ -546,6 +548,18 @@ void configureMetrics(GrpcBuildTimeConfig configuration, Optional() { + + @Override + public boolean test(ApplicationArchive archive) { + // Every archive that contains a generated implementor of MutinyBean is considered a bean archive + return !archive.getIndex().getKnownDirectImplementors(GrpcDotNames.MUTINY_BEAN).isEmpty(); + } + }); + } + private static class GrpcInterceptors { final Set globalInterceptors; final Set nonGlobalInterceptors; From 361494784de7ae7aa73e755be57d3a417113f2da Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Fri, 3 Sep 2021 16:29:50 +0300 Subject: [PATCH 087/138] Fix issue with skip predicates in scheduled methods Before this fix, the implementations where actually eligible for bean removal Fixes: #19900 --- .../deployment/SchedulerProcessor.java | 6 +++++ .../test/ConditionalExecutionTest.java | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java b/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java index 490927bc4c6534..f2e1825b9007d6 100644 --- a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java +++ b/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java @@ -96,6 +96,7 @@ public class SchedulerProcessor { static final DotName SCHEDULED_NAME = DotName.createSimple(Scheduled.class.getName()); static final DotName SCHEDULES_NAME = DotName.createSimple(Scheduled.Schedules.class.getName()); static final DotName SKIP_NEVER_NAME = DotName.createSimple(Scheduled.Never.class.getName()); + static final DotName SKIP_PREDICATE = DotName.createSimple(Scheduled.SkipPredicate.class.getName()); static final Type SCHEDULED_EXECUTION_TYPE = Type.create(DotName.createSimple(ScheduledExecution.class.getName()), Kind.CLASS); @@ -466,4 +467,9 @@ private Throwable validateScheduled(CronParser parser, AnnotationInstance schedu return null; } + @BuildStep + UnremovableBeanBuildItem unremoveableSkipPredicates() { + return new UnremovableBeanBuildItem(new UnremovableBeanBuildItem.BeanTypeExclusion(SKIP_PREDICATE)); + } + } diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java index 6f7e0b9eab1311..f04cd3eff6a4b8 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java @@ -1,11 +1,13 @@ package io.quarkus.scheduler.test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; import javax.enterprise.event.Observes; import javax.inject.Singleton; @@ -44,17 +46,25 @@ public void testExecution() { Thread.currentThread().interrupt(); throw new IllegalStateException(e); } + + assertTrue(OtherIsDisabled.TESTED.get()); + assertEquals(0, Jobs.OTHER_COUNT.get()); } static class Jobs { static final CountDownLatch COUNTER = new CountDownLatch(1); + static final AtomicInteger OTHER_COUNT = new AtomicInteger(0); @Scheduled(identity = "foo", every = "1s", skipExecutionIf = IsDisabled.class) void doSomething() throws InterruptedException { COUNTER.countDown(); } + @Scheduled(identity = "other-foo", every = "1s", skipExecutionIf = OtherIsDisabled.class) + void doSomethingElse() throws InterruptedException { + OTHER_COUNT.incrementAndGet(); + } } @Singleton @@ -77,4 +87,17 @@ void onSkip(@Observes SkippedExecution event) { } } + + @Singleton + public static class OtherIsDisabled implements Scheduled.SkipPredicate { + + static final AtomicBoolean TESTED = new AtomicBoolean(false); + + @Override + public boolean test(ScheduledExecution execution) { + TESTED.set(true); + return true; + } + + } } From 0132488677976f9dde37722632690229f6fa6e6a Mon Sep 17 00:00:00 2001 From: Martin Kouba Date: Fri, 3 Sep 2021 15:43:04 +0200 Subject: [PATCH 088/138] Qute docs - introduce the "Qute Used as a Standalone Library" section --- docs/src/main/asciidoc/qute-reference.adoc | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/docs/src/main/asciidoc/qute-reference.adoc b/docs/src/main/asciidoc/qute-reference.adoc index 4d74d0bb867cba..091d85e418a826 100644 --- a/docs/src/main/asciidoc/qute-reference.adoc +++ b/docs/src/main/asciidoc/qute-reference.adoc @@ -17,8 +17,12 @@ The usage of reflection is minimized to reduce the size of native images. The API combines both the imperative and the non-blocking reactive style of coding. In the development mode, all files located in the `src/main/resources/templates` folder are watched for changes and modifications are immediately visible in your application. Furthermore, Qute attempts to detect most of the template problems at build time and fail fast. + In this guide, you will find an <>, the description of the <> and <> details. +NOTE: Qute is primarily designed as a Quarkus extension. It is possible to use it as a "standalone" library too. However, in such case some of the features are not available. In general, any feature mentioned under the <> section is missing. You can find more information about the limitations and possibilities in the <> section. + + [[hello_world_example]] == Hello World Example @@ -992,6 +996,7 @@ NOTE: The template rendering is divided in two phases. During the first phase, w === Engine Configuration +[[value-resolvers]] ==== Value Resolvers Value resolvers are used when evaluating expressions. @@ -1006,6 +1011,7 @@ engineBuilder.addValueResolver(ValueResolver.builder() .build()); ---- +[[template-locator]] ==== Template Locator Manual registration is sometimes handy but it's also possible to register a template locator using `EngineBuilder.addLocator(Function>)`. @@ -1673,6 +1679,7 @@ WARNING: Unlike with `@Inject` the templates obtained via `RestTemplate` are not In the development mode, all files located in `src/main/resources/templates` are watched for changes and modifications are immediately visible. +[[type-safe-message-bundles]] === Type-safe Message Bundles ==== Basic Concepts @@ -1838,3 +1845,33 @@ public class MyBean { === Configuration Reference include::{generated-dir}/config/quarkus-qute.adoc[leveloffset=+1, opts=optional] + + +[[standalone]] +== Qute Used as a Standalone Library + +Qute is primarily designed as a Quarkus extension. +However. it is possible to use it as a "standalone" library. +In this case, some features are not available and some additional configuration is needed. + +Engine:: First of all, no managed `Engine` instance is available out of the box. +You'll need to configure a new instance via `Engine.builder()`. + +Templates:: +* By default, no <> are registered, i.e. `Engine.getTemplate(String)` will not work. +* You can register a custom template locator or parse a template manually and put the reulst in the cache via `Engine.putTemplate(String, Template)`. + +Value resolvers:: +* No <> are generated automatically. +** <> will not work. +** <> annotations are ignored. +* It's recommended to register a `ReflectionValueResolver` instance via `Engine.addValueResolver(new ReflectionValueResolver())` so that Qute can access object properties and call public methods. ++ +NOTE: Keep in mind that reflection may not work correctly in some restricted environments or may require additional configuration, e.g. registration in case of a GraalVM native image. +* A custom value resolver can be easily built via `ValueResolver.builder()` + +Type-safety:: +* <> are not validated. +* <> are not supported. + +Injection:: It is not possible to inject a `Template` instance and vice versa - a template cannot inject a `@Named` CDI bean via the `inject:` namespace. \ No newline at end of file From 849b9885395e4b698a0c03213e2599d759621fb8 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Fri, 3 Sep 2021 11:28:21 +0300 Subject: [PATCH 089/138] Fix use of OpenTelemetry OTLP exporter in native mode Essentially the fact that ClientTracingFilter was using a static field for TextMapPropagator was causing GraalVM to initialize the entire telemetry infrastructure at build time Fixes: #19877 --- .../restclient/ClientTracingFilter.java | 2 +- .../resteasy-reactive-rest-client/pom.xml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/restclient/ClientTracingFilter.java b/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/restclient/ClientTracingFilter.java index 9d34efb149b285..5f43898887b75e 100644 --- a/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/restclient/ClientTracingFilter.java +++ b/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/restclient/ClientTracingFilter.java @@ -26,7 +26,7 @@ @Priority(Priorities.HEADER_DECORATOR) public class ClientTracingFilter implements ClientRequestFilter, ClientResponseFilter { - private static final TextMapPropagator TEXT_MAP_PROPAGATOR = GlobalOpenTelemetry.getPropagators().getTextMapPropagator(); + private final TextMapPropagator TEXT_MAP_PROPAGATOR = GlobalOpenTelemetry.getPropagators().getTextMapPropagator(); private static final String SCOPE_KEY = ClientTracingFilter.class.getName() + ".scope"; private static final String SPAN_KEY = ClientTracingFilter.class.getName() + ".span"; diff --git a/integration-tests/resteasy-reactive-rest-client/pom.xml b/integration-tests/resteasy-reactive-rest-client/pom.xml index 2d8b52256bea0a..00b80a5053e236 100644 --- a/integration-tests/resteasy-reactive-rest-client/pom.xml +++ b/integration-tests/resteasy-reactive-rest-client/pom.xml @@ -31,6 +31,11 @@ io.quarkus quarkus-opentelemetry + + + io.quarkus + quarkus-opentelemetry-exporter-otlp + @@ -99,6 +104,19 @@ + + io.quarkus + quarkus-opentelemetry-exporter-otlp-deployment + ${project.version} + pom + test + + + * + * + + + From d57ddba8b3c19a78ad0dff9663c37b5c30d9b012 Mon Sep 17 00:00:00 2001 From: Ken Finnigan Date: Thu, 2 Sep 2021 15:48:17 -0400 Subject: [PATCH 090/138] Fix RESTEasy classic server templating for observability - Fixes #18251 - Add test to Micrometer integration test. Verified not a problem with RESTEasy Reactive - Add test to OpenTelemetry integration test to very fix for RESTEasy Classic --- .../RestPathAnnotationProcessor.java | 27 +++++++++++++- .../prometheus/PathTemplateResource.java | 13 +++++++ .../PrometheusMetricsRegistryTest.java | 10 +++++ .../opentelemetry/PathTemplateResource.java | 13 +++++++ .../opentelemetry/OpenTelemetryTestCase.java | 37 +++++++++++++++++++ 5 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PathTemplateResource.java create mode 100644 integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PathTemplateResource.java diff --git a/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/RestPathAnnotationProcessor.java b/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/RestPathAnnotationProcessor.java index 16b31619285581..16cf244beafc9f 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/RestPathAnnotationProcessor.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/RestPathAnnotationProcessor.java @@ -1,5 +1,6 @@ package io.quarkus.resteasy.deployment; +import java.util.List; import java.util.Optional; import java.util.regex.Pattern; @@ -18,6 +19,7 @@ import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem; +import io.quarkus.resteasy.common.spi.ResteasyDotNames; import io.quarkus.resteasy.runtime.QuarkusRestPathTemplate; import io.quarkus.resteasy.runtime.QuarkusRestPathTemplateInterceptor; import io.quarkus.resteasy.server.common.spi.ResteasyJaxrsConfigBuildItem; @@ -81,14 +83,22 @@ public void transform(TransformationContext ctx) { AnnotationInstance annotation = methodInfo.annotation(REST_PATH); if (annotation == null) { - return; + // Check for @Path on class and not method + if (!isRestEndpointMethod(methodInfo.annotations())) { + return; + } } // Don't create annotations for rest clients if (classInfo.classAnnotation(REGISTER_REST_CLIENT) != null) { return; } - StringBuilder stringBuilder = new StringBuilder(slashify(annotation.value().asString())); + StringBuilder stringBuilder; + if (annotation != null) { + stringBuilder = new StringBuilder(slashify(annotation.value().asString())); + } else { + stringBuilder = new StringBuilder(); + } // Look for @Path annotation on the class annotation = classInfo.classAnnotation(REST_PATH); @@ -128,6 +138,19 @@ String slashify(String path) { return '/' + path; } + boolean isRestEndpointMethod(List annotations) { + boolean isRestEndpointMethod = false; + + for (AnnotationInstance annotation : annotations) { + if (ResteasyDotNames.JAXRS_METHOD_ANNOTATIONS.contains(annotation.name())) { + isRestEndpointMethod = true; + break; + } + } + + return isRestEndpointMethod; + } + private boolean notRequired(Capabilities capabilities, Optional metricsCapability) { return capabilities.isMissing(Capability.RESTEASY) || diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PathTemplateResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PathTemplateResource.java new file mode 100644 index 00000000000000..721e384a04300b --- /dev/null +++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PathTemplateResource.java @@ -0,0 +1,13 @@ +package io.quarkus.it.micrometer.prometheus; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; + +@Path("template/path/{value}") +public class PathTemplateResource { + @GET + public String get(@PathParam("value") String value) { + return "Received: " + value; + } +} diff --git a/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryTest.java b/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryTest.java index 595ed7ed54bfa7..2a76940f1e80d6 100644 --- a/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryTest.java +++ b/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryTest.java @@ -77,6 +77,13 @@ void testAllTheThings() { .body(containsString("OK")); } + @Test + @Order(9) + void testTemplatedPathOnClass() { + when().get("/template/path/anything").then().statusCode(200) + .body(containsString("Received: anything")); + } + @Test @Order(10) void testPrometheusScrapeEndpoint() { @@ -103,6 +110,9 @@ void testPrometheusScrapeEndpoint() { .body(containsString("uri=\"/message/match/{id}/{sub}\"")) .body(containsString("uri=\"/message/match/{other}\"")) + .body(containsString( + "http_server_requests_seconds_count{env=\"test\",method=\"GET\",outcome=\"SUCCESS\",registry=\"prometheus\",status=\"200\",uri=\"/template/path/{value}\"")) + // Verify Hibernate Metrics .body(containsString( "hibernate_sessions_open_total{entityManagerFactory=\"\",env=\"test\",registry=\"prometheus\",} 2.0")) diff --git a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PathTemplateResource.java b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PathTemplateResource.java new file mode 100644 index 00000000000000..323cd0119a6838 --- /dev/null +++ b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PathTemplateResource.java @@ -0,0 +1,13 @@ +package io.quarkus.it.opentelemetry; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; + +@Path("template/path/{value}") +public class PathTemplateResource { + @GET + public String get(@PathParam("value") String value) { + return "Received: " + value; + } +} diff --git a/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTestCase.java b/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTestCase.java index 70f3ccfdd51621..9d203cf3c13f37 100644 --- a/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTestCase.java +++ b/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTestCase.java @@ -708,6 +708,43 @@ void testAsyncClientTracing() { Assertions.assertTrue(clientServerFound); } + @Test + void testTemplatedPathOnClass() { + resetExporter(); + + given() + .contentType("application/json") + .when().get("/template/path/something") + .then() + .statusCode(200) + .body(containsString("Received: something")); + + Awaitility.await().atMost(Duration.ofMinutes(2)).until(() -> getSpans().size() == 1); + Map spanData = getSpans().get(0); + Assertions.assertNotNull(spanData); + Assertions.assertNotNull(spanData.get("spanId")); + + verifyResource(spanData); + + Assertions.assertEquals("template/path/{value}", spanData.get("name")); + Assertions.assertEquals(SpanKind.SERVER.toString(), spanData.get("kind")); + Assertions.assertTrue((Boolean) spanData.get("ended")); + + Assertions.assertEquals(SpanId.getInvalid(), spanData.get("parent_spanId")); + Assertions.assertEquals(TraceId.getInvalid(), spanData.get("parent_traceId")); + Assertions.assertFalse((Boolean) spanData.get("parent_valid")); + Assertions.assertFalse((Boolean) spanData.get("parent_remote")); + + Assertions.assertEquals("GET", spanData.get("attr_http.method")); + Assertions.assertEquals("1.1", spanData.get("attr_http.flavor")); + Assertions.assertEquals("/template/path/something", spanData.get("attr_http.target")); + Assertions.assertEquals(directUrl.getAuthority(), spanData.get("attr_http.host")); + Assertions.assertEquals("http", spanData.get("attr_http.scheme")); + Assertions.assertEquals("200", spanData.get("attr_http.status_code")); + Assertions.assertNotNull(spanData.get("attr_http.client_ip")); + Assertions.assertNotNull(spanData.get("attr_http.user_agent")); + } + private void verifyResource(Map spanData) { Assertions.assertEquals("opentelemetry-integration-test", spanData.get("resource_service.name")); Assertions.assertEquals("999-SNAPSHOT", spanData.get("resource_service.version")); From 66126ab4a48f8f0413bf269c21669e5324f082d7 Mon Sep 17 00:00:00 2001 From: Guillaume Le Floch Date: Fri, 3 Sep 2021 14:23:30 +0200 Subject: [PATCH 091/138] Fix gradle deployment classpath leak --- .../java/io/quarkus/gradle/QuarkusPlugin.java | 10 +- ...ApplicationDeploymentClasspathBuilder.java | 18 +-- .../ConditionalDependenciesEnabler.java | 115 +++--------------- .../gradle/dependency/DependencyUtils.java | 80 ++++++++++++ .../ext-a/runtime/build.gradle | 1 + .../gradle/ConditionalDependenciesTest.java | 1 + 6 files changed, 110 insertions(+), 115 deletions(-) diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java index fb1b6b8618a331..c2f3d735004a5b 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java @@ -33,7 +33,6 @@ import io.quarkus.gradle.builder.QuarkusModelBuilder; import io.quarkus.gradle.dependency.ApplicationDeploymentClasspathBuilder; import io.quarkus.gradle.dependency.ConditionalDependenciesEnabler; -import io.quarkus.gradle.dependency.ExtensionDependency; import io.quarkus.gradle.extension.QuarkusPluginExtension; import io.quarkus.gradle.extension.SourceSetExtension; import io.quarkus.gradle.tasks.QuarkusAddExtension; @@ -273,15 +272,14 @@ private void afterEvaluate(Project project) { ConditionalDependenciesEnabler conditionalDependenciesEnabler = new ConditionalDependenciesEnabler(project); ApplicationDeploymentClasspathBuilder deploymentClasspathBuilder = new ApplicationDeploymentClasspathBuilder(project); - Set commonExtensions = conditionalDependenciesEnabler + conditionalDependenciesEnabler .declareConditionalDependencies(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME); - deploymentClasspathBuilder.createBuildClasspath(commonExtensions, JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME); - deploymentClasspathBuilder.addCommonExtension(commonExtensions); + deploymentClasspathBuilder.createBuildClasspath(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME, true); for (String baseConfiguration : CONDITIONAL_DEPENDENCY_LOOKUP) { - Set extensionDependencies = conditionalDependenciesEnabler + conditionalDependenciesEnabler .declareConditionalDependencies(baseConfiguration); - deploymentClasspathBuilder.createBuildClasspath(extensionDependencies, baseConfiguration); + deploymentClasspathBuilder.createBuildClasspath(baseConfiguration, false); } final HashSet visited = new HashSet<>(); diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/dependency/ApplicationDeploymentClasspathBuilder.java b/devtools/gradle/src/main/java/io/quarkus/gradle/dependency/ApplicationDeploymentClasspathBuilder.java index e9e53d11a2e59e..f49fe94a7138f1 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/dependency/ApplicationDeploymentClasspathBuilder.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/dependency/ApplicationDeploymentClasspathBuilder.java @@ -22,25 +22,25 @@ public static String toDeploymentConfigurationName(String baseConfigurationName) return baseConfigurationName + DEPLOYMENT_CONFIGURATION_SUFFIX; } - public void createBuildClasspath(Set extensions, String baseConfigurationName) { + public void createBuildClasspath(String baseConfigurationName, boolean common) { String deploymentConfigurationName = toDeploymentConfigurationName(baseConfigurationName); project.getConfigurations().create(deploymentConfigurationName); DependencyHandler dependencies = project.getDependencies(); - for (ExtensionDependency extension : extensions) { - if (commonExtensions.contains(extension)) { + Set firstLevelExtensions = DependencyUtils.loadQuarkusExtension(project, + project.getConfigurations().findByName(baseConfigurationName)); + for (ExtensionDependency extension : firstLevelExtensions) { + if (common) { + commonExtensions.add(extension); + } else if (commonExtensions.contains(extension)) { continue; } extension.createDeploymentVariant(dependencies); - createDeploymentClasspath(deploymentConfigurationName, extension, dependencies); + requireDeploymentDependency(deploymentConfigurationName, extension, dependencies); } } - public void addCommonExtension(Set commonExtensions) { - this.commonExtensions.addAll(commonExtensions); - } - - private void createDeploymentClasspath(String deploymentConfigurationName, ExtensionDependency extension, + private void requireDeploymentDependency(String deploymentConfigurationName, ExtensionDependency extension, DependencyHandler dependencies) { ExternalDependency dependency = (ExternalDependency) dependencies.add(deploymentConfigurationName, extension.asDependencyNotation()); diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/dependency/ConditionalDependenciesEnabler.java b/devtools/gradle/src/main/java/io/quarkus/gradle/dependency/ConditionalDependenciesEnabler.java index fcb942ff7dbc99..39414d74335b7f 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/dependency/ConditionalDependenciesEnabler.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/dependency/ConditionalDependenciesEnabler.java @@ -1,66 +1,46 @@ package io.quarkus.gradle.dependency; -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.nio.file.FileSystem; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Set; -import org.gradle.api.GradleException; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.Dependency; import org.gradle.api.artifacts.ModuleVersionIdentifier; import org.gradle.api.artifacts.ResolvedArtifact; -import io.quarkus.bootstrap.BootstrapConstants; -import io.quarkus.bootstrap.model.AppArtifactCoords; -import io.quarkus.bootstrap.model.AppArtifactKey; -import io.quarkus.bootstrap.util.BootstrapUtils; -import io.quarkus.bootstrap.util.ZipUtils; - public class ConditionalDependenciesEnabler { private final Map featureVariants = new HashMap<>(); + private final Project project; public ConditionalDependenciesEnabler(Project project) { this.project = project; } - public Set declareConditionalDependencies(String baseConfigurationName) { + public void declareConditionalDependencies(String baseConfigurationName) { featureVariants.clear(); Configuration resolvedConfiguration = DependencyUtils.duplicateConfiguration(project, project.getConfigurations().getByName(baseConfigurationName)); + Set runtimeArtifacts = resolvedConfiguration.getResolvedConfiguration().getResolvedArtifacts(); List extensions = collectExtensionsForResolution(runtimeArtifacts); featureVariants.putAll(extractFeatureVariants(extensions)); resolveConditionalDependencies(extensions, resolvedConfiguration, baseConfigurationName); - - Configuration resolvedExtensionsConfiguration = DependencyUtils.duplicateConfiguration(project, - project.getConfigurations().getByName(baseConfigurationName)); - Set enabledExtension = getEnabledExtension(resolvedExtensionsConfiguration); - project.getConfigurations().remove(resolvedExtensionsConfiguration); - - return enabledExtension; } private List collectExtensionsForResolution(Set runtimeArtifacts) { List firstLevelExtensions = new ArrayList<>(); for (ResolvedArtifact artifact : runtimeArtifacts) { - ExtensionDependency extension = getExtensionInfoOrNull(artifact); + ExtensionDependency extension = DependencyUtils.getExtensionInfoOrNull(project, artifact); if (extension != null) { if (!extension.conditionalDependencies.isEmpty()) { if (extension.needsResolution(runtimeArtifacts)) { @@ -72,43 +52,19 @@ private List collectExtensionsForResolution(Set getEnabledExtension(Configuration classpath) { - Set enabledExtensions = new HashSet<>(); - for (ResolvedArtifact artifact : classpath.getResolvedConfiguration().getResolvedArtifacts()) { - ExtensionDependency extension = getExtensionInfoOrNull(artifact); - if (extension != null) { - enabledExtensions.add(extension); - } - } - return enabledExtensions; - } - - private Map extractFeatureVariants(List extensions) { - Map possibleVariant = new HashMap<>(); - for (ExtensionDependency extension : extensions) { - for (Dependency dependency : extension.conditionalDependencies) { - possibleVariant.put(DependencyUtils.asFeatureName(dependency), extension); - } - } - return possibleVariant; - } - private void resolveConditionalDependencies(List conditionalExtensions, Configuration existingDependencies, String baseConfigurationName) { final Configuration conditionalDeps = createConditionalDependenciesConfiguration(existingDependencies, conditionalExtensions); boolean hasChanged = false; - Map validConditionalDependencies = new HashMap<>(); List newConditionalDependencies = new ArrayList<>(); newConditionalDependencies.addAll(conditionalExtensions); for (ResolvedArtifact artifact : conditionalDeps.getResolvedConfiguration().getResolvedArtifacts()) { - ExtensionDependency extensionDependency = getExtensionInfoOrNull(artifact); + ExtensionDependency extensionDependency = DependencyUtils.getExtensionInfoOrNull(project, artifact); if (extensionDependency != null) { if (DependencyUtils.exist(conditionalDeps.getResolvedConfiguration().getResolvedArtifacts(), extensionDependency.dependencyConditions)) { enableConditionalDependency(extensionDependency.extensionId); - validConditionalDependencies.put(DependencyUtils.asFeatureName(extensionDependency.extensionId), - extensionDependency); if (!extensionDependency.conditionalDependencies.isEmpty()) { featureVariants.putAll(extractFeatureVariants(Collections.singletonList(extensionDependency))); } @@ -130,6 +86,16 @@ private void resolveConditionalDependencies(List conditiona } } + private Map extractFeatureVariants(List extensions) { + Map possibleVariant = new HashMap<>(); + for (ExtensionDependency extension : extensions) { + for (Dependency dependency : extension.conditionalDependencies) { + possibleVariant.put(DependencyUtils.asFeatureName(dependency), extension); + } + } + return possibleVariant; + } + private Configuration createConditionalDependenciesConfiguration(Configuration existingDeps, List extensions) { Configuration newConfiguration = existingDeps.copy(); @@ -153,55 +119,4 @@ private void enableConditionalDependency(ModuleVersionIdentifier dependency) { } extension.importConditionalDependency(project.getDependencies(), dependency); } - - private ExtensionDependency getExtensionInfoOrNull(ResolvedArtifact artifact) { - ModuleVersionIdentifier artifactId = artifact.getModuleVersion().getId(); - File artifactFile = artifact.getFile(); - if (!artifactFile.exists() || !"jar".equals(artifact.getExtension())) { - return null; - } - if (artifactFile.isDirectory()) { - Path descriptorPath = artifactFile.toPath().resolve(BootstrapConstants.DESCRIPTOR_PATH); - if (Files.exists(descriptorPath)) { - return loadExtensionInfo(descriptorPath, artifactId); - } - } else { - try (FileSystem artifactFs = ZipUtils.newFileSystem(artifactFile.toPath())) { - Path descriptorPath = artifactFs.getPath(BootstrapConstants.DESCRIPTOR_PATH); - if (Files.exists(descriptorPath)) { - return loadExtensionInfo(descriptorPath, artifactId); - } - } catch (IOException e) { - throw new GradleException("Failed to read " + artifactFile, e); - } - } - return null; - } - - private ExtensionDependency loadExtensionInfo(Path descriptorPath, ModuleVersionIdentifier exentionId) { - final Properties extensionProperties = new Properties(); - try (BufferedReader reader = Files.newBufferedReader(descriptorPath)) { - extensionProperties.load(reader); - } catch (IOException e) { - throw new GradleException("Failed to load " + descriptorPath, e); - } - AppArtifactCoords deploymentModule = AppArtifactCoords - .fromString(extensionProperties.getProperty(BootstrapConstants.PROP_DEPLOYMENT_ARTIFACT)); - final List conditionalDependencies; - if (extensionProperties.containsKey(BootstrapConstants.CONDITIONAL_DEPENDENCIES)) { - final String[] deps = BootstrapUtils - .splitByWhitespace(extensionProperties.getProperty(BootstrapConstants.CONDITIONAL_DEPENDENCIES)); - conditionalDependencies = new ArrayList<>(deps.length); - for (String conditionalDep : deps) { - conditionalDependencies.add(DependencyUtils.create(project.getDependencies(), conditionalDep)); - } - } else { - conditionalDependencies = Collections.emptyList(); - } - - final AppArtifactKey[] constraints = BootstrapUtils - .parseDependencyCondition(extensionProperties.getProperty(BootstrapConstants.DEPENDENCY_CONDITION)); - return new ExtensionDependency(exentionId, deploymentModule, conditionalDependencies, - constraints == null ? Collections.emptyList() : Arrays.asList(constraints)); - } } diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/dependency/DependencyUtils.java b/devtools/gradle/src/main/java/io/quarkus/gradle/dependency/DependencyUtils.java index d10ba758e398c0..91e17dbe0bf193 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/dependency/DependencyUtils.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/dependency/DependencyUtils.java @@ -1,10 +1,20 @@ package io.quarkus.gradle.dependency; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.nio.file.FileSystem; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Properties; import java.util.Set; +import org.gradle.api.GradleException; import org.gradle.api.Project; import org.gradle.api.UnknownDomainObjectException; import org.gradle.api.artifacts.Configuration; @@ -18,8 +28,11 @@ import org.gradle.api.initialization.IncludedBuild; import org.gradle.api.plugins.JavaPlugin; +import io.quarkus.bootstrap.BootstrapConstants; import io.quarkus.bootstrap.model.AppArtifactCoords; import io.quarkus.bootstrap.model.AppArtifactKey; +import io.quarkus.bootstrap.util.BootstrapUtils; +import io.quarkus.bootstrap.util.ZipUtils; public class DependencyUtils { @@ -74,6 +87,21 @@ public static boolean exists(Set runtimeArtifacts, Dependency return false; } + public static Set loadQuarkusExtension(Project project, Configuration configuration) { + Set extensions = new HashSet<>(); + Configuration configurationCopy = duplicateConfiguration(project, configuration); + + Set resolvedArtifacts = configurationCopy.getResolvedConfiguration().getResolvedArtifacts(); + for (ResolvedArtifact artifact : resolvedArtifacts) { + ExtensionDependency extension = getExtensionInfoOrNull(project, artifact); + if (extension != null) { + extensions.add(extension); + } + } + + return extensions; + } + public static boolean isTestFixtureDependency(Dependency dependency) { if (!(dependency instanceof ModuleDependency)) { return false; @@ -138,4 +166,56 @@ public static String asFeatureName(ModuleVersionIdentifier version) { public static String asFeatureName(Dependency version) { return version.getGroup() + ":" + version.getName(); } + + public static ExtensionDependency getExtensionInfoOrNull(Project project, ResolvedArtifact artifact) { + ModuleVersionIdentifier artifactId = artifact.getModuleVersion().getId(); + File artifactFile = artifact.getFile(); + if (!artifactFile.exists() || !"jar".equals(artifact.getExtension())) { + return null; + } + if (artifactFile.isDirectory()) { + Path descriptorPath = artifactFile.toPath().resolve(BootstrapConstants.DESCRIPTOR_PATH); + if (Files.exists(descriptorPath)) { + return loadExtensionInfo(project, descriptorPath, artifactId); + } + } else { + try (FileSystem artifactFs = ZipUtils.newFileSystem(artifactFile.toPath())) { + Path descriptorPath = artifactFs.getPath(BootstrapConstants.DESCRIPTOR_PATH); + if (Files.exists(descriptorPath)) { + return loadExtensionInfo(project, descriptorPath, artifactId); + } + } catch (IOException e) { + throw new GradleException("Failed to read " + artifactFile, e); + } + } + return null; + } + + private static ExtensionDependency loadExtensionInfo(Project project, Path descriptorPath, + ModuleVersionIdentifier exentionId) { + final Properties extensionProperties = new Properties(); + try (BufferedReader reader = Files.newBufferedReader(descriptorPath)) { + extensionProperties.load(reader); + } catch (IOException e) { + throw new GradleException("Failed to load " + descriptorPath, e); + } + AppArtifactCoords deploymentModule = AppArtifactCoords + .fromString(extensionProperties.getProperty(BootstrapConstants.PROP_DEPLOYMENT_ARTIFACT)); + final List conditionalDependencies; + if (extensionProperties.containsKey(BootstrapConstants.CONDITIONAL_DEPENDENCIES)) { + final String[] deps = BootstrapUtils + .splitByWhitespace(extensionProperties.getProperty(BootstrapConstants.CONDITIONAL_DEPENDENCIES)); + conditionalDependencies = new ArrayList<>(deps.length); + for (String conditionalDep : deps) { + conditionalDependencies.add(DependencyUtils.create(project.getDependencies(), conditionalDep)); + } + } else { + conditionalDependencies = Collections.emptyList(); + } + + final AppArtifactKey[] constraints = BootstrapUtils + .parseDependencyCondition(extensionProperties.getProperty(BootstrapConstants.DEPENDENCY_CONDITION)); + return new ExtensionDependency(exentionId, deploymentModule, conditionalDependencies, + constraints == null ? Collections.emptyList() : Arrays.asList(constraints)); + } } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/runtime/build.gradle index 7595b95a938b6d..76e136b7022732 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/runtime/build.gradle +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/runtime/build.gradle @@ -8,6 +8,7 @@ dependencies { api("org.acme:simple-dependency:1.0-SNAPSHOT") { exclude module: "transitive-dependency" } + api("io.quarkus:quarkus-hibernate-reactive-panache") } publishing { diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/ConditionalDependenciesTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/ConditionalDependenciesTest.java index fb6a41b53dc253..4dacdd806b78ef 100644 --- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/ConditionalDependenciesTest.java +++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/ConditionalDependenciesTest.java @@ -86,6 +86,7 @@ public void shouldImportConditionalDependency() throws IOException, URISyntaxExc final Path deploymentLib = buildDir.toPath().resolve("quarkus-app").resolve("lib").resolve("deployment"); assertThat(deploymentLib.resolve("org.acme.transitive-dependency-1.0-SNAPSHOT.jar")).exists(); + assertThat(deploymentLib.resolve("io.quarkus.quarkus-agroal-" + getQuarkusVersion() + ".jar")).doesNotExist(); } @Test From 793ffd7300c1ac4a732fc8cdf5e995d14aa95b8a Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Fri, 3 Sep 2021 11:48:52 -0400 Subject: [PATCH 092/138] Fixed a broken link in a guide --- docs/src/main/asciidoc/kafka-schema-registry-avro.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc b/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc index ee4109b2640bfc..e31ad1b5aa98ee 100644 --- a/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc +++ b/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc @@ -45,7 +45,7 @@ However, you can go right to the completed example. Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive]. -The solution is located in the `kafka-avro-schema-quickstart` {quickstarts-tree-url}/kafka-quickstart-avro-schema[directory]. +The solution is located in the `kafka-avro-schema-quickstart` {quickstarts-tree-url}/kafka-avro-schema-quickstart[directory]. == Creating the Maven Project From 9a15b82a7047d555f3bfdfb5530f046929539b79 Mon Sep 17 00:00:00 2001 From: Alexey Loubyansky Date: Fri, 3 Sep 2021 16:28:02 +0200 Subject: [PATCH 093/138] Include relevant upstream catalogs even if their versions aren't recommended for new projects Moved io.quarkus.maven.StreamCoords to io.quarkus.registry.catalog.PlatformStreamCoords --- .../cli/common/TargetQuarkusVersionGroup.java | 8 +- .../common/TargetQuarkusVersionGroupTest.java | 8 +- .../registry/client/TestRegistryClient.java | 3 + .../client/TestRegistryClientBuilder.java | 107 +++++++++--- .../create/MultiplePlatformBomsTestBase.java | 21 ++- ...eferencingArchivedUpstreamVersionTest.java | 162 ++++++++++++++++++ .../registry/ExtensionCatalogResolver.java | 158 +++++++++-------- .../registry/RegistryExtensionResolver.java | 8 + .../catalog/PlatformStreamCoords.java} | 10 +- .../catalog/json/JsonCatalogMerger.java | 46 +++++ .../catalog/json/JsonCatalogMergerTest.java | 99 +++++++++++ 11 files changed, 524 insertions(+), 106 deletions(-) create mode 100644 independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingArchivedUpstreamVersionTest.java rename independent-projects/tools/{artifact-api/src/main/java/io/quarkus/maven/StreamCoords.java => registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamCoords.java} (71%) create mode 100644 independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/json/JsonCatalogMergerTest.java diff --git a/devtools/cli/src/main/java/io/quarkus/cli/common/TargetQuarkusVersionGroup.java b/devtools/cli/src/main/java/io/quarkus/cli/common/TargetQuarkusVersionGroup.java index 7444fd2418a984..11c55b6fe0a9b5 100644 --- a/devtools/cli/src/main/java/io/quarkus/cli/common/TargetQuarkusVersionGroup.java +++ b/devtools/cli/src/main/java/io/quarkus/cli/common/TargetQuarkusVersionGroup.java @@ -2,15 +2,15 @@ import io.quarkus.cli.Version; import io.quarkus.maven.ArtifactCoords; -import io.quarkus.maven.StreamCoords; import io.quarkus.platform.tools.ToolsConstants; +import io.quarkus.registry.catalog.PlatformStreamCoords; import picocli.CommandLine; import picocli.CommandLine.Model.CommandSpec; public class TargetQuarkusVersionGroup { final static String FULL_EXAMPLE = ToolsConstants.DEFAULT_PLATFORM_BOM_GROUP_ID + ":" + ToolsConstants.DEFAULT_PLATFORM_BOM_ARTIFACT_ID + ":2.2.0.Final"; - StreamCoords streamCoords = null; + PlatformStreamCoords streamCoords = null; String validStream = null; ArtifactCoords platformBom = null; @@ -25,7 +25,7 @@ void setStream(String stream) { stream = stream.trim(); if (!stream.isEmpty()) { try { - streamCoords = StreamCoords.fromString(stream); + streamCoords = PlatformStreamCoords.fromString(stream); validStream = stream; } catch (IllegalArgumentException iex) { throw new CommandLine.ParameterException(spec.commandLine(), @@ -94,7 +94,7 @@ public boolean isStreamSpecified() { return streamCoords != null; } - public StreamCoords getStream() { + public PlatformStreamCoords getStream() { return streamCoords; } diff --git a/devtools/cli/src/test/java/io/quarkus/cli/common/TargetQuarkusVersionGroupTest.java b/devtools/cli/src/test/java/io/quarkus/cli/common/TargetQuarkusVersionGroupTest.java index 9b0b62eb44fe15..e2d3f8593cc345 100644 --- a/devtools/cli/src/test/java/io/quarkus/cli/common/TargetQuarkusVersionGroupTest.java +++ b/devtools/cli/src/test/java/io/quarkus/cli/common/TargetQuarkusVersionGroupTest.java @@ -5,8 +5,8 @@ import io.quarkus.cli.Version; import io.quarkus.maven.ArtifactCoords; -import io.quarkus.maven.StreamCoords; import io.quarkus.platform.tools.ToolsConstants; +import io.quarkus.registry.catalog.PlatformStreamCoords; public class TargetQuarkusVersionGroupTest { final static String clientVersion = Version.clientVersion(); @@ -64,7 +64,7 @@ void testPlatformUseDefaultGroupVersion() { void testStreamUseDFullyQualified() { qvg.setStream("stream-platform:stream-version"); - StreamCoords coords = qvg.getStream(); + PlatformStreamCoords coords = qvg.getStream(); Assertions.assertEquals("stream-platform", coords.getPlatformKey()); Assertions.assertEquals("stream-version", coords.getStreamId()); } @@ -73,7 +73,7 @@ void testStreamUseDFullyQualified() { void testStreamUseDefaultPlatformKey() { qvg.setStream(":stream-version"); - StreamCoords coords = qvg.getStream(); + PlatformStreamCoords coords = qvg.getStream(); Assertions.assertNull(coords.getPlatformKey()); Assertions.assertEquals("stream-version", coords.getStreamId()); } @@ -82,7 +82,7 @@ void testStreamUseDefaultPlatformKey() { void testStreamUseDefaultStreamId() { qvg.setStream("stream-platform:"); - StreamCoords coords = qvg.getStream(); + PlatformStreamCoords coords = qvg.getStream(); Assertions.assertEquals("stream-platform", coords.getPlatformKey()); Assertions.assertEquals("", coords.getStreamId()); } diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClient.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClient.java index 70f6a22777edd8..97f532d2a36387 100644 --- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClient.java +++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClient.java @@ -120,6 +120,9 @@ private ExtensionCatalog deserializeExtensionCatalog(Path p) throws RegistryReso public PlatformCatalog resolvePlatforms(String quarkusVersion) throws RegistryResolutionException { final Path json = TestRegistryClientBuilder.getRegistryPlatformsCatalogPath(registryDir, quarkusVersion); log.debug("%s resolvePlatforms %s", config.getId(), json); + if (!Files.exists(json)) { + return null; + } try { return JsonCatalogMapperHelper.deserialize(json, JsonPlatformCatalog.class); } catch (IOException e) { diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java index 74936a9ea295a0..195a7c1103ee43 100644 --- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java +++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java @@ -106,6 +106,7 @@ public static class TestRegistryBuilder { private JsonRegistryQuarkusVersionsConfig quarkusVersions; private boolean external; private PlatformCatalog platformCatalog; + private JsonPlatformCatalog archivedPlatformCatalog; private List memberCatalogs; private List nonPlatformCatalogs; @@ -221,37 +222,72 @@ private void configure(Path registryDir) { platformConfig .setArtifact(new ArtifactCoords(registryGroupId, Constants.DEFAULT_REGISTRY_PLATFORMS_CATALOG_ARTIFACT_ID, null, "json", Constants.DEFAULT_REGISTRY_ARTIFACT_VERSION)); - if (platformCatalog == null) { + if (platformCatalog == null && archivedPlatformCatalog == null) { platformConfig.setDisabled(true); } else { final Path platformsDir = getRegistryPlatformsDir(registryDir); - persistPlatformCatalog(platformCatalog, platformsDir); final Map platformsByQuarkusVersion = new HashMap<>(); - for (Platform p : platformCatalog.getPlatforms()) { - for (PlatformStream s : p.getStreams()) { - for (PlatformRelease r : s.getReleases()) { - if (r.getQuarkusCoreVersion() == null) { - throw new IllegalStateException("Quarkus version has not be configured for platform release " - + p.getPlatformKey() + ":" + s.getId() + ":" + r.getVersion()); - } - final JsonPlatformCatalog c = platformsByQuarkusVersion.computeIfAbsent(r.getQuarkusCoreVersion(), - v -> new JsonPlatformCatalog()); - JsonPlatform platform = (JsonPlatform) c.getPlatform(p.getPlatformKey()); - if (platform == null) { - platform = new JsonPlatform(); - platform.setPlatformKey(p.getPlatformKey()); - c.addPlatform(platform); + if (platformCatalog != null) { + persistPlatformCatalog(platformCatalog, platformsDir); + for (Platform p : platformCatalog.getPlatforms()) { + for (PlatformStream s : p.getStreams()) { + for (PlatformRelease r : s.getReleases()) { + if (r.getQuarkusCoreVersion() == null) { + throw new IllegalStateException( + "Quarkus version has not be configured for platform release " + + p.getPlatformKey() + ":" + s.getId() + ":" + r.getVersion()); + } + final JsonPlatformCatalog c = platformsByQuarkusVersion.computeIfAbsent( + r.getQuarkusCoreVersion(), + v -> new JsonPlatformCatalog()); + JsonPlatform platform = (JsonPlatform) c.getPlatform(p.getPlatformKey()); + if (platform == null) { + platform = new JsonPlatform(); + platform.setPlatformKey(p.getPlatformKey()); + c.addPlatform(platform); + } + JsonPlatformStream stream = (JsonPlatformStream) platform.getStream(s.getId()); + if (stream == null) { + stream = new JsonPlatformStream(); + stream.setId(s.getId()); + platform.addStream(stream); + } + stream.addRelease(r); } - JsonPlatformStream stream = (JsonPlatformStream) platform.getStream(s.getId()); - if (stream == null) { - stream = new JsonPlatformStream(); - stream.setId(s.getId()); - platform.addStream(stream); + } + } + } + + if (archivedPlatformCatalog != null) { + for (Platform p : archivedPlatformCatalog.getPlatforms()) { + for (PlatformStream s : p.getStreams()) { + for (PlatformRelease r : s.getReleases()) { + if (r.getQuarkusCoreVersion() == null) { + throw new IllegalStateException( + "Quarkus version has not be configured for platform release " + + p.getPlatformKey() + ":" + s.getId() + ":" + r.getVersion()); + } + final JsonPlatformCatalog c = platformsByQuarkusVersion.computeIfAbsent( + r.getQuarkusCoreVersion(), + v -> new JsonPlatformCatalog()); + JsonPlatform platform = (JsonPlatform) c.getPlatform(p.getPlatformKey()); + if (platform == null) { + platform = new JsonPlatform(); + platform.setPlatformKey(p.getPlatformKey()); + c.addPlatform(platform); + } + JsonPlatformStream stream = (JsonPlatformStream) platform.getStream(s.getId()); + if (stream == null) { + stream = new JsonPlatformStream(); + stream.setId(s.getId()); + platform.addStream(stream); + } + stream.addRelease(r); } - stream.addRelease(r); } } } + for (Map.Entry entry : platformsByQuarkusVersion.entrySet()) { persistPlatformCatalog(entry.getValue(), platformsDir.resolve(entry.getKey())); } @@ -339,6 +375,33 @@ public TestPlatformCatalogReleaseBuilder newRelease(String version) { return new TestPlatformCatalogReleaseBuilder(this, release); } + public TestPlatformCatalogReleaseBuilder newArchivedRelease(String version) { + final JsonPlatformRelease release = new JsonPlatformRelease(); + release.setVersion(JsonPlatformReleaseVersion.fromString(version)); + + if (platform.registry.archivedPlatformCatalog == null) { + platform.registry.archivedPlatformCatalog = new JsonPlatformCatalog(); + } + + JsonPlatform archivedPlatform = (JsonPlatform) platform.registry.archivedPlatformCatalog + .getPlatform(platform.platform.getPlatformKey()); + if (archivedPlatform == null) { + archivedPlatform = new JsonPlatform(); + archivedPlatform.setPlatformKey(platform.platform.getPlatformKey()); + platform.registry.archivedPlatformCatalog.addPlatform(archivedPlatform); + } + + JsonPlatformStream archivedStream = (JsonPlatformStream) archivedPlatform.getStream(stream.getId()); + if (archivedStream == null) { + archivedStream = new JsonPlatformStream(); + archivedStream.setId(stream.getId()); + archivedPlatform.addStream(archivedStream); + } + + archivedStream.addRelease(release); + return new TestPlatformCatalogReleaseBuilder(this, release); + } + public TestPlatformCatalogPlatformBuilder platform() { return platform; } diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MultiplePlatformBomsTestBase.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MultiplePlatformBomsTestBase.java index d38ae9eb041363..59c58b2007a9dd 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MultiplePlatformBomsTestBase.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MultiplePlatformBomsTestBase.java @@ -13,6 +13,8 @@ import io.quarkus.devtools.project.QuarkusProjectHelper; import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; import io.quarkus.maven.ArtifactCoords; +import io.quarkus.registry.RegistryResolutionException; +import io.quarkus.registry.catalog.PlatformStreamCoords; import io.quarkus.registry.config.RegistriesConfigLocator; import java.io.IOException; import java.nio.file.Files; @@ -89,7 +91,7 @@ protected QuarkusCommandOutcome addExtensions(Path projectDir, List exte protected QuarkusCommandOutcome createProject(Path projectDir, List extensions) throws Exception { - return createProject(projectDir, null, extensions); + return createProject(projectDir, (String) null, extensions); } protected QuarkusCommandOutcome createProject(Path projectDir, String quarkusVersion, List extensions) @@ -103,6 +105,17 @@ protected QuarkusCommandOutcome createProject(Path projectDir, String quarkusVer .execute(); } + protected QuarkusCommandOutcome createProject(Path projectDir, PlatformStreamCoords stream, List extensions) + throws Exception { + return new CreateProject( + getQuarkusProject(projectDir, stream)) + .groupId("org.acme") + .artifactId("acme-app") + .version("0.0.1-SNAPSHOT") + .extensions(new HashSet<>(extensions)) + .execute(); + } + protected List toPlatformExtensionCoords(String... artifactIds) { return toPlatformExtensionCoords(Arrays.asList(artifactIds)); } @@ -171,6 +184,12 @@ protected QuarkusProject getQuarkusProject(Path projectDir, String quarkusVersio return QuarkusProjectHelper.getProject(projectDir, BuildTool.MAVEN, quarkusVersion); } + protected QuarkusProject getQuarkusProject(Path projectDir, PlatformStreamCoords stream) + throws RegistryResolutionException { + return QuarkusProjectHelper.getProject(projectDir, + QuarkusProjectHelper.getCatalogResolver().resolveExtensionCatalog(stream), BuildTool.MAVEN); + } + static Path newProjectDir(String name) { Path projectDir = getProjectDir(name); if (Files.exists(projectDir)) { diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingArchivedUpstreamVersionTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingArchivedUpstreamVersionTest.java new file mode 100644 index 00000000000000..289b13db421308 --- /dev/null +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingArchivedUpstreamVersionTest.java @@ -0,0 +1,162 @@ +package io.quarkus.devtools.project.create; + +import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; +import io.quarkus.maven.ArtifactCoords; +import io.quarkus.registry.catalog.PlatformStreamCoords; +import java.nio.file.Path; +import java.util.Arrays; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +public class QuarkusPlatformReferencingArchivedUpstreamVersionTest extends MultiplePlatformBomsTestBase { + + private static final String DOWNSTREAM_PLATFORM_KEY = "io.downstream.platform"; + private static final String UPSTREAM_PLATFORM_KEY = "io.upstream.platform"; + + @BeforeAll + public static void setup() throws Exception { + TestRegistryClientBuilder.newInstance() + //.debug() + .baseDir(configDir()) + // registry + .newRegistry("downstream.registry.test") + .recognizedQuarkusVersions("*-downstream") + // platform key + .newPlatform(DOWNSTREAM_PLATFORM_KEY) + // 2.0 STREAM + .newStream("2.0") + // 2.0.4 release + .newRelease("2.0.4-downstream") + .quarkusVersion("2.2.2-downstream") + .upstreamQuarkusVersion("2.2.2") + // default bom including quarkus-core + essential metadata + .addCoreMember() + // foo platform member + .newMember("acme-foo-bom").addExtension("io.acme", "ext-a", "2.0.4-downstream").release().stream().platform() + .newStream("1.0") + // 1.0.4 release + .newRelease("1.0.4-downstream") + .quarkusVersion("1.1.1-downstream") + .upstreamQuarkusVersion("1.1.1") + // default bom including quarkus-core + essential metadata + .addCoreMember() + // foo platform member + .newMember("acme-foo-bom").addExtension("io.acme", "ext-a", "1.0.4-downstream").release() + .newMember("acme-e-bom").addExtension("io.acme", "ext-e", "1.0.4-downstream").release() + .stream().platform().registry() + .newNonPlatformCatalog("1.1.1-downstream").addExtension("io.acme", "ext-d", "4.0-downstream").registry() + .clientBuilder() + .newRegistry("upstream.registry.test") + // platform key + .newPlatform(UPSTREAM_PLATFORM_KEY) + // 2.0 STREAM + .newStream("2.0") + // 2.0.5 release + .newRelease("2.0.5") + .quarkusVersion("2.2.5") + // default bom including quarkus-core + essential metadata + .addCoreMember() + .newMember("acme-foo-bom").addExtension("io.acme", "ext-a", "2.0.5").release() + .newMember("acme-e-bom").addExtension("io.acme", "ext-e", "2.0.5").release() + .newMember("acme-bar-bom").addExtension("io.acme", "ext-b", "2.0.5").release().stream() + // 2.0.4 release + .newArchivedRelease("2.0.4") + .quarkusVersion("2.2.2") + // default bom including quarkus-core + essential metadata + .addCoreMember() + .newMember("acme-foo-bom").addExtension("io.acme", "ext-a", "2.0.4").release() + .newMember("acme-e-bom").addExtension("io.acme", "ext-e", "2.0.4").release() + .newMember("acme-bar-bom").addExtension("io.acme", "ext-b", "2.0.4").release().stream().platform() + // 1.0 STREAM + .newStream("1.0") + .newRelease("1.0.5") + .quarkusVersion("1.1.5") + // default bom including quarkus-core + essential metadata + .addCoreMember() + .newMember("acme-foo-bom").addExtension("io.acme", "ext-a", "1.0.5").addExtension("io.acme", "ext-e", "1.0.5") + .release() + .newMember("acme-bar-bom").addExtension("io.acme", "ext-b", "1.0.5").release() + .stream() + .newArchivedRelease("1.0.4") + .quarkusVersion("1.1.1") + // default bom including quarkus-core + essential metadata + .addCoreMember() + .newMember("acme-foo-bom").addExtension("io.acme", "ext-a", "1.0.4").addExtension("io.acme", "ext-e", "1.0.4") + .release() + .newMember("acme-bar-bom").addExtension("io.acme", "ext-b", "1.0.4").release() + .stream().platform().registry() + .newNonPlatformCatalog("2.2.2").addExtension("io.acme", "ext-c", "5.1").addExtension("io.acme", "ext-d", "6.0") + .registry() + .clientBuilder() + .build(); + + enableRegistryClient(); + } + + protected String getMainPlatformKey() { + return DOWNSTREAM_PLATFORM_KEY; + } + + @Test + public void addExtensionsFromAlreadyImportedPlatform() throws Exception { + final Path projectDir = newProjectDir("downstream-upstream-platform"); + createProject(projectDir, Arrays.asList("ext-a")); + + assertModel(projectDir, + toPlatformBomCoords("acme-foo-bom"), + Arrays.asList(new ArtifactCoords("io.acme", "ext-a", null)), + "2.0.4-downstream"); + + addExtensions(projectDir, Arrays.asList("ext-b", "ext-c", "ext-d", "ext-e")); + assertModel(projectDir, + Arrays.asList(mainPlatformBom(), platformMemberBomCoords("acme-foo-bom"), + new ArtifactCoords(UPSTREAM_PLATFORM_KEY, "acme-bar-bom", "pom", "2.0.4"), + new ArtifactCoords(UPSTREAM_PLATFORM_KEY, "acme-e-bom", "pom", "2.0.4")), + Arrays.asList(new ArtifactCoords("io.acme", "ext-a", null), + new ArtifactCoords("io.acme", "ext-b", null), + new ArtifactCoords("io.acme", "ext-e", null), + new ArtifactCoords("io.acme", "ext-c", "jar", "5.1"), + new ArtifactCoords("io.acme", "ext-d", "jar", "6.0")), + "2.0.4-downstream"); + } + + @Test + public void createWithExtensionsFromDifferentPlatforms() throws Exception { + final Path projectDir = newProjectDir("create-downstream-upstream-platform"); + createProject(projectDir, Arrays.asList("ext-a", "ext-b")); + + assertModel(projectDir, + Arrays.asList(mainPlatformBom(), platformMemberBomCoords("acme-foo-bom"), + new ArtifactCoords(UPSTREAM_PLATFORM_KEY, "acme-bar-bom", "pom", "2.0.4")), + Arrays.asList(new ArtifactCoords("io.acme", "ext-a", null), new ArtifactCoords("io.acme", "ext-b", null)), + "2.0.4-downstream"); + } + + @Test + public void createPreferringOlderStreamToNewerStreamCoveringLessExtensions() throws Exception { + final Path projectDir = newProjectDir("create-downstream-upstream-platform"); + createProject(projectDir, Arrays.asList("ext-a", "ext-b", "ext-e")); + + assertModel(projectDir, + Arrays.asList(mainPlatformBom(), platformMemberBomCoords("acme-foo-bom"), platformMemberBomCoords("acme-e-bom"), + new ArtifactCoords(UPSTREAM_PLATFORM_KEY, "acme-bar-bom", "pom", "1.0.4")), + Arrays.asList(new ArtifactCoords("io.acme", "ext-a", null), new ArtifactCoords("io.acme", "ext-b", null), + new ArtifactCoords("io.acme", "ext-e", null)), + "1.0.4-downstream"); + } + + @Test + public void createUsingStream2_0() throws Exception { + final Path projectDir = newProjectDir("created-using-downstream-stream"); + createProject(projectDir, new PlatformStreamCoords(DOWNSTREAM_PLATFORM_KEY, "2.0"), + Arrays.asList("ext-a", "ext-b", "ext-e")); + + assertModel(projectDir, + Arrays.asList(mainPlatformBom(), platformMemberBomCoords("acme-foo-bom"), + new ArtifactCoords(UPSTREAM_PLATFORM_KEY, "acme-e-bom", "pom", "2.0.4"), + new ArtifactCoords(UPSTREAM_PLATFORM_KEY, "acme-bar-bom", "pom", "2.0.4")), + Arrays.asList(new ArtifactCoords("io.acme", "ext-a", null), new ArtifactCoords("io.acme", "ext-b", null), + new ArtifactCoords("io.acme", "ext-e", null)), + "2.0.4-downstream"); + } +} diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java index 3d2059862f1467..ec04881f12ed5f 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java @@ -4,12 +4,12 @@ import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; import io.quarkus.devtools.messagewriter.MessageWriter; import io.quarkus.maven.ArtifactCoords; -import io.quarkus.maven.StreamCoords; import io.quarkus.registry.catalog.ExtensionCatalog; import io.quarkus.registry.catalog.Platform; import io.quarkus.registry.catalog.PlatformCatalog; import io.quarkus.registry.catalog.PlatformRelease; import io.quarkus.registry.catalog.PlatformStream; +import io.quarkus.registry.catalog.PlatformStreamCoords; import io.quarkus.registry.catalog.json.JsonCatalogMerger; import io.quarkus.registry.catalog.json.JsonExtensionCatalog; import io.quarkus.registry.catalog.json.JsonPlatform; @@ -291,6 +291,15 @@ public PlatformCatalog resolvePlatformCatalog(String quarkusVersion) throws Regi return result; } + private void collectPlatforms(PlatformCatalog catalog, List collectedPlatforms, + Set collectedPlatformKeys) { + for (Platform p : catalog.getPlatforms()) { + if (collectedPlatformKeys.add(p.getPlatformKey())) { + collectedPlatforms.add(p); + } + } + } + public PlatformCatalog resolvePlatformCatalogFromRegistry(String registryId) throws RegistryResolutionException { return registries.get(getRegistryIndex(registryId)).resolvePlatformCatalog(); } @@ -301,15 +310,6 @@ public PlatformCatalog resolvePlatformCatalogFromRegistry(String registryId, Str : registries.get(getRegistryIndex(registryId)).resolvePlatformCatalog(quarkusVersion); } - private void collectPlatforms(PlatformCatalog catalog, List collectedPlatforms, - Set collectedPlatformKeys) { - for (Platform p : catalog.getPlatforms()) { - if (collectedPlatformKeys.add(p.getPlatformKey())) { - collectedPlatforms.add(p); - } - } - } - private class ExtensionCatalogBuilder { private final List catalogs = new ArrayList<>(); final Map> registriesByQuarkusCore = new HashMap<>(); @@ -320,6 +320,12 @@ void addCatalog(ExtensionCatalog c) { catalogs.add(c); } + void addUpstreamQuarkusVersion(String quarkusVersion) { + if (!upstreamQuarkusVersions.contains(quarkusVersion)) { + upstreamQuarkusVersions.add(quarkusVersion); + } + } + List getRegistriesForQuarkusCore(String quarkusVersion) { return registriesByQuarkusCore.computeIfAbsent(quarkusVersion, v -> getRegistriesForQuarkusVersion(v)); } @@ -364,41 +370,71 @@ public ExtensionCatalog resolveExtensionCatalog() throws RegistryResolutionExcep final ExtensionCatalogBuilder catalogBuilder = new ExtensionCatalogBuilder(); for (int registryIndex = 0; registryIndex < registries.size(); ++registryIndex) { - RegistryExtensionResolver registry = registries.get(registryIndex); - final PlatformCatalog pc = registry.resolvePlatformCatalog(); + collectPlatformExtensions(catalogBuilder, registryIndex); + } + + return catalogBuilder.build(); + } + + private void collectPlatformExtensions(final ExtensionCatalogBuilder catalogBuilder, int registryIndex) + throws RegistryResolutionException { + final RegistryExtensionResolver registry = registries.get(registryIndex); + + final List downstreamPreferences = new ArrayList<>(catalogBuilder.upstreamQuarkusVersions.size()); + for (String quarkusVersion : catalogBuilder.upstreamQuarkusVersions) { + if (!registry.isAcceptsQuarkusVersionQueries(quarkusVersion)) { + continue; + } + final PlatformCatalog pc = registry.resolvePlatformCatalog(quarkusVersion); if (pc == null) { continue; } - int platformIndex = 0; - for (Platform platform : pc.getPlatforms()) { - platformIndex++; - for (PlatformStream stream : platform.getStreams()) { - int releaseIndex = 0; - for (PlatformRelease release : stream.getReleases()) { - releaseIndex++; - final int compatiblityCode = catalogBuilder - .getCompatibilityCode(release.getQuarkusCoreVersion(), - release.getUpstreamQuarkusCoreVersion()); - - int memberIndex = 0; - for (ArtifactCoords bom : release.getMemberBoms()) { - memberIndex++; - final ExtensionCatalog ec = registry.resolvePlatformExtensions(bom); - if (ec != null) { - final OriginPreference originPreference = new OriginPreference(registryIndex, platformIndex, - releaseIndex, memberIndex, compatiblityCode); - addOriginPreference(ec, originPreference); - catalogBuilder.addCatalog(ec); - } else { - log.warn("Failed to resolve extension catalog for %s from registry %s", bom, registry.getId()); - } + downstreamPreferences.add(pc); + } + + PlatformCatalog pc = registry.resolvePlatformCatalog(); + if (pc == null && downstreamPreferences.isEmpty()) { + return; + } + if (!downstreamPreferences.isEmpty()) { + downstreamPreferences.add(pc); + pc = JsonCatalogMerger.mergePlatformCatalogs(downstreamPreferences); + } + + int platformIndex = 0; + for (Platform platform : pc.getPlatforms()) { + platformIndex++; + for (PlatformStream stream : platform.getStreams()) { + int releaseIndex = 0; + for (PlatformRelease release : stream.getReleases()) { + releaseIndex++; + final String quarkusVersion = release.getQuarkusCoreVersion(); + final int compatiblityCode = catalogBuilder.getCompatibilityCode(quarkusVersion, + release.getUpstreamQuarkusCoreVersion()); + + if (!registry.isExclusiveProviderOf(quarkusVersion)) { + catalogBuilder.addUpstreamQuarkusVersion(quarkusVersion); + } + if (release.getUpstreamQuarkusCoreVersion() != null) { + catalogBuilder.addUpstreamQuarkusVersion(release.getUpstreamQuarkusCoreVersion()); + } + + int memberIndex = 0; + for (ArtifactCoords bom : release.getMemberBoms()) { + memberIndex++; + final ExtensionCatalog ec = registry.resolvePlatformExtensions(bom); + if (ec != null) { + final OriginPreference originPreference = new OriginPreference(registryIndex, platformIndex, + releaseIndex, memberIndex, compatiblityCode); + addOriginPreference(ec, originPreference); + catalogBuilder.addCatalog(ec); + } else { + log.warn("Failed to resolve extension catalog for %s from registry %s", bom, registry.getId()); } } } } } - - return catalogBuilder.build(); } private void addOriginPreference(final ExtensionCatalog ec, OriginPreference originPreference) { @@ -426,25 +462,22 @@ public ExtensionCatalog resolveExtensionCatalog(String quarkusCoreVersion) throw private ExtensionCatalog resolveExtensionCatalog(String quarkusCoreVersion, final ExtensionCatalogBuilder catalogBuilder, Set preferredPlatforms) throws RegistryResolutionException { - collectPlatforms(quarkusCoreVersion, catalogBuilder, preferredPlatforms); + collectPlatformExtensions(quarkusCoreVersion, catalogBuilder, preferredPlatforms); int i = 0; while (i < catalogBuilder.upstreamQuarkusVersions.size()) { - collectPlatforms(catalogBuilder.upstreamQuarkusVersions.get(i++), catalogBuilder, preferredPlatforms); + collectPlatformExtensions(catalogBuilder.upstreamQuarkusVersions.get(i++), catalogBuilder, preferredPlatforms); } return catalogBuilder.build(); } - public ExtensionCatalog resolveExtensionCatalog(StreamCoords streamCoords) throws RegistryResolutionException { + public ExtensionCatalog resolveExtensionCatalog(PlatformStreamCoords streamCoords) throws RegistryResolutionException { ensureRegistriesConfigured(); - final ExtensionCatalogBuilder catalogBuilder = new ExtensionCatalogBuilder(); - final String platformKey = streamCoords.getPlatformKey(); final String streamId = streamCoords.getStreamId(); PlatformStream stream = null; - RegistryExtensionResolver registry = null; int registryIndex = 0; while (registryIndex < registries.size()) { final RegistryExtensionResolver qer = registries.get(registryIndex++); @@ -456,7 +489,6 @@ public ExtensionCatalog resolveExtensionCatalog(StreamCoords streamCoords) throw for (Platform p : platforms.getPlatforms()) { stream = p.getStream(streamId); if (stream != null) { - registry = qer; break; } } @@ -466,7 +498,6 @@ public ExtensionCatalog resolveExtensionCatalog(StreamCoords streamCoords) throw continue; } stream = platform.getStream(streamId); - registry = qer; } break; } @@ -510,24 +541,12 @@ public ExtensionCatalog resolveExtensionCatalog(StreamCoords streamCoords) throw throw new RegistryResolutionException(buf.toString()); } - int releaseIndex = 0; + final List catalogs = new ArrayList<>(); for (PlatformRelease release : stream.getReleases()) { - final int compatiblityCode = catalogBuilder - .getCompatibilityCode(release.getQuarkusCoreVersion(), - release.getUpstreamQuarkusCoreVersion()); - ++releaseIndex; - int memberIndex = 0; - for (ArtifactCoords bom : release.getMemberBoms()) { - final ExtensionCatalog ec = registry.resolvePlatformExtensions(bom); - final OriginPreference originPreference = new OriginPreference(registryIndex, 1, - releaseIndex, ++memberIndex, compatiblityCode); - addOriginPreference(ec, originPreference); - - catalogBuilder.addCatalog(ec); - } + catalogs.add(resolveExtensionCatalog(release.getMemberBoms())); } - return catalogBuilder.build(); + return JsonCatalogMerger.merge(catalogs); } @SuppressWarnings("unchecked") @@ -623,7 +642,7 @@ public ExtensionCatalog resolveExtensionCatalog(Collection prefe release.setMemberBoms(coords); } - collectPlatforms(quarkusVersion, catalogBuilder, registry, platformIndex, + collectPlatformExtensions(quarkusVersion, catalogBuilder, registry, platformIndex, p); continue; } @@ -688,8 +707,8 @@ private int getRegistryIndex(String registryId) { throw new IllegalStateException(buf.toString()); } - private void collectPlatforms(String quarkusCoreVersion, ExtensionCatalogBuilder catalogBuilder, - Set preferredPlatforms) + private void collectPlatformExtensions(String quarkusCoreVersion, ExtensionCatalogBuilder catalogBuilder, + Set processedPlatforms) throws RegistryResolutionException { final List quarkusVersionRegistries = catalogBuilder .getRegistriesForQuarkusCore(quarkusCoreVersion); @@ -703,18 +722,18 @@ private void collectPlatforms(String quarkusCoreVersion, ExtensionCatalogBuilder if (platforms.isEmpty()) { continue; } - int platformIndex = preferredPlatforms.size(); + int platformIndex = processedPlatforms.size(); for (Platform p : platforms) { - if (preferredPlatforms.contains(p.getPlatformKey())) { + if (processedPlatforms.contains(p.getPlatformKey())) { continue; } ++platformIndex; - collectPlatforms(quarkusCoreVersion, catalogBuilder, registry, platformIndex, p); + collectPlatformExtensions(quarkusCoreVersion, catalogBuilder, registry, platformIndex, p); } } } - private void collectPlatforms(String quarkusCoreVersion, ExtensionCatalogBuilder catalogBuilder, + private void collectPlatformExtensions(String quarkusCoreVersion, ExtensionCatalogBuilder catalogBuilder, RegistryExtensionResolver registry, int platformIndex, Platform p) throws RegistryResolutionException { for (PlatformStream s : p.getStreams()) { @@ -738,9 +757,8 @@ private void collectPlatforms(String quarkusCoreVersion, ExtensionCatalogBuilder } final String upstreamQuarkusVersion = r.getUpstreamQuarkusCoreVersion(); - if (upstreamQuarkusVersion != null - && !catalogBuilder.upstreamQuarkusVersions.contains(upstreamQuarkusVersion)) { - catalogBuilder.upstreamQuarkusVersions.add(upstreamQuarkusVersion); + if (upstreamQuarkusVersion != null) { + catalogBuilder.addUpstreamQuarkusVersion(upstreamQuarkusVersion); } } } diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java index 72eda74c8fcd98..0f203f1a5dc78b 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java @@ -56,6 +56,14 @@ int checkQuarkusVersion(String quarkusVersion) { : VERSION_RECOGNIZED; } + boolean isExclusiveProviderOf(String quarkusVersion) { + return checkQuarkusVersion(quarkusVersion) == VERSION_EXCLUSIVE_PROVIDER; + } + + boolean isAcceptsQuarkusVersionQueries(String quarkusVersion) { + return checkQuarkusVersion(quarkusVersion) >= 0; + } + int checkPlatform(ArtifactCoords platform) { // TODO this should be allowed to check the full coordinates return checkQuarkusVersion(platform.getVersion()); diff --git a/independent-projects/tools/artifact-api/src/main/java/io/quarkus/maven/StreamCoords.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamCoords.java similarity index 71% rename from independent-projects/tools/artifact-api/src/main/java/io/quarkus/maven/StreamCoords.java rename to independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamCoords.java index 147ce225506010..8c8db274dbcca0 100644 --- a/independent-projects/tools/artifact-api/src/main/java/io/quarkus/maven/StreamCoords.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamCoords.java @@ -1,17 +1,17 @@ -package io.quarkus.maven; +package io.quarkus.registry.catalog; -public class StreamCoords { +public class PlatformStreamCoords { final String platformKey; final String streamId; - public static StreamCoords fromString(String stream) { + public static PlatformStreamCoords fromString(String stream) { final int colon = stream.indexOf(':'); String platformKey = colon <= 0 ? null : stream.substring(0, colon); String streamId = colon < 0 ? stream : stream.substring(colon + 1); - return new StreamCoords(platformKey, streamId); + return new PlatformStreamCoords(platformKey, streamId); } - public StreamCoords(String platformKey, String streamId) { + public PlatformStreamCoords(String platformKey, String streamId) { this.platformKey = platformKey; this.streamId = streamId; } diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMerger.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMerger.java index 4f7b79ed2695b3..621565acb161b2 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMerger.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMerger.java @@ -5,6 +5,10 @@ import io.quarkus.registry.catalog.Extension; import io.quarkus.registry.catalog.ExtensionCatalog; import io.quarkus.registry.catalog.ExtensionOrigin; +import io.quarkus.registry.catalog.Platform; +import io.quarkus.registry.catalog.PlatformCatalog; +import io.quarkus.registry.catalog.PlatformRelease; +import io.quarkus.registry.catalog.PlatformStream; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -72,6 +76,48 @@ public static ExtensionCatalog merge(List catalogs) { return combined; } + public static PlatformCatalog mergePlatformCatalogs(List catalogs) { + if (catalogs.isEmpty()) { + throw new IllegalArgumentException("No catalogs provided"); + } + if (catalogs.size() == 1) { + return catalogs.get(0); + } + final JsonPlatformCatalog merged = new JsonPlatformCatalog(); + final Map platformMap = new HashMap<>(); + for (PlatformCatalog c : catalogs) { + for (Platform p : c.getPlatforms()) { + final JsonPlatform mergedPlatform = platformMap.computeIfAbsent(p.getPlatformKey(), k -> { + final JsonPlatform pl = new JsonPlatform(); + pl.setPlatformKey(p.getPlatformKey()); + merged.addPlatform(pl); + return pl; + }); + for (PlatformStream s : p.getStreams()) { + JsonPlatformStream mergedStream = (JsonPlatformStream) mergedPlatform.getStream(s.getId()); + if (mergedStream == null) { + mergedStream = new JsonPlatformStream(); + mergedStream.setId(s.getId()); + mergedPlatform.addStream(mergedStream); + } + for (PlatformRelease r : s.getReleases()) { + final PlatformRelease release = mergedStream.getRelease(r.getVersion()); + if (release == null) { + mergedStream.addRelease(r); + } + } + final Map mergedStreamMetadata = mergedStream.getMetadata(); + s.getMetadata().entrySet() + .forEach(entry -> mergedStreamMetadata.putIfAbsent(entry.getKey(), entry.getValue())); + } + p.getMetadata().entrySet() + .forEach(entry -> mergedPlatform.getMetadata().putIfAbsent(entry.getKey(), entry.getValue())); + } + c.getMetadata().entrySet().forEach(entry -> merged.getMetadata().putIfAbsent(entry.getKey(), entry.getValue())); + } + return merged; + } + private static List detectRoots(List catalogs) { final Set allDerivedFrom = new HashSet<>(catalogs.size()); for (ExtensionCatalog catalog : catalogs) { diff --git a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/json/JsonCatalogMergerTest.java b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/json/JsonCatalogMergerTest.java new file mode 100644 index 00000000000000..0026ad35ba9365 --- /dev/null +++ b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/json/JsonCatalogMergerTest.java @@ -0,0 +1,99 @@ +package io.quarkus.registry.catalog.json; + +import static org.assertj.core.api.Assertions.assertThat; + +import io.quarkus.maven.ArtifactCoords; +import io.quarkus.registry.catalog.Platform; +import io.quarkus.registry.catalog.PlatformCatalog; +import io.quarkus.registry.catalog.PlatformRelease; +import io.quarkus.registry.catalog.PlatformStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import org.junit.jupiter.api.Test; + +public class JsonCatalogMergerTest { + + @Test + void testMergePlatformCatalogs() throws Exception { + + final List catalogs = new ArrayList<>(); + + JsonPlatformCatalog c = new JsonPlatformCatalog(); + catalogs.add(c); + JsonPlatform p = new JsonPlatform(); + c.addPlatform(p); + p.setPlatformKey("platform"); + JsonPlatformStream s = new JsonPlatformStream(); + s.setId("2.0"); + p.addStream(s); + JsonPlatformRelease r = new JsonPlatformRelease(); + r.setQuarkusCoreVersion("2.0.0"); + r.setVersion(JsonPlatformReleaseVersion.fromString("2.2.2")); + r.setMemberBoms(Collections.singletonList(ArtifactCoords.fromString("org.acme:acme-quarkus-bom::pom:2.2.2"))); + s.addRelease(r); + + s = new JsonPlatformStream(); + s.setId("1.0"); + p.addStream(s); + r = new JsonPlatformRelease(); + r.setQuarkusCoreVersion("1.0.1"); + r.setVersion(JsonPlatformReleaseVersion.fromString("1.1.2")); + r.setMemberBoms(Collections.singletonList(ArtifactCoords.fromString("org.acme:acme-quarkus-bom::pom:1.1.2"))); + s.addRelease(r); + + c = new JsonPlatformCatalog(); + catalogs.add(c); + p = new JsonPlatform(); + c.addPlatform(p); + p.setPlatformKey("platform"); + s = new JsonPlatformStream(); + s.setId("2.0"); + p.addStream(s); + r = new JsonPlatformRelease(); + r.setQuarkusCoreVersion("2.0.1"); + r.setVersion(JsonPlatformReleaseVersion.fromString("2.2.3")); + r.setMemberBoms(Collections.singletonList(ArtifactCoords.fromString("org.acme:acme-quarkus-bom::pom:2.2.3"))); + s.addRelease(r); + + s = new JsonPlatformStream(); + s.setId("1.0"); + p.addStream(s); + r = new JsonPlatformRelease(); + r.setQuarkusCoreVersion("1.0.0"); + r.setVersion(JsonPlatformReleaseVersion.fromString("1.1.1")); + r.setMemberBoms(Collections.singletonList(ArtifactCoords.fromString("org.acme:acme-quarkus-bom::pom:1.1.1"))); + s.addRelease(r); + + final PlatformCatalog merged = JsonCatalogMerger.mergePlatformCatalogs(catalogs); + Collection platforms = merged.getPlatforms(); + assertThat(platforms.size()).isEqualTo(1); + Platform platform = platforms.iterator().next(); + assertThat(platform.getPlatformKey()).isEqualTo("platform"); + assertThat(platform.getStreams().size()).isEqualTo(2); + Iterator streams = platform.getStreams().iterator(); + PlatformStream stream = streams.next(); + assertThat(stream.getId()).isEqualTo("2.0"); + assertThat(stream.getReleases().size()).isEqualTo(2); + Iterator releases = stream.getReleases().iterator(); + PlatformRelease release = releases.next(); + assertThat(release.getVersion()).isEqualTo(JsonPlatformReleaseVersion.fromString("2.2.2")); + assertThat(release.getQuarkusCoreVersion()).isEqualTo("2.0.0"); + release = releases.next(); + assertThat(release.getVersion()).isEqualTo(JsonPlatformReleaseVersion.fromString("2.2.3")); + assertThat(release.getQuarkusCoreVersion()).isEqualTo("2.0.1"); + + stream = streams.next(); + assertThat(stream.getId()).isEqualTo("1.0"); + assertThat(stream.getReleases().size()).isEqualTo(2); + releases = stream.getReleases().iterator(); + release = releases.next(); + assertThat(release.getVersion()).isEqualTo(JsonPlatformReleaseVersion.fromString("1.1.2")); + assertThat(release.getQuarkusCoreVersion()).isEqualTo("1.0.1"); + release = releases.next(); + assertThat(release.getVersion()).isEqualTo(JsonPlatformReleaseVersion.fromString("1.1.1")); + assertThat(release.getQuarkusCoreVersion()).isEqualTo("1.0.0"); + } +} From cb6cf2d2af1d4feb00021a04d687e22d42a514db Mon Sep 17 00:00:00 2001 From: Sergey Beryozkin Date: Thu, 2 Sep 2021 19:32:54 +0100 Subject: [PATCH 094/138] Dev Services for Keycloak: read the realm name from file, fix the container lookup, create default realm optionally and follow up KeycloakTestClient updates --- .../images/dev-ui-keycloak-decoded-tokens.png | Bin 0 -> 243797 bytes .../images/dev-ui-keycloak-logout.png | Bin 0 -> 403 bytes .../dev-ui-keycloak-test-service-from-spa.png | Bin 19515 -> 21140 bytes .../security-openid-connect-dev-services.adoc | 12 ++- .../keycloak/DevServicesConfig.java | 23 ++++- .../keycloak/KeycloakDevConsoleProcessor.java | 3 +- .../KeycloakDevServicesProcessor.java | 67 +++++++++++-- .../src/main/resources/application.properties | 1 + .../KeycloakRealmResourceManager.java | 57 +---------- .../keycloak/client/KeycloakTestClient.java | 94 +++++++++++++++++- 10 files changed, 183 insertions(+), 74 deletions(-) create mode 100644 docs/src/main/asciidoc/images/dev-ui-keycloak-decoded-tokens.png create mode 100644 docs/src/main/asciidoc/images/dev-ui-keycloak-logout.png diff --git a/docs/src/main/asciidoc/images/dev-ui-keycloak-decoded-tokens.png b/docs/src/main/asciidoc/images/dev-ui-keycloak-decoded-tokens.png new file mode 100644 index 0000000000000000000000000000000000000000..0e6f8301cd6497226f2543aa3c2e2cf087750249 GIT binary patch literal 243797 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

    #W0~>b}13ElM|%Lnr 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 z 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 literal 19515 zcmd_ScUV(fyD!SJu`Ix60i~-n=}Hx(DN;fx(mPS?%SsOrq)Q2qP(p7Z!3u;b zT{=pWKtLcN5=e3GTq~<_y%b3N-a~2@HAQ z@66=t5ii(Z590Y$iK@(I~wy{JznCIVlHpt@a!`Ydw4s|dzH2mwv z;SZQHF7WbJ{Q4EDO8TPdzB9XZCZn|U+J{SrHy=wp3JB=_`Qsuh`S%E}bH<$ceFy)a z9LX`6->(xENc!XO>_6L-gzb?GdCxKNw`5Eqf zHQEWMkl*6G%#4R?6bF@YpzOcfpIAeK>@< z_bJ{naS#xMOc*fW@5?EPy(kTW;UHM;JvN?UPe*OMhrHgN%Wk8`7_wH(5{*!1$#h#N za|~P=L@ex?q0Nm>b4WE{D4z4PX6YgrA%+9`n}AJgU`B4lgCx|kQH#*KcTwR-#LS2A zrX_Mq^_wX3#s~g;6-$gp;7v&PZUwGg!liL91<)Xy=h(`tl9saYig1rFMa{r~i{E_x zy5LDr^eIN7%8H+KV)i&P^hNSzHF&}RM-&oN7iLsVTv|4dKh z@b9tlrBuA2;;z4KYgJK|k80P~($aFL#$^!p-9*eQ&5U7n{v#e(di${;w=s)ZNrnj{ z>xRMY_wTu`|3oZQ3CLz=XOkAkW=r)~Ol)pKE2pNXOyb9D{3-<9drB?qqI*%3nd-s{ z7DpjmsPCU&uMkhpJ6BuPg>_qCRs2&4!<7hjNK|EraNHP`B};BS{-h{bN!f$`L`!UO z10BC=;W_de9VB?oDnKn;9P~ONVRTy>CkTbAM>PZ{<9-EJccn^I(EHm;J;y4Y=|`Cl zheY|yi^XYbYKlbY{AROD^I+ju(yR9K<5E~aEYP2U;V96&Hi6;AzYD*X&lNKw?=mb7 zOm=zH9-C7*U+m|rik6lv{K{75VwSL{Pc>0Dny~?3*wpkiU~)N&yWR>}4!rUfH*VaZ z&PEI^E-VOwsG;;DBY&1x=09adhHgIexYw5ZoQ1P!!xBBv9Iy;SQ?|vCI=6z7o<4ng z>cX|RC&;TSkM1Q2uJmNozJB@A>_xEm;rteZDGToF>&u|?91i9k_R1tA zV!9wqcBI18R-I0&J!pEWIsUrfl`FS95_pXqBm*>`ZT$f&N-FHAkuyr`N~@7mE8A|{ zn_<+2Frs^D_u;_Q3W0z_IZ{xUOc-t8wk_0t>!px2t=a__^;T@ZWm&l}A}tgNE-gZ% zwOf^K`1>Jm0UNTeumHv-WobDkp?dMKJDt(ve4V-`wK|!XX0y~_QyhR(DJl{S3lIMq zA4ItxofsF_Gsu%WrU~om>e_$7%0KWy3w+`1S>%s5Zx(jmytyPKEbKA5$B)vxPh3F5 zy_I!gQg*FxR7O947BXj1Y|v7&s<5eX!`ak(<)hoID?2c16)qJM9*d|E>+nNI`;La3 zGqa4h+DM&t-WL&n!n?2oFO$-;9$aJ0DKdxQq8Ji-k9yXR49+ht2{V_OpFO+t9=t$4 z8is9+d;Iw!h{ndweLf3C^y!rbN%i#|DDBLfpAFhLW$kXbL~3DSp`E?`;*TGteA9Ur z%R09ZnF5fRp0?3R5hK3%OA2=dp0f<_L-&!#W7B_(+(6@JXN?w*c1w^29x7M{`noM-6=hV+*J9#sE#+EWN#W4Z(MglE)!y6LX!M+g&b<{x z-r3!P2^z7n*`H=>it*nwOcB8$W}ytt+T}<=P>oH+!FMG_ zIdBMQb^-lRE4CAl2Q~XIcA0@hjB*B-ByCfm6bfbN*I0Y!dykRLS!mm|$f0kaa?~yl zF-u%Dq$+pb20B~X;V%+z1?{gyTsPN<&Z1gipdXMC3Q5UDuHls7M0M|>51+w7R1znV zN>;?mhM_!;Ss1BxBO*1FyeC@CEi3KJBO_av`u6TxRyyFf?4+dn{Db@kd@+=3f(xbR z&YhEyXY}e(sUE+ou4FRsM~Ks|$CRSNDTB`qvdEkJ$4{}GHr4Gk#>#}3w~*IzR=h1; z`?5#o@})iB7YI?s<;?OQJfJ>WSFtW1mB@=f42(^RL^bb`H3+ZyyP;y=miCpbO26>V zkHzC{${v&z27P(2udTwP;j6V;id~v-O__~k&}c4nI)v`PoR+azpps%Y;{U2P!J(#; zC}|mWejy2Q1H$Wf54+pfr8sUb52|E#u8s|dTe;t*iOEaPq4IG8o>Ff=wRVObW; zD-n z>*r5hikf2CSu1;AqfkxpHb_OEkxGR~E}@e57IdJTQrz8m_mzaY$bm7>&D5@k%o~xC z$>)ZP17Q=XhJ&3{?bp@xM8?kY-exyP{qC^!GprZ2+Niui<-EAGE0S#Dn$zNP>{5iG zE%`f}p$9}5)JBRmM~l58)KA?^Zx2_U@9cSF-ce3y{s2l$)gP>kuFjlPa}dA7Bljq% zi&JqZ_$DDGiZyde<@T+-cysJ`Q26q4dBrjR8oiD6M`nNmCa}I9nOS~VPl*%irr@PG zCgW2aht6_wp`IK+ooUW?=!Mvd&aU#x?^)_ZjSD#tySZ!wEO>*yoQEi_e9kSDq_HF`CHwy1tKW+rZnO|as3*e_(NCUN1`TfAFQfCE z6MwP#t*gj8A>6U75FV5;R=9XhR=#-Ph->prz14_MLj8>02h8N%QBViuwRy6gf_e6Q zf!=W#$$dFBoVhZ1P-KrM(BGE~fNB|KgaoHFOssGVik#Gw8a3EcWheW%v_w}-@FaL5(b%!ZG~9n!Xe zKeNrFZ~-PMT79S5qDR-yFPtXr+)+Jv7uG(>9`Q?_*0kIKDcoA9kd+G+2JAMLgIQXmmWH>{SxtBg-%mNl% zp*5UDk*jO%cx2U!=Rdx(`2xypm^MBi9cU(XF^h1a-rYX&W|+OYh>QNmWA<@1Zo}Fl zLgPgih;wAap<}A#`XQ)t>rIhw^<#&Ub}Gz)+LAj9dUD(_&6e4O3*FSomoguPS0ew? zI<8{+@Ci|*{J+R=iSPs zT-)%>dgS4&S_j|Mw^EDegKl&cBy;nyTipaLRx(Rwa6avM@OJ}Af|9ou-g4gJC3iT- z`eVk2--g136~Ol%NZZ2O-z5#4;`|$UJ;q!v)L442{5R&A0I8!)*^0>E=W8qPV%;hHm}_ZKMw!zNHRDBB)OAn#X4)1C3JHTgm*|yz zL?m4?8IN2VdsM=nb2X<0zWHYE{ou#lp$+v&L)1+$wK>nM?Nd(0VbFSdtE_>z=WBzBuPA&dMn zZQ3B4rv5+0j>PJ2Q*?dhQzYPP$VJ2EFs*L-xRQSZ(7KL4)kuk|Jl| zcI}*#De(3FUzs7%sjV}qfOC&-`-gk^6EU@s(47hX325~DF$PP+zGx727yxGH5w~Z# zZGYQAr>MXFWdY8ZZlq^B|AL}z3qPYL(2B)yLIhDH+HtXwT1c{zFwTC^F#gul}Os5nZX;?5_QgTg#7_&4BFJczIy6GHq;+4Z~(x)LT% z@?Ljtl0Sya8;sG#4aFrD+B&a%Q9?d^pDOFHA6aA&W#Z9h4z;LIaw)$&p?D8v(&@&{ zcv-i}=00lZC_dgBoFixPA@b{O5Bqkv$)A`_-x>sZxT$DBp|)Z`Eue(tSCYDlF-sy` zP>l8=_zt)2)sgOgo-E@(ROi~oQg#`R*x}mObt<~A6BH*#c@!;PPJOK;`R?^!62IxA z_Siy({)0h-oeh>F%QmQvdkyaD7Dj0p%vTuZGcL_TSyM98^`aQuccgUNa^;RB|0OuT zTFvCR*s+ym;k%|LWG?Q-&qpqWox3@Of{uZZE(598wPh@}f9+oC7XuNy^|I(mx%(gf zbf>>kn0ag_3|XSqdi1;FdqJpubZyj;(W;mL&_x|&vaep& z$W{5D22qJnenNJ~Na*h>q5o^1`a9aNaPzd8uUDhEy;_akSEA>crb(=uSPsufUzu6@ zqiOEtFWD^VnQ1cgw`?t!kLM^pc^0|e4$sI#qqCL#gyuC|-aE`kd<;YGaS&5lEN?{9 zMU>|i&rPEkHgR*xLPlDQm>#~}a5S8y;z|)6ae}@(8I4*+= zi!;B_&8kc6(kr`DHXS|PRJbiU0>c#)HGCr|FCE;~ z&&#KPyEjg(b&*%gaGE(=BZ-#w)*s1TMGihLv+5lhSX{F>|RE7JPl}<6^WU@wJWzz9B{{ zE}TO5^c?6r-!4{|rD{L^wTrATkDPs-nkFM3%SF+x8&^-yN->igBaR&6d_d?rCuHo! zbQ3Jxdrml}y-2jBItDcB(vBkhvf>m^(#VN^Zob>cP0+q3?egSw1;&F`o95_~g%v)2 z0{d2si1wJC4^bx1j+iv>Blog-gPEZX$=(V?DF*{*vW8%MO?kUP*VB^yK#7Li{T|5jXi zrquoO(4auHJ7j+Gs${gChn!I+7R+U4YcpvZ9u_~mE9)q3j#nAx~p|_ zjx5Rf`Fon0nv1Keo+e6%-!f5N#L1-bG&`R>yu2*(|6!u@zh+ba@9CE%gqA2|uN%ES3-i5PKATWU|s2vWDj-&hQoF+n1<^O#Z|H+`Y|plOPl>g;x`7{U1cc0 zLB~5DCE=tMdjrC5ec;b>Gvs{&9l;#;Wge+FnDNNnFk;(NzZ=D;eeZnwHJYEbO$!9I zmn?^^mn-s_7^@Q%_ihrs8y148qtw;af%R-}_hW1o4=1Q80?03hnp@=_rJZfn2MHwY zk{%C#dw}og{Uydo+LbRxM4uFG^z7O=>Y@8_O!wpHr7|bN1*0f~2h#Ja&->Z*ZYP+? zGB6P7->vQW_i)Or8xGDdBAl6v1hb-M6V4CjrN^7g!Q}QX;y1~u^uGk%_gz-LQ3M+| zO)@wKncKLcbfop*)r0-{qVwwNZgta_1VC3V#x=|u(i)emtcviGh^r2RBqD?80HlO} z$O@(VnangId?29ZtAqSdg*#$5dM~+R=$z5f_fVTL3%kW;k6_ikV#;cZnLsYZAf`Gv zhy&Sfm{HP%^o{jHSHt9E1Z1It0*{n}3?{ZpqV@)9?Hsulh#{QMCmVM{|KJbp!Tj5U zRpEn4Bie6`74pn_Y$u|xI`1duYftuG={3qX;ZsD0e`C;j3|ZS7iuf5Vvfxn+!)lVVaBaJo05I6 z@|&lktd(V~CIW221Gb4{tOwG3_f$&fxD1P)ZnT>AB|pu`0@C6GWCT0@N_tz*K=BoU1$4F%jlyY(&D=6<}M-g(YE-nki@BASj|4xv^@3`Opz+~G5xdFwTgT*~s z4nC6m>+bxc`H9bKlSgAO%~JB}eW5|vI#qp}A@CM1I@bW!`=|LJ)y_*{bQEbXLvG_=VFU{ZDmE>GM zB3uwf&;rEU(28j`(B4YHNT8*Jn7x#jtUFRc0 zz4Rv0BJu3%QmiIsc6t$Jt!GcgPYPn2g~&XvA55cz1N5fzMjNgj$|XrjNh)cxS3rJC zo|WQlX<@^D)xa}{9=frb|9Mc#a}=Bd(L0YB>X0{%hDl4 zwC%-!2q*KTkNN|iy2&qNZe@@UH*YN&`dI4KfTYXiESk?CBO)k|{I6SVda>2|&h9pD zVzrY~8}yFHKYf`VoScxYIHMrMDIS2jsL2jI_tZN|=1(^NgRmZ7p#w71T;Jr%X1%dvs23sPuwRdF33PZ{!vxt}kpW@u12_`f zzmLr0*N&^kUtZ4P5Ow5APwmsb^j<5Ptx&SD>_XD4mGxlJ0&!#_`qk$2!y8WusX|5G zv?Artz8lesD(3i`%q|lO^IvABDor~42Zt?IAhK0(63tj3Q0Zp@$?9>nzssPJ_Webo z$6xnssd^4lE3?0AA^VDlG1VG~sf_3gXa9{0@V|9@{jWy-HF!)M27~$V@ndi4Z=XMh z`v)JNR7eOVaL<>sGc+P%br1pm>+jY74B%cRI9&=qIeBaP21iz}3uYw#p`&9EnP3hq zFi#I0`ArU3S6p9T-`d%M$HszN9A()5W=72QeY*!a)T)2VmiX_eqy1L}^G`}h|4~y* zZ!&IIS68=$lTif)1?$18zelN*2?)0pi(UNw9kzZcw%4WBIWXnxSF0SQ0PUHX8UKI) z%)HiN;g@O32v`+5kR!X8*|q6=OYoSU-R)&y9s2I2zgZ)ofq{Y7iHT#HY^td)49Wha zSFc}Rjr%R|&LaS6ofKiHdGxG`*|(%pN$VL?OUss9>ixBA+tNY5exAi{ zk8(419VoRn@<+)NUkAqRf5T_CIIojVdb@jNscq1$4XH}0t~}{HfPfIBv#fOPLZHq@ zNE?;X_Sxu|eV00#8Bo(Gw`2kHRS9k{AarWxEoiJkUD7a%9oL zOKWEs8Y7+~L(KfWrWyzj%;aGDu+T$F>9$GhGuDvuV)n&#(==5Tm0^@tK!siXL?x|pHh6VQol$Dqu>*|Oa+cn|ivDuFH+Q$v zqVkuXWTxVXcwvV}_b9(CO~TMH;q~j+gD@lYp-+u7Urg;WMM^$1BB#mIsFBR;^q>mr z4tG2>DsHsg9!*jIr3(w(SyLjfPa0X2nV(*UmLK0%8%z_o94TQi0flw@ylxOcxv+es z`|^OMVUG!fCnhE;_)K^yj0417m;P<79fSEj)*GqtzbQVy-90n7bhm|AX| zhWwE-&mVKQVR6u`2bw2V(gx7(U*~R%-FvH1toECs!e>TVIF*r9sKX8{tG5JsOxBN; z8{3N*?pFYOx3r&<`7j)gYm?v>r2>t4@yIiii}EC3#n$BgljCM}ZfB44tHP%&2FDbY;*yI-D{QW`M$D+&AJNq@}-b-@wsc$GyC_Y9R?*eH0SXSautxqB6zK$)2{jytTE} zQ`HuQQP?7pzSQ)$4FlFCcIAq(L6+R;s-q6RqeJKH*|Voul~7_aI}daLGKiF2)0=gb zkur00`u=X+gL#**|U;zQPgzxQ@?B#NN_%QX&n^NlyXsHr^bT*3d z;d89J-QTD(*yx0e;*n>f=Vwg-CY>qyqJ*2*t4(~0&H)GKnLvN`}k3HI>M&H zqTXx3?m&09`^iJkT3TAVMn=q&lh3Z~+)`FX=}<~Wb_WcR)a^wwej(-1 zvVYFCh%`#1Nt$W{46l~JUH;uPk^#LdXVO+JY^!s8-1^_RJLt{-fxBbm(>U(M*_S2~ z;-fm)lx%^vE(_vTAPgAt!uGn-+3tCHWdo|bRyht(iNqXc2j^E-u7FOlu^FwmMec5S zS6moxbuKf^QIiA#nS^N>ymth#?Wi0)6`HHZE`Fec?9vv)>jBj^l0Z;|Jg4|f*F1Zo zd56?p2_aj$xwXW^2_8?4uxcaDc#bLfZOI+bfXXe(05?6fVp>AZdoaz z{<{>ymKhzyDghY?bvY2J<09jHTLJ5CCu9I#Y=f-TDWG>7B> zBtIXZ0u8+gSjIoB7xw*(PZLiE`f%Z#zZt+WG6=!-kXv1Nm z%Dwi$aRDr*Qzw;BmfDHtjk#EMPR@+Q<-^2e?skBYk2S2wQs<1Nl(e)#)@CkXKc&FD z5t7^Ejvn0CXkZ&2L|2~g+hD7eZ#k|G^w_zIv+cZrMfM}xuc*o zq87uVF<7#>rG+q%!0UuvsnBF)WzD2~+sl-5ZaEPBjp}MK`>r?h+K=Yf*2+N}`d>cb zhsmwX?mc^!nqF&?a{Y8 z2h_RZ{x`^y2sHs69p*GCbG-l;Y&s9TsN-REsd?;@O_dvHYchFosKDAZp8J-~X%6Xu zRwEA7qx?HuvQ+kZZ|`!H``=`yrC!KeK!&O5B_${`Wcjmgb@+=HI`G^>Qp{uK`Brv3ZT&WADPtQS|S%|NF0*m6O68KTJ;4y5`w5dgQ-X=i6QNbEMdY}(*8e#_$T z8t2o?a&mIhY7G*<)3SfZHvdn)?mr@~|93QXPy>FvXJ8gs-sjL%RQ4@--2Px&0Mi^t zD^|tqI@F;V)BHwRI_AtHW-YA_!jC)=v$}iHyX?~0(~E}^@%i>)QCyk2d@_wJ?&ERo zBV1^XRXO4t>@`OhdS9)%7IWd?XBxr_6nsU&v#r&&XW-&K@a3aZw=F*koOC?6dHDr? zBW050DDr>O-{BQ8J(UosDUfcKSzw=w*;f{zMoJ5p9YT!(7Py=s+o6H|Tj=ju_I%E#c}jIDZ)6!0sGswe?~capMr7t_`_IWq{;XrM$M=UE?MV=zawc|b1(K{ z&kzuY#^^L=(x;SZc7Pwavd5!N$8gEH2VWHb9Z6j}8yY1fcS*8oQj6#nQ(>V-^K1NX z!-G6lt3`4L(HKf;;EG8|{c|8CXepz#<==aM1fbKqY;6E!VdHqh$S}%Yr^2Du!XBfN zi`?T;_FwQx`}06dO!}$b;!fY^=K&659%}mIN6l3Wv{_?Gi*TboF4Fp=4h|I_&u0w4 zitzI8l!HVGPXnvj7jp#>Jb~m204F$M!(5b(bkr<6K95Bori*9E`8w;=|mocX^CMsTK}<{b<@q=meNu;7EU!2 zcGNMHNquJcY7Pj97_Aj8heLcfo$ejeBVfR_N>Qf|pMLuM$Gi8MdcYB2XJP^iSKrIt zS)W9^r-*ngzDAoPA8M&?uLURvuQdtc0Zy*5v9V24=&NGG+|u>wToX)#cb((1^g(RK zSpp%cVPjv5I9YEX-w#m#hYLd>Y1bU=@}wNz`k~`TEoaNWOr9^%h4p1Cm6b%0;7>b-!meC?b=0+4_;A?w6TBvC zNDJrf0~fo@v5faRHW(kQimEER6*esk7?91;Z{{++XnhU77BtXcukZ8{PBA4 zX)$xvJm_W`kci7|5)}^s4CwXixIuIq5iTfcy^|rq5jztRlIgz)@T7a+C};u5b11WZ zb);Go6PP#RQY(bE0_o|Qe0|kM-uVRD+UY|yRM>)H`+8IY#usPS?9V3BKU)%FMCQJJ zFI~#sVy0EiKPV_|#KSySC2Vbd_HDE(d2Pl3X14yV2ADDA4*$*4U~e1OO~`K>I;{gcdMn(rHqF6sK zAFzVg39k%i27?v}X$yYtNQ-*Z^v3QM^_t9wDN4y|%2_o#+8Y--AGq}=_yyywJS zSlxEIefWbf_YJb;wDNlPbOC?zIyTm{`Snh|=EH{tTg%<9WAN_o?sZCow~gobBGK3J z@#c5#Jc*uZ(DcPBN%bmMI$%*Bo}DhSbq&4y*OMnt$d8_h1rs+nH zoh(Tg#9xgC`09x7pJT`4cj+(W!`(X{VSjyKI)LM?Dp=Cwx@x%J&o5^-Bth%zK07QN zv0gRPTgp?mz{Z6ZRap&b)=-Ne&#|W8Tb3U4hy#A~^hK$zk00%UqGB*H$Yac;o1?cr zXw?WNC@pQ&+|=}AZvzJkVq-4TL^Wj9`;6Po&qjjPeJAsOym14WbT7HLDNJ;9hH3QIRPZfH?4*m*2bc@y3CU9&B5Apy{CJ6Z9W-A4S^SH;YopGJw)|)3=rtE!xb0oi#uiP)|=E)|Lm^ zN-vA`+=^*h0fc0nGf{s4TPCU=q-4tZ05jSz*8yj{RzhQD6;n`9X!icxC_X}7;R76y z$zoU91um}QbDv`;M;_GMknhp=8Q+Gke`;?RHOid|_MWZScYrxz+^b`I+q=^DMsTzj zW)rg;@IMYYGMAUT;TpmaTx)oPk#BGAcD{BZZwXMI@YtA%Ixu!B%cWAF)a9}p{FX-mA29jI1)IVj+4=iAizppP=M z(U$v*^cM9d8lqktm?7Y+R{=m)`c9J#1Y_k@E(Z`KFm&)mDZ61{pTX45YJ=a#M9AD* zlv!V>5c`4qnxiLq+X9678+HhA`d~UFs?bu~_n?xK*4+(e7q|HGVK-m|FnJKL#pfwU zAH!-xKeynb15bJB4>xvko4ZdPLLH)VSAx33Y#Q7utLJ9`UzY{UN9uYLV1^#w_M0ghG|(fHM26(eSW0e$Th51BSRx%<`*Vg$tI^#91Gjl6>PHm2+suJ|TBQ8|8p*AL zl@aDJ#SH}6Ai-ayxuNBb!Rd!+@_NicQhXgqinqvQc_hze*U6BDCKOycXK|I4N4dby z*I?8Vyxfh)uSl64VvWvDB3(5-8Q>Injn^D|H-n=wn_roG@H;CG)%Zsz6XkIfGaFKG z@%7(j(|3Z$WHb~`C%*i$0o_NS(tf8ybGL6_KI&9UV`c+9foZf5*eOKxFleLzO^kan zVl+{9)lVci!2j0MlQCzKdUtql7NOF_|83{qc_o*SKi)lEPhn%EPYWG9{*EyT>>5FL zE3?gQe7k!6<=nG7cRu@V!@2G(sUDXY182G*5yGo3))~_Zo?uJLS7&)JrX^frY&Cp( zxLjUB)OgG`^SN`3Mgi>4*M)!jXVB&|Run&;>A9XTo3Tb#e(|w~vP;LcEh}cr=Dna$ z!g8hAWi<~3^Y-Ckj{Era$-`}%V#0^i^wKwn`!oO5n{Sy}_!Z<%bEwWvP6KV;=asM` zMLuWawpocd<@A<0o~zk!NfoPc4e-1_6(7DYSeD&bInF8XKd(0%qJh{rfes*Ro^Z~3 z-YW}z|Dh)${I+ihfN35Zo&j2&l=I4^UU@1O1&KLBsshdit9F0PtRM6}>WvT>_+Vl` zf4F#Jrhmw4zIWqr1E+uLqFy#!2UW5gd!#9rU>kbnc;_?NXXgt$k? zDzk7uRH^yfz(Q%+B+jMl*TRbzB9l3J+4T^ahmUGz6P0oF#SL(Kg6>XBX#{OD*lBCe z6ea@ERZthP9vQ~2l7zO^@><=W*5}nu@8bD6%A0BDF+$6{Z_eDry6&CO=)d)7bpbvP zdv#G{$feO6v;C>)L7~$Sx=~dv_@mQ~Yf6fb-U*WJ-o`#O+SY#{0v1yuB5o0cg}4&a zBYn_LKRFlojEKpRtM6>~#Klu~rp=xe&@1AUlRTQ&)FCmrrbBJK%rJeR{rw&KOSWiO4^8f)NIhDTP)LCkj(+`M^@U z2K^-8u3t{=viOE9!IVb5;=Z+v)t%zPO2ZS1mY)os3tM82rJR4W5sP7 zIEk>$G$$+_Z^13p5eHtU>TZqa2`x{LY+;X3 z75w{2!H)QdsADoi%cD5HAr;f5f#ZwIEbmtP!Dzt{M)UB*kPYu_gx5(m7b&rz#-Pix z$SWD!b~2vEyV2TZ4JUoWz4vZK`E2bEPEamRrDsQIZ1o<6Mda$PM;FjMb3G)WHazvF zHMCRpEYx!m2R#H^rpAmdR7~*Y4JS>hVS1iq412(PMzc~E6(rwx2I+`28i+y^bJDz; zA8ZwV?Dj9=5VsI|;hm?lgLE3tzzc|o_^y7qzh%!zinCGQ-FT7G4YjSTriT;z_rCPu zC&T>e&40+eK!(r za0^=UXGl;@h_1msP4aoOZIBFB_4yQMREWvC{!Dn})>@mebT)kIXN*(q+4`|;(#}GL zv@j+Cw7%5$$z%BpohwDS3L52P^0e7tS1XH)7lv(9M7UG>*U5y+pbvkU zh@|IaNbH;Vf8K*BR<r~|R(Cn1Zm6bfJNTTJElI@ z<`XN2iHl`0Y=ds_v;-%Ew!i`b=h~a>v^{NeJ@7PcgdUlX1H!ncwU0o%d!H>~TGC?)iGXImlXn(2>~4QN8LzK!X_(F>seQ(fb-ePJ zC}^-rqWOWgb;Ixk-~^)g_iC8Cj~WThwumdahI=zjSnpk&F;<(u2+i%Wd$Yfmh`;D# zp!REY!oPr5M~Jak;(sw-e@DmL z>I9)Tm;%@6A}PxbhQjjwy3>zzGp1#{gOQrtEXdyAjNyAe4*Of1J7d~BTfmbZ zIByH%j#7bD-1&`^S(UVGdaS?Khab6nXP^$*UM7&rN#4A1+2$2C{8)6_{^s~rvk@J% zGS8RQsM=UrIrXxX{|!&D^Y~Md6`N^8SpKR|9^KtqYG-R}Ve3WL*TU%ga~p7t6K~nV z-J)ye5EC^B5X+)EquUZ5^Zn)fMOF)Y`;(rdLHy|*xfRdkL6SY34RDR6A30rftMHDl zcfJ~J{yN^XlHGAx9Ot#uFBjFD`Wp1LVYYXogPd1}`z`lWhFsG7siR9Vn*j9(*JNa^ zt{zr)?%|ZI^lo>oy(h#HcAvD2qPGA!aG#N?jmxy){;41ZeqKMJSpu>5U)<|PL6x zHnuAi4VNU>9WKiT-bdO>OL#`KRyX%oJS}WYMD~tW_?lB%Y#LJ%JZ)=ss+n774t!%N zvKA%~A_2Au4%M`dn0Yv{wk7ydsM|A(sSV!1Ykk6zzXeA;F9KT-z@$2ZAsH6bTBqI2 zbhRKv)NYrI?b3JViN?mBNA60?`xx*~zo|aF<&Jm=e_NRAGI7;ob5Q1bMVTjem)G@c z)>9srZ7tIyN$oY-bPRL4h)Zu2E;xQAASH3?E1eqOJ;8r;u3j<7Vs{$5yo8^z6&%~I z998fR-lA#38e8)vP7^$h*zKU$g?HYt)#$O^X5KLOFl&eUa08#+XumSf93Z69`lW8x zc`ac&o*_nq>wS*$);gVho0zFwd*+-v&Xecd+%5+DVs1^xAD8oK{GfMQvW1B=0RAdS$AH?#k56} zeyp7WmNsYGZMIr;W~Z;YP-QEiLos+}hL@tAafUA`4&v=Tu%4AJ;#X(YEY?i;RufFe zU+l8kgJYxDbJAPG=4(m}R{I-J$bGLrN@wO{yYgPKAhh*uiAx5zdb_9baCw3{VC#iac6%&zY7VRZi)OY1Uv!l_FQYg2 z6e_&OKQ##SW3$&(TK1!7n{dl}O=BF+_%B7z2lH+jNhtEGMF+^tXY@hZglFI6^3(;5 zPld#u6?&u0c)Jz00j;6!CaPvd(nlADvEV#d->O2D%Rx}`BJ|XZPuGomC#p|dozUWD z6-~^r%R)1h!)93*H@h@3n}Sb6e9ZaCVMLqayAZ`f3A7CwdeXKDY_u86OoC^v?d<5}NjnXM90VXG(E~!D(K5~yqKONpv zx5%9d>|7)&njL$qELjie9g)I`i3%R`AU1AD)%#OlboV~b4c@NC6Gc*O==^)><9QMG zz&zo&ELF23e|6wr%)<9qhVUag@EaWwl~&uHxDcb=FuUNp)_};TPmGpVBHhW7rzSIH zT@Bk4cx{bC=6r3Z(<3m7a-`7nEOJeS=IUdwOliC2^`nhH^;RT}wS!AN=v8y}ez+ zuIc*67i^GufX5FUIreVjHO|(pp?+`)>%l_aW5Dl1u}Cz!|L3=lvTk4A%I6Lt4of7D ra~(|&_?rK71r(rxf1-~6zS$i{shU|M%Vz801__Xs;oZtR_n-V9Bc_F8 diff --git a/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc b/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc index 0f6e5f479beb65..1fdd448c0eaa63 100644 --- a/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc +++ b/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc @@ -70,13 +70,19 @@ Next, after you select this option, you will be redirected to Keycloak to authen image::dev-ui-keycloak-test-service-from-spa.png[alt=Dev UI OpenId Connect Keycloak Single Page Application,role="center"] -Here you can test the service with either the access token or ID token (note that the ID token will be sent as a regular bearer token). +You can view the acquired access and ID tokens, for example: -Finally you can click a `Logged in` option if you'd like to log out and authenticate to Keycloak as a different user. +image::dev-ui-keycloak-decoded-tokens.png[alt=Dev UI OpenId Connect Keycloak Decoded Tokens View,role="center"] + +This view shows the encoded JWT token on the left hand side and highlights the headers (red colour), payload/claims (green colour) and signature (blue colour). It also shows the decoded JWT token on the right hand side where you can see the header and claim names and their values. + +Next test the service with either the current access or ID token. SPA usually sends the access tokens to the application endpoints but there could be cases where the ID tokens are forwarded to the application frontends for them to be aware about the user who is currently logged into SPA. + +Finally you can select a `Log Out` image::dev-ui-keycloak-logout.png option if you'd like to log out and authenticate to Keycloak as a different user. [NOTE] ==== -You may need to register a redirect URI for the authorization code flow initiated by Dev UI for Keycloak to work because Keycloak may enforce that the authenticated users are redirected only to the configured redirect URI. It is recommended to do in production to avoid the users being redirected to the wrong endpoints in case which might happen if the correct `redirect_uri` parameter in the authentication request URI has been manipulated. +You may need to register a redirect URI for the authorization code flow initiated by Dev UI for Keycloak to work because Keycloak may enforce that the authenticated users are redirected only to the configured redirect URI. It is recommended to do in production to avoid the users being redirected to the wrong endpoints which might happen if the correct `redirect_uri` parameter in the authentication request URI has been manipulated. If Keycloak does enforce it then you will see an authentication error informing you that the `redirect_uri` value is wrong. diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/DevServicesConfig.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/DevServicesConfig.java index 754bc3e7db2d2b..b3a31eef22a25e 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/DevServicesConfig.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/DevServicesConfig.java @@ -65,12 +65,27 @@ public class DevServicesConfig { */ @ConfigItem public Optional javaOpts; + /** - * The Keycloak realm. - * This property will be used to create the realm if the realm file pointed to by the 'realm-path' property does not exist. + * The Keycloak realm name. + * This property will be used to create the realm if the realm file pointed to by the 'realm-path' property does not exist, + * default value is 'quarkus' in this case. + * If the realm file pointed to by the 'realm-path' property exists then it is still recommended to set this property + * for Dev Services for Keycloak to avoid parsing the realm file in order to determine the realm name. + * */ - @ConfigItem(defaultValue = "quarkus") - public String realmName; + @ConfigItem + public Optional realmName; + + /** + * Indicates if the Keycloak realm has to be created when the realm file pointed to by the 'realm-path' property does not + * exist. + * + * Disable it if you'd like to create a realm using Keycloak Administration Console + * or Keycloak Admin API from {@linkplain io.quarkus.test.common.QuarkusTestResourceLifecycleManager}. + */ + @ConfigItem(defaultValue = "true") + public boolean createRealm; /** * The Keycloak users map containing the user name and password pairs. diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java index 67e911d91a10f8..dab59e46358a21 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java @@ -33,7 +33,8 @@ public void setConfigProperties(BuildProducer c console.produce( new DevConsoleTemplateInfoBuildItem("keycloakUsers", configProps.get().getProperties().get("oidc.users"))); - console.produce(new DevConsoleTemplateInfoBuildItem("keycloakRealm", config.devservices.realmName)); + console.produce(new DevConsoleTemplateInfoBuildItem("keycloakRealm", + configProps.get().getProperties().get("keycloak.realm"))); console.produce(new DevConsoleTemplateInfoBuildItem("oidcGrantType", config.devservices.grant.type.getGrantType())); } } diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java index 030b6bf880e97e..5bfc3126ebb1c9 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java @@ -2,6 +2,10 @@ import java.io.Closeable; import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -50,6 +54,7 @@ import io.quarkus.runtime.configuration.ConfigUtils; import io.vertx.core.Vertx; import io.vertx.core.http.HttpHeaders; +import io.vertx.core.json.JsonObject; import io.vertx.mutiny.core.buffer.Buffer; import io.vertx.mutiny.ext.web.client.HttpResponse; import io.vertx.mutiny.ext.web.client.WebClient; @@ -67,6 +72,7 @@ public class KeycloakDevServicesProcessor { private static final String CLIENT_ID_CONFIG_KEY = CONFIG_PREFIX + "client-id"; private static final String CLIENT_SECRET_CONFIG_KEY = CONFIG_PREFIX + "credentials.secret"; private static final String KEYCLOAK_URL_KEY = "keycloak.url"; + private static final String KEYCLOAK_REALM_KEY = "keycloak.realm"; private static final int KEYCLOAK_PORT = 8080; private static final String JAVA_OPTS = "JAVA_OPTS"; @@ -185,12 +191,14 @@ public void run() { LOG.info("Dev Services for Keycloak started."); - return prepareConfiguration(startResult.createDefaultRealm, devServices, startResult.shared); + return prepareConfiguration(capturedDevServicesConfiguration.createRealm && startResult.createDefaultRealm, + startResult.realmNameToUse, devServices, startResult.shared); } - private KeycloakDevServicesConfigBuildItem prepareConfiguration(boolean createRealm, + private KeycloakDevServicesConfigBuildItem prepareConfiguration(boolean createRealm, String realmNameToUse, BuildProducer devServices, boolean shared) { - final String authServerUrl = capturedKeycloakUrl + "/realms/" + capturedDevServicesConfiguration.realmName; + final String realmName = realmNameToUse != null ? realmNameToUse : getDefaultRealmName(); + final String authServerUrl = capturedKeycloakUrl + "/realms/" + realmName; String oidcClientId = getOidcClientId(); String oidcClientSecret = getOidcClientSecret(); @@ -208,6 +216,7 @@ private KeycloakDevServicesConfigBuildItem prepareConfiguration(boolean createRe Map configProperties = new HashMap<>(); configProperties.put(KEYCLOAK_URL_KEY, capturedKeycloakUrl); + configProperties.put(KEYCLOAK_REALM_KEY, realmName); configProperties.put(AUTH_SERVER_URL_CONFIG_KEY, authServerUrl); configProperties.put(APPLICATION_TYPE_CONFIG_KEY, oidcApplicationType); configProperties.put(CLIENT_ID_CONFIG_KEY, oidcClientId); @@ -218,6 +227,10 @@ private KeycloakDevServicesConfigBuildItem prepareConfiguration(boolean createRe return existingDevServiceConfig; } + private String getDefaultRealmName() { + return capturedDevServicesConfiguration.realmName.orElse("quarkus"); + } + private StartResult startContainer(boolean useSharedContainer) { if (!capturedDevServicesConfiguration.enabled) { // explicitly disabled @@ -239,7 +252,7 @@ private StartResult startContainer(boolean useSharedContainer) { } final Optional maybeContainerAddress = keycloakDevModeContainerLocator.locateContainer( - capturedDevServicesConfiguration.realmName, + capturedDevServicesConfiguration.serviceName, capturedDevServicesConfiguration.shared, LaunchMode.current()); @@ -250,6 +263,7 @@ private StartResult startContainer(boolean useSharedContainer) { QuarkusOidcContainer oidcContainer = new QuarkusOidcContainer(dockerImageName, capturedDevServicesConfiguration.port, useSharedContainer, + capturedDevServicesConfiguration.realmName, capturedDevServicesConfiguration.realmPath, capturedDevServicesConfiguration.serviceName, capturedDevServicesConfiguration.shared, @@ -260,6 +274,7 @@ private StartResult startContainer(boolean useSharedContainer) { String url = "http://" + oidcContainer.getHost() + ":" + oidcContainer.getPort(); return new StartResult(url, !oidcContainer.realmFileExists, + oidcContainer.realmNameToUse, new Closeable() { @Override public void close() { @@ -272,7 +287,8 @@ public void close() { }; return maybeContainerAddress - .map(containerAddress -> new StartResult(getSharedContainerUrl(containerAddress), false, null, true)) + .map(containerAddress -> new StartResult(getSharedContainerUrl(containerAddress), false, + null, null, true)) .orElseGet(defaultKeycloakContainerSupplier); } @@ -284,12 +300,14 @@ private String getSharedContainerUrl(ContainerAddress containerAddress) { private static class StartResult { private final String url; private final boolean createDefaultRealm; + private String realmNameToUse; private final Closeable closeable; private final boolean shared; - public StartResult(String url, boolean createDefaultRealm, Closeable closeable, boolean shared) { + public StartResult(String url, boolean createDefaultRealm, String realmNameToUse, Closeable closeable, boolean shared) { this.url = url; this.createDefaultRealm = createDefaultRealm; + this.realmNameToUse = realmNameToUse; this.closeable = closeable; this.shared = shared; } @@ -298,18 +316,22 @@ public StartResult(String url, boolean createDefaultRealm, Closeable closeable, private static class QuarkusOidcContainer extends GenericContainer { private final OptionalInt fixedExposedPort; private final boolean useSharedNetwork; + private final Optional configuredRealmName; private final Optional realmPath; private final String containerLabelValue; private final Optional javaOpts; private final boolean sharedContainer; private boolean realmFileExists; private String hostName = null; + private String realmNameToUse; public QuarkusOidcContainer(DockerImageName dockerImageName, OptionalInt fixedExposedPort, boolean useSharedNetwork, - Optional realmPath, String containerLabelValue, boolean sharedContainer, Optional javaOpts) { + Optional configuredRealmName, Optional realmPath, String containerLabelValue, + boolean sharedContainer, Optional javaOpts) { super(dockerImageName); this.fixedExposedPort = fixedExposedPort; this.useSharedNetwork = useSharedNetwork; + this.configuredRealmName = configuredRealmName; this.realmPath = realmPath; this.containerLabelValue = containerLabelValue; this.sharedContainer = sharedContainer; @@ -346,14 +368,19 @@ protected void configure() { } if (realmPath.isPresent()) { - if (Thread.currentThread().getContextClassLoader().getResource(realmPath.get()) != null) { + URL realmPathUrl = null; + if ((realmPathUrl = Thread.currentThread().getContextClassLoader().getResource(realmPath.get())) != null) { realmFileExists = true; + realmNameToUse = configuredRealmName.isPresent() ? null + : getRealmNameFromRealmFile(realmPathUrl, realmPath.get()); withClasspathResourceMapping(realmPath.get(), KEYCLOAK_DOCKER_REALM_PATH, BindMode.READ_ONLY); addEnv(KEYCLOAK_IMPORT_PROP, KEYCLOAK_DOCKER_REALM_PATH); } else { Path filePath = Paths.get(realmPath.get()); if (Files.exists(filePath)) { realmFileExists = true; + realmNameToUse = configuredRealmName.isPresent() ? null + : getRealmNameFromRealmFile(filePath.toUri(), realmPath.get()); withFileSystemBind(realmPath.get(), KEYCLOAK_DOCKER_REALM_PATH, BindMode.READ_ONLY); addEnv(KEYCLOAK_IMPORT_PROP, KEYCLOAK_DOCKER_REALM_PATH); } else { @@ -365,6 +392,28 @@ protected void configure() { super.setWaitStrategy(Wait.forHttp("/auth").forPort(KEYCLOAK_PORT)); } + private String getRealmNameFromRealmFile(URI uri, String realmPath) { + try { + return getRealmNameFromRealmFile(uri.toURL(), realmPath); + } catch (MalformedURLException ex) { + // Will not happen as this method is called only when it is confirmed the file exists + throw new RuntimeException(ex); + } + } + + private String getRealmNameFromRealmFile(URL url, String realmPath) { + try { + try (InputStream is = url.openStream()) { + JsonObject realmJson = new JsonObject(io.vertx.core.buffer.Buffer.buffer(is.readAllBytes())); + String realmName = realmJson.getString("realm"); + return realmName; + } + } catch (IOException ex) { + LOG.errorf("Realm %s resource can not be opened: %s", realmPath, ex.getMessage()); + } + return null; + } + @Override public String getHost() { if (useSharedNetwork) { @@ -447,7 +496,7 @@ private String[] getUserRoles(String user) { private RealmRepresentation createRealmRep() { RealmRepresentation realm = new RealmRepresentation(); - realm.setRealm(capturedDevServicesConfiguration.realmName); + realm.setRealm(getDefaultRealmName()); realm.setEnabled(true); realm.setUsers(new ArrayList<>()); realm.setClients(new ArrayList<>()); diff --git a/integration-tests/oidc-token-propagation/src/main/resources/application.properties b/integration-tests/oidc-token-propagation/src/main/resources/application.properties index c2e276a45a68b0..13ecaa4fad55ed 100644 --- a/integration-tests/oidc-token-propagation/src/main/resources/application.properties +++ b/integration-tests/oidc-token-propagation/src/main/resources/application.properties @@ -3,6 +3,7 @@ quarkus.oidc.client-id=quarkus-app quarkus.oidc.credentials.secret=secret quarkus.keycloak.devservices.java-opts=-Dkeycloak.profile.feature.token_exchange=enabled -Dkeycloak.profile=preview +quarkus.keycloak.devservices.create-realm=false quarkus.oidc-client.auth-server-url=${quarkus.oidc.auth-server-url} quarkus.oidc-client.client-id=${quarkus.oidc.client-id} diff --git a/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java index 02d1fd7c861ab5..26d39e7a99ac95 100644 --- a/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java +++ b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java @@ -1,31 +1,26 @@ package io.quarkus.it.keycloak; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; -import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.RolesRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.util.JsonSerialization; import io.quarkus.test.common.DevServicesContext; import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; -import io.restassured.RestAssured; +import io.quarkus.test.keycloak.client.KeycloakTestClient; public class KeycloakRealmResourceManager implements QuarkusTestResourceLifecycleManager, DevServicesContext.ContextAware { private static final String KEYCLOAK_REALM = "quarkus"; - String authServerUrl; + final KeycloakTestClient client = new KeycloakTestClient(); @Override public Map start() { @@ -40,41 +35,10 @@ public Map start() { realm.getUsers().add(createUser("alice", "user")); realm.getUsers().add(createUser("bob", "user")); - try { - //dev services sets up a realm for us, we delete it because we want different settings - RestAssured - .given() - .auth().oauth2(getAdminAccessToken()) - .contentType("application/json") - .when() - .delete(authServerUrl + "/admin/realms/quarkus").then() - .statusCode(204); - RestAssured - .given() - .auth().oauth2(getAdminAccessToken()) - .contentType("application/json") - .body(JsonSerialization.writeValueAsBytes(realm)) - .when() - .post(authServerUrl + "/admin/realms").then() - .statusCode(201); - } catch (IOException e) { - throw new RuntimeException(e); - } + client.createRealm(realm); return Collections.emptyMap(); } - private String getAdminAccessToken() { - return RestAssured - .given() - .param("grant_type", "password") - .param("username", "admin") - .param("password", "admin") - .param("client_id", "admin-cli") - .when() - .post(authServerUrl + "/realms/master/protocol/openid-connect/token") - .as(AccessTokenResponse.class).getToken(); - } - private RealmRepresentation createRealm(String name) { RealmRepresentation realm = new RealmRepresentation(); @@ -131,22 +95,11 @@ private UserRepresentation createUser(String username, String... realmRoles) { @Override public void stop() { - - RestAssured - .given() - .auth().oauth2(getAdminAccessToken()) - .when() - .delete(authServerUrl + "/admin/realms/" + KEYCLOAK_REALM).then().statusCode(204); + client.deleteRealm(KEYCLOAK_REALM); } @Override public void setIntegrationTestContext(DevServicesContext context) { - try { - var uri = new URI(context.devServicesProperties().get("quarkus.oidc.auth-server-url")); - authServerUrl = new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(), uri.getPort(), "/auth", null, null) - .toString(); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } + client.setIntegrationTestContext(context); } } diff --git a/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/client/KeycloakTestClient.java b/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/client/KeycloakTestClient.java index 5c551dd34c4c05..60cac1983278ad 100644 --- a/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/client/KeycloakTestClient.java +++ b/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/client/KeycloakTestClient.java @@ -1,11 +1,18 @@ package io.quarkus.test.keycloak.client; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + import org.eclipse.microprofile.config.ConfigProvider; import org.keycloak.representations.AccessTokenResponse; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.util.JsonSerialization; import io.quarkus.runtime.configuration.ConfigurationException; import io.quarkus.test.common.DevServicesContext; import io.restassured.RestAssured; +import io.restassured.specification.RequestSpecification; public class KeycloakTestClient implements DevServicesContext.ContextAware { @@ -23,26 +30,48 @@ public KeycloakTestClient() { } + /** + * Get an access token using a password grant with a provided user name. + * User secret will be the same as the user name, client id will be set to 'quarkus-app' and client secret to 'secret'. + */ public String getAccessToken(String userName) { return getAccessToken(userName, getClientId()); } + /** + * Get an access token using a password grant with the provided user name and client id. + * User secret will be the same as the user name, client secret will be set to 'secret'. + */ public String getAccessToken(String userName, String clientId) { return getAccessToken(userName, userName, clientId); } + /** + * Get an access token using a password grant with the provided user name, user secret and client id. + * Client secret will be set to 'secret'. + */ public String getAccessToken(String userName, String userSecret, String clientId) { return getAccessToken(userName, userSecret, clientId, getClientSecret()); } + /** + * Get an access token using a password grant with the provided user name, user secret, client id and secret. + * Set the client secret to an empty string or null if it is not required. + */ public String getAccessToken(String userName, String userSecret, String clientId, String clientSecret) { - return RestAssured.given().param("grant_type", "password") + return getAccessTokenInternal(userName, userSecret, clientId, clientSecret, getAuthServerUrl()); + } + + private String getAccessTokenInternal(String userName, String userSecret, String clientId, String clientSecret, + String authServerUrl) { + RequestSpecification requestSpec = RestAssured.given().param("grant_type", "password") .param("username", userName) .param("password", userSecret) - .param("client_id", clientId) - .param("client_secret", clientSecret) - .when() - .post(getAuthServerUrl() + "/protocol/openid-connect/token") + .param("client_id", clientId); + if (clientSecret != null && !clientSecret.isBlank()) { + requestSpec = requestSpec.param("client_secret", clientSecret); + } + return requestSpec.when().post(authServerUrl + "/protocol/openid-connect/token") .as(AccessTokenResponse.class).getToken(); } @@ -54,6 +83,32 @@ private String getClientSecret() { return getPropertyValue(CLIENT_SECRET_PROP, "secret"); } + /** + * Get an admin access token which can be used to create Keycloak realms and perform other Keycloak administration tasks. + */ + public String getAdminAccessToken() { + return getAccessTokenInternal("admin", "admin", "admin-cli", null, getAuthServerBaseUrl() + "/realms/master"); + } + + /** + * Return URL string pointing to a Keycloak base endpoint. + * For example: 'http://localhost:8081/auth'. + */ + public String getAuthServerBaseUrl() { + try { + var uri = new URI(getAuthServerUrl()); + return new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(), uri.getPort(), "/auth", null, null) + .toString(); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + } + + /** + * Return URL string pointing to a Keycloak authentication endpoint configured with a 'quarkus.oidc.auth-server' + * property. + * For example: 'http://localhost:8081/auth/realms/quarkus'. + */ public String getAuthServerUrl() { String authServerUrl = getPropertyValue(AUTH_SERVER_URL_PROP, null); if (authServerUrl == null) { @@ -62,6 +117,35 @@ public String getAuthServerUrl() { return authServerUrl; } + /** + * Create a realm. + */ + public void createRealm(RealmRepresentation realm) { + try { + RestAssured + .given() + .auth().oauth2(getAdminAccessToken()) + .contentType("application/json") + .body(JsonSerialization.writeValueAsBytes(realm)) + .when() + .post(getAuthServerBaseUrl() + "/admin/realms").then() + .statusCode(201); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * Delete a realm + */ + public void deleteRealm(String realm) { + RestAssured + .given() + .auth().oauth2(getAdminAccessToken()) + .when() + .delete(getAuthServerBaseUrl() + "/admin/realms/" + realm).then().statusCode(204); + } + private String getPropertyValue(String prop, String defaultValue) { return ConfigProvider.getConfig().getOptionalValue(prop, String.class) .orElseGet(() -> getDevProperty(prop, defaultValue)); From 74ceaf2db79beef691ed2c49f52bf96c903be6d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Sep 2021 21:18:40 +0000 Subject: [PATCH 095/138] Bump awssdk.version from 2.17.32 to 2.17.33 Bumps `awssdk.version` from 2.17.32 to 2.17.33. Updates `software.amazon.awssdk:bom` from 2.17.32 to 2.17.33 - [Release notes](https://github.com/aws/aws-sdk-java-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java-v2/compare/2.17.32...2.17.33) Updates `apache-client` from 2.17.32 to 2.17.33 --- updated-dependencies: - dependency-name: software.amazon.awssdk:bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:apache-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 5c39069a07e687..3709847f539f6b 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -145,7 +145,7 @@ 3.10.0 1.6 2.9.1 - 2.17.32 + 2.17.33 2.40.0 1.4.2 1.5.30 From 8798bd6a2c9002d4c8f8ec130adb160d4a6097e1 Mon Sep 17 00:00:00 2001 From: Manaswini Das Date: Sun, 5 Sep 2021 19:46:27 +0530 Subject: [PATCH 096/138] Fix broken link for config-reference --- docs/src/main/asciidoc/mailer.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/mailer.adoc b/docs/src/main/asciidoc/mailer.adoc index 2bde3fce3ea538..d61e20586f862a 100644 --- a/docs/src/main/asciidoc/mailer.adoc +++ b/docs/src/main/asciidoc/mailer.adoc @@ -184,7 +184,7 @@ The Quarkus mailer is using SMTP, so make sure you have access to a SMTP server. In the `src/main/resources/application.properties` file, you need to configure the host, port, username, password as well as the other configuration aspect. Note that the password can also be configured using system properties and environment variables. -See the xref:configuration-reference.adoc[configuration reference guide] for details. +See the xref:config-reference.adoc[configuration reference guide] for details. Here is an example using _sendgrid_: From 9d7292d0c58714419f94744970bc00123df8f955 Mon Sep 17 00:00:00 2001 From: Falko Modler Date: Sun, 5 Sep 2021 22:14:46 +0200 Subject: [PATCH 097/138] Set default jvm-target in basic kotlin sample project --- .../basic-kotlin-application-project/build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/build.gradle b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/build.gradle index 6a3efd26bb298e..5ac19470fa8422 100644 --- a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/build.gradle +++ b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/build.gradle @@ -24,3 +24,10 @@ dependencies { compileJava { options.compilerArgs << '-parameters' } + +// This is a fix as kotlin 1.5.30 does not support Java 17 yet +if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { + tasks.quarkusDev { + compilerArgs = ["-jvm-target", "16"] + } +} From 80894adb77c298557b4834989aaf9dcb53ca58bd Mon Sep 17 00:00:00 2001 From: Manaswini Das Date: Mon, 6 Sep 2021 12:54:05 +0530 Subject: [PATCH 098/138] Add instructions to access App passwords page --- docs/src/main/asciidoc/mailer-reference.adoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/src/main/asciidoc/mailer-reference.adoc b/docs/src/main/asciidoc/mailer-reference.adoc index d6e9af78366218..544b0a771c6e33 100644 --- a/docs/src/main/asciidoc/mailer-reference.adoc +++ b/docs/src/main/asciidoc/mailer-reference.adoc @@ -288,6 +288,11 @@ You can also create your own instance, and pass your own configuration. If you want to use the Gmail SMTP server, first create a dedicated password in `Google Account > Security > App passwords` or go to https://myaccount.google.com/apppasswords. +[NOTE] +==== +You need to switch on 2-Step Verification at https://myaccount.google.com/security in order to access the App passwords page. +==== + When done, you can configure your Quarkus application by adding the following properties to your `application.properties`: With TLS: From 40ced5eed45d9ee94e42df8e99b46fa9043410fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Marti=C5=A1ka?= Date: Wed, 1 Sep 2021 13:20:42 +0200 Subject: [PATCH 099/138] SmallRye GraphQL 1.3.2 --- bom/application/pom.xml | 2 +- .../runtime/GraphQLClientConfigurationMergerBean.java | 10 +++++----- .../client/runtime/SmallRyeGraphQLClientRecorder.java | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index f9f59ab2500786..df4c57bfc33520 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -46,7 +46,7 @@ 3.1.1 3.0.1 2.1.10 - 1.3.1 + 1.3.2 2.0.1 5.2.1 3.2.1 diff --git a/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java b/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java index b14d2983bc62ad..20eb364655d009 100644 --- a/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java +++ b/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java @@ -13,14 +13,13 @@ * On startup, this beans takes Quarkus-specific configuration of GraphQL clients (quarkus.* properties) * and merges this configuration with the configuration parsed by SmallRye GraphQL itself (CLIENT/mp-graphql/* properties) * - * The resulting merged configuration resides in the application-scoped `io.smallrye.graphql.client.GraphQLClientConfiguration` + * The resulting merged configuration resides in `io.smallrye.graphql.client.GraphQLClientsConfiguration` * * Quarkus configuration overrides SmallRye configuration where applicable. */ @Singleton public class GraphQLClientConfigurationMergerBean { - @Inject GraphQLClientsConfiguration upstreamConfiguration; @Inject @@ -31,6 +30,7 @@ public class GraphQLClientConfigurationMergerBean { @PostConstruct void enhanceGraphQLConfiguration() { + upstreamConfiguration = GraphQLClientsConfiguration.getInstance(); for (Map.Entry client : quarkusConfiguration.clients.entrySet()) { // the raw config key provided in the config, this might be a short class name, // so translate that into the fully qualified name if applicable @@ -43,14 +43,14 @@ void enhanceGraphQLConfiguration() { GraphQLClientConfig quarkusConfig = client.getValue(); // if SmallRye configuration does not contain this client, simply use it - if (!upstreamConfiguration.getClients().containsKey(configKey)) { + if (upstreamConfiguration.getClient(configKey) == null) { GraphQLClientConfiguration transformed = new GraphQLClientConfiguration(); transformed.setHeaders(quarkusConfig.headers); quarkusConfig.url.ifPresent(transformed::setUrl); - upstreamConfiguration.getClients().put(configKey, transformed); + upstreamConfiguration.addClient(configKey, transformed); } else { // if SmallRye configuration already contains this client, override it with the Quarkus configuration - GraphQLClientConfiguration upstreamConfig = upstreamConfiguration.getClients().get(configKey); + GraphQLClientConfiguration upstreamConfig = upstreamConfiguration.getClient(configKey); quarkusConfig.url.ifPresent(upstreamConfig::setUrl); // merge the headers if (quarkusConfig.headers != null) { diff --git a/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/SmallRyeGraphQLClientRecorder.java b/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/SmallRyeGraphQLClientRecorder.java index 041c43129fd9c9..a7bffb28e752aa 100644 --- a/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/SmallRyeGraphQLClientRecorder.java +++ b/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/SmallRyeGraphQLClientRecorder.java @@ -22,7 +22,8 @@ public Supplier typesafeClientSupplier(Class targetClassName) { } public void setTypesafeApiClasses(List apiClassNames) { - GraphQLClientsConfiguration configBean = Arc.container().instance(GraphQLClientsConfiguration.class).get(); + GraphQLClientsConfiguration.setSingleApplication(true); + GraphQLClientsConfiguration configBean = GraphQLClientsConfiguration.getInstance(); List> classes = apiClassNames.stream().map(className -> { try { return Class.forName(className, true, Thread.currentThread().getContextClassLoader()); @@ -30,7 +31,7 @@ public void setTypesafeApiClasses(List apiClassNames) { throw new RuntimeException(e); } }).collect(Collectors.toList()); - configBean.apiClasses(classes, true); + configBean.addTypesafeClientApis(classes); } public RuntimeValue clientSupport(Map shortNamesToQualifiedNames) { From 34391e670daa47ae9491d64e4c57d411f77e986a Mon Sep 17 00:00:00 2001 From: Falko Modler Date: Sun, 5 Sep 2021 19:12:31 +0200 Subject: [PATCH 100/138] Fix combination of multiple `@Nested` tests with root lifecycle methods Fixes #19843 --- .../java/io/quarkus/it/main/JaxbTestCase.java | 31 +---- .../it/main/QuarkusTestNestedTestCase.java | 127 ++++++++++++++++++ .../test/junit/QuarkusTestExtension.java | 11 +- 3 files changed, 133 insertions(+), 36 deletions(-) create mode 100644 integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedTestCase.java diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbTestCase.java index 62110d4baeb4ad..8c32cf33add5ce 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbTestCase.java @@ -2,11 +2,6 @@ import static org.hamcrest.Matchers.contains; -import java.util.concurrent.atomic.AtomicInteger; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import io.quarkus.test.junit.QuarkusTest; @@ -15,27 +10,9 @@ @QuarkusTest public class JaxbTestCase { - private static final AtomicInteger count = new AtomicInteger(0); - - @BeforeEach - public void beforeInEnclosing() { - count.incrementAndGet(); + @Test + public void testNews() { + RestAssured.when().get("/test/jaxb/getnews").then() + .body("author", contains("Emmanuel Bernard")); } - - @Nested - class SomeClass { - - @BeforeEach - public void beforeInTest() { - count.incrementAndGet(); - } - - @Test - public void testNews() { - RestAssured.when().get("/test/jaxb/getnews").then() - .body("author", contains("Emmanuel Bernard")); - Assertions.assertEquals(2, count.get()); - } - } - } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedTestCase.java new file mode 100644 index 00000000000000..30bb5e2fc1430e --- /dev/null +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedTestCase.java @@ -0,0 +1,127 @@ +package io.quarkus.it.main; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.concurrent.atomic.AtomicInteger; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; + +import io.quarkus.test.junit.QuarkusTest; + +/** + * Tests {@link Nested} support of {@link QuarkusTest}. Notes: + *

    + */ +@QuarkusTest +@Tag("nested") +public class QuarkusTestNestedTestCase { + + private static final AtomicInteger COUNT_BEFORE_ALL = new AtomicInteger(0); + private static final AtomicInteger COUNT_BEFORE_EACH = new AtomicInteger(0); + private static final AtomicInteger COUNT_TEST = new AtomicInteger(0); + private static final AtomicInteger COUNT_AFTER_EACH = new AtomicInteger(0); + private static final AtomicInteger COUNT_AFTER_ALL = new AtomicInteger(0); + + @BeforeAll + static void beforeAll() { + COUNT_BEFORE_ALL.incrementAndGet(); + } + + @BeforeEach + void beforeEach() { + COUNT_BEFORE_EACH.incrementAndGet(); + } + + @Test + void test() { + assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL"); + assertEquals(1, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH"); + assertEquals(0, COUNT_TEST.getAndIncrement(), "COUNT_TEST"); + assertEquals(0, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH"); + assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL"); + } + + @Nested + @TestMethodOrder(OrderAnnotation.class) + class FirstNested { + + @BeforeEach + void beforeEach() { + COUNT_BEFORE_EACH.incrementAndGet(); + } + + @Test + @Order(1) + void testOne() { + assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL"); + assertEquals(5, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH"); + assertEquals(2, COUNT_TEST.getAndIncrement(), "COUNT_TEST"); + assertEquals(3, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH"); + assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL"); + } + + @Test + @Order(2) + void testTwo() { + assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL"); + assertEquals(7, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH"); + assertEquals(3, COUNT_TEST.getAndIncrement(), "COUNT_TEST"); + assertEquals(5, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH"); + assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL"); + } + + @AfterEach + void afterEach() { + COUNT_AFTER_EACH.incrementAndGet(); + } + } + + @Nested + class SecondNested { + + @BeforeEach + void beforeEach() { + COUNT_BEFORE_EACH.incrementAndGet(); + } + + @Test + void testOne() { + assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL"); + assertEquals(3, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH"); + assertEquals(1, COUNT_TEST.getAndIncrement(), "COUNT_TEST"); + assertEquals(1, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH"); + assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL"); + } + + @AfterEach + void afterEach() { + COUNT_AFTER_EACH.incrementAndGet(); + } + } + + @AfterEach + void afterEach() { + COUNT_AFTER_EACH.incrementAndGet(); + } + + @AfterAll + static void afterAll() { + assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL"); + assertEquals(7, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH"); + assertEquals(4, COUNT_TEST.get(), "COUNT_TEST"); + assertEquals(7, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH"); + assertEquals(0, COUNT_AFTER_ALL.getAndIncrement(), "COUNT_AFTER_ALL"); + } +} diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java index a3f00de8224aad..fe04bcfcf93e96 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Deque; import java.util.HashMap; -import java.util.IdentityHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -197,8 +196,6 @@ public void run() { } }; - private final IdentityHashMap tcclMethodCache = new IdentityHashMap<>(); - static { ClassLoader classLoader = QuarkusTestExtension.class.getClassLoader(); if (classLoader instanceof QuarkusClassLoader) { @@ -433,7 +430,6 @@ public void close() throws IOException { } tm.close(); } finally { - tcclMethodCache.clear(); GroovyCacheCleaner.clearGroovyCache(); shutdownHangDetection(); } @@ -1102,10 +1098,8 @@ private Object runExtensionMethod(ReflectiveInvocationContext invocation private Method determineTCCLExtensionMethod(Method originalMethod, Class c) throws ClassNotFoundException { - Method newMethod = tcclMethodCache.get(originalMethod); - if (newMethod != null) { - return newMethod; - } + + Method newMethod = null; while (c != Object.class) { if (c.getName().equals(originalMethod.getDeclaringClass().getName())) { try { @@ -1129,7 +1123,6 @@ private Method determineTCCLExtensionMethod(Method originalMethod, Class c) } c = c.getSuperclass(); } - tcclMethodCache.put(originalMethod, newMethod); return newMethod; } From f7b48a9871ad46d19cb93faa112dfe79b65988fc Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Fri, 3 Sep 2021 14:59:30 +0100 Subject: [PATCH 101/138] Upgrade to Oracle JDBC driver v 21.3.0.0 and import its BOM --- bom/application/pom.xml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index f9f59ab2500786..297eaf394a606c 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -120,7 +120,7 @@ 2.7.4 8.0.26 7.2.2.jre8 - 21.1.0.0 + 21.3.0.0 10.14.2.0 11.5.6.0 1.2.6 @@ -353,6 +353,15 @@ import     + + + com.oracle.database.jdbc + ojdbc-bom + ${oracle-jdbc.version} + pom + import + + io.smallrye.reactive @@ -4507,11 +4516,6 @@ mssql-jdbc ${mssql-jdbc.version} - - com.oracle.database.jdbc - ojdbc11 - ${oracle-jdbc.version} - org.elasticsearch.client elasticsearch-rest-client From 366d49b50e4487280d7e0baa94e8906c3f2a09f5 Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Mon, 6 Sep 2021 14:10:37 +0200 Subject: [PATCH 102/138] GraphQL - make sure the panache entities are updated in the index Signed-off-by: Phillip Kruger --- .../smallrye-graphql/deployment/pom.xml | 1 - .../graphql/deployment/OverridableIndex.java | 250 ++++++++++++++++++ .../SmallRyeGraphQLIndexBuildItem.java | 18 ++ .../deployment/SmallRyeGraphQLProcessor.java | 37 ++- .../graphql/deployment/HotReloadTest.java | 77 ++++++ .../smallrye/graphql/deployment/TestPojo.java | 2 + .../hibernate-orm-graphql-panache/pom.xml | 122 +++++++++ .../orm/graphql/panache/Author.java | 14 + .../hibertnate/orm/graphql/panache/Book.java | 41 +++ .../orm/graphql/panache/BookRepository.java | 9 + .../orm/graphql/panache/GraphQLResource.java | 32 +++ .../src/main/resources/application.properties | 9 + .../src/main/resources/import.sql | 6 + .../panache/HibernateOrmGraphQLPanacheIT.java | 7 + .../HibernateOrmGraphQLPanacheTest.java | 69 +++++ .../orm/graphql/panache/PayloadCreator.java | 31 +++ .../orm/graphql/panache/TestResources.java | 8 + integration-tests/pom.xml | 1 + 18 files changed, 730 insertions(+), 4 deletions(-) create mode 100644 extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/OverridableIndex.java create mode 100644 extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLIndexBuildItem.java create mode 100644 integration-tests/hibernate-orm-graphql-panache/pom.xml create mode 100644 integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Author.java create mode 100644 integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Book.java create mode 100644 integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/BookRepository.java create mode 100644 integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/GraphQLResource.java create mode 100644 integration-tests/hibernate-orm-graphql-panache/src/main/resources/application.properties create mode 100644 integration-tests/hibernate-orm-graphql-panache/src/main/resources/import.sql create mode 100644 integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheIT.java create mode 100644 integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheTest.java create mode 100644 integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/PayloadCreator.java create mode 100644 integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/TestResources.java diff --git a/extensions/smallrye-graphql/deployment/pom.xml b/extensions/smallrye-graphql/deployment/pom.xml index cf6474ef198151..cd7dd722d20ea4 100644 --- a/extensions/smallrye-graphql/deployment/pom.xml +++ b/extensions/smallrye-graphql/deployment/pom.xml @@ -18,7 +18,6 @@ io.quarkus quarkus-smallrye-graphql - ${project.version} diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/OverridableIndex.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/OverridableIndex.java new file mode 100644 index 00000000000000..6b87a8d21ee6ef --- /dev/null +++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/OverridableIndex.java @@ -0,0 +1,250 @@ +package io.quarkus.smallrye.graphql.deployment; + +import java.util.Collection; +import java.util.Comparator; +import java.util.Set; +import java.util.TreeSet; + +import org.jboss.jandex.AnnotationInstance; +import org.jboss.jandex.AnnotationTarget; +import org.jboss.jandex.ClassInfo; +import org.jboss.jandex.DotName; +import org.jboss.jandex.FieldInfo; +import org.jboss.jandex.IndexView; +import org.jboss.jandex.MethodInfo; +import org.jboss.jandex.MethodParameterInfo; +import org.jboss.jandex.ModuleInfo; +import org.jboss.jandex.RecordComponentInfo; +import org.jboss.jandex.Type; + +public class OverridableIndex implements IndexView { + + private final IndexView original; + private final IndexView override; + + private OverridableIndex(IndexView original, IndexView override) { + this.original = original; + this.override = override; + } + + public static OverridableIndex create(IndexView original, IndexView override) { + return new OverridableIndex(original, override); + } + + @Override + public Collection getKnownClasses() { + return overrideCollection(original.getKnownClasses(), override.getKnownClasses(), classInfoComparator); + } + + @Override + public ClassInfo getClassByName(DotName dn) { + return overrideObject(original.getClassByName(dn), override.getClassByName(dn)); + } + + @Override + public Collection getKnownDirectSubclasses(DotName dn) { + return overrideCollection(original.getKnownDirectSubclasses(dn), override.getKnownDirectSubclasses(dn), + classInfoComparator); + } + + @Override + public Collection getAllKnownSubclasses(DotName dn) { + return overrideCollection(original.getAllKnownSubclasses(dn), override.getAllKnownSubclasses(dn), classInfoComparator); + } + + @Override + public Collection getKnownDirectImplementors(DotName dn) { + return overrideCollection(original.getKnownDirectImplementors(dn), override.getKnownDirectImplementors(dn), + classInfoComparator); + } + + @Override + public Collection getAllKnownImplementors(DotName dn) { + return overrideCollection(original.getAllKnownImplementors(dn), override.getAllKnownImplementors(dn), + classInfoComparator); + } + + @Override + public Collection getAnnotations(DotName dn) { + return overrideCollection(original.getAnnotations(dn), override.getAnnotations(dn), annotationInstanceComparator); + } + + @Override + public Collection getAnnotationsWithRepeatable(DotName dn, IndexView iv) { + return overrideCollection(original.getAnnotationsWithRepeatable(dn, iv), override.getAnnotationsWithRepeatable(dn, iv), + annotationInstanceComparator); + } + + @Override + public Collection getKnownModules() { + return overrideCollection(original.getKnownModules(), override.getKnownModules(), moduleInfoComparator); + } + + @Override + public ModuleInfo getModuleByName(DotName dn) { + return overrideObject(original.getModuleByName(dn), override.getModuleByName(dn)); + } + + @Override + public Collection getKnownUsers(DotName dn) { + return overrideCollection(original.getKnownUsers(dn), override.getKnownUsers(dn), classInfoComparator); + } + + private Comparator classInfoComparator = new Comparator() { + @Override + public int compare(ClassInfo t, ClassInfo t1) { + return t.name().toString().compareTo(t1.name().toString()); + } + }; + + private Comparator typeComparator = new Comparator() { + @Override + public int compare(Type t, Type t1) { + return t.name().toString().compareTo(t1.name().toString()); + } + }; + + private Comparator moduleInfoComparator = new Comparator() { + @Override + public int compare(ModuleInfo t, ModuleInfo t1) { + return t.name().toString().compareTo(t1.name().toString()); + } + }; + + private Comparator fieldInfoComparator = new Comparator() { + @Override + public int compare(FieldInfo t, FieldInfo t1) { + if (classInfoComparator.compare(t.declaringClass(), t1.declaringClass()) == 0) { // Same class + return t.name().toString().compareTo(t1.name().toString()); + } + return -1; + } + }; + + private Comparator recordComponentInfoComparator = new Comparator() { + @Override + public int compare(RecordComponentInfo t, RecordComponentInfo t1) { + if (classInfoComparator.compare(t.declaringClass(), t1.declaringClass()) == 0) { // Same class + return t.name().toString().compareTo(t1.name().toString()); + } + return -1; + } + }; + + private Comparator methodInfoComparator = new Comparator() { + @Override + public int compare(MethodInfo t, MethodInfo t1) { + if (classInfoComparator.compare(t.declaringClass(), t1.declaringClass()) == 0) { // Same class + if (t.name().toString().compareTo(t1.name().toString()) == 0) { // Same method name + if (t.parameters().size() == t1.parameters().size()) { // Same number of parameters + for (int i = 0; i < t.parameters().size(); i++) { + int typeTheSame = typeComparator.compare(t.parameters().get(i), t1.parameters().get(i)); + if (typeTheSame != 0) { + return typeTheSame; + } + } + // All parameter type are the same + return 0; + } + } + } + return -1; + } + }; + + private Comparator methodParameterInfoComparator = new Comparator() { + @Override + public int compare(MethodParameterInfo t, MethodParameterInfo t1) { + if (methodInfoComparator.compare(t.method(), t1.method()) == 0 && // Same method + t.kind().equals(t1.kind()) && // Same kind + t.name().equals(t1.name()) && // Same name + t.position() == t1.position()) { // Same position + return 0; + } + return -1; + } + }; + + private Comparator annotationInstanceComparator = new Comparator() { + @Override + public int compare(AnnotationInstance t, AnnotationInstance t1) { + if (t.name().equals(t1.name())) { + // Class Info + if (t.target().kind().equals(AnnotationTarget.Kind.CLASS) + && t1.target().kind().equals(AnnotationTarget.Kind.CLASS)) { + return classInfoComparator.compare(t.target().asClass(), t1.target().asClass()); + } + + // Field Info + if (t.target().kind().equals(AnnotationTarget.Kind.FIELD) + && t1.target().kind().equals(AnnotationTarget.Kind.FIELD)) { + return fieldInfoComparator.compare(t.target().asField(), t1.target().asField()); + } + + // Type + if (t.target().kind().equals(AnnotationTarget.Kind.TYPE) + && t1.target().kind().equals(AnnotationTarget.Kind.TYPE)) { + return typeComparator.compare(t.target().asType().target(), t1.target().asType().target()); + } + + // Method Info + if (t.target().kind().equals(AnnotationTarget.Kind.METHOD) + && t1.target().kind().equals(AnnotationTarget.Kind.METHOD)) { + return methodInfoComparator.compare(t.target().asMethod(), t1.target().asMethod()); + } + + // Method Parameter + if (t.target().kind().equals(AnnotationTarget.Kind.METHOD_PARAMETER) + && t1.target().kind().equals(AnnotationTarget.Kind.METHOD_PARAMETER)) { + return methodParameterInfoComparator.compare(t.target().asMethodParameter(), + t1.target().asMethodParameter()); + } + + // Record + if (t.target().kind().equals(AnnotationTarget.Kind.RECORD_COMPONENT) + && t1.target().kind().equals(AnnotationTarget.Kind.RECORD_COMPONENT)) { + return recordComponentInfoComparator.compare(t.target().asRecordComponent(), + t1.target().asRecordComponent()); + } + } + return -1; + } + }; + + private Collection overrideCollection(Collection originalCollection, Collection overrideCollection, + Comparator comparator) { + if (originalCollection == null && overrideCollection == null) { + return null; + } + + if (originalCollection == null) { + return overrideCollection; + } + if (overrideCollection == null) { + return originalCollection; + } + + if (originalCollection.isEmpty() && overrideCollection.isEmpty()) { + return originalCollection; + } + + if (originalCollection.isEmpty()) { + return overrideCollection; + } + if (overrideCollection.isEmpty()) { + return originalCollection; + } + + Set newCollection = new TreeSet<>(comparator); + newCollection.addAll(overrideCollection); + newCollection.addAll(originalCollection); // Won't add if it's already there. + return newCollection; + } + + private T overrideObject(T originalObject, T overrideObject) { + if (overrideObject != null) { + return overrideObject; + } + return originalObject; + } +} diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLIndexBuildItem.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLIndexBuildItem.java new file mode 100644 index 00000000000000..c6c3c0e3bea1d2 --- /dev/null +++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLIndexBuildItem.java @@ -0,0 +1,18 @@ +package io.quarkus.smallrye.graphql.deployment; + +import java.util.Map; + +import io.quarkus.builder.item.SimpleBuildItem; + +final class SmallRyeGraphQLIndexBuildItem extends SimpleBuildItem { + + private final Map modifiedClases; + + public SmallRyeGraphQLIndexBuildItem(Map modifiedClases) { + this.modifiedClases = modifiedClases; + } + + public Map getModifiedClases() { + return modifiedClases; + } +} diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java index 52ac9f9278bfc4..22de82bc20aad3 100644 --- a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java +++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java @@ -1,9 +1,11 @@ package io.quarkus.smallrye.graphql.deployment; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -13,7 +15,7 @@ import java.util.stream.Stream; import org.eclipse.microprofile.config.ConfigProvider; -import org.jboss.jandex.IndexView; +import org.jboss.jandex.Indexer; import org.jboss.logging.Logger; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; @@ -38,6 +40,7 @@ import io.quarkus.deployment.builditem.LiveReloadBuildItem; import io.quarkus.deployment.builditem.ShutdownContextBuildItem; import io.quarkus.deployment.builditem.SystemPropertyBuildItem; +import io.quarkus.deployment.builditem.TransformedClassesBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem; @@ -158,6 +161,22 @@ void registerNativeImageResources(BuildProducer servic .produce(ServiceProviderBuildItem.allProvidersFromClassPath(SmallRyeGraphQLConfigMapping.class.getName())); } + @BuildStep + SmallRyeGraphQLIndexBuildItem createIndex(TransformedClassesBuildItem transformedClassesBuildItem) { + Map modifiedClasses = new HashMap<>(); + Map> transformedClassesByJar = transformedClassesBuildItem + .getTransformedClassesByJar(); + for (Map.Entry> transformedClassesByJarEntrySet : transformedClassesByJar + .entrySet()) { + + Set transformedClasses = transformedClassesByJarEntrySet.getValue(); + for (TransformedClassesBuildItem.TransformedClass transformedClass : transformedClasses) { + modifiedClasses.put(transformedClass.getClassName(), transformedClass.getData()); + } + } + return new SmallRyeGraphQLIndexBuildItem(modifiedClasses); + } + @Record(ExecutionTime.STATIC_INIT) @BuildStep void buildExecutionService( @@ -165,13 +184,25 @@ void buildExecutionService( BuildProducer reflectiveHierarchyProducer, BuildProducer graphQLInitializedProducer, SmallRyeGraphQLRecorder recorder, + SmallRyeGraphQLIndexBuildItem graphQLIndexBuildItem, BeanContainerBuildItem beanContainer, CombinedIndexBuildItem combinedIndex, SmallRyeGraphQLConfig graphQLConfig) { - IndexView index = combinedIndex.getIndex(); + Indexer indexer = new Indexer(); + Map modifiedClases = graphQLIndexBuildItem.getModifiedClases(); + + for (Map.Entry kv : modifiedClases.entrySet()) { + try (ByteArrayInputStream bais = new ByteArrayInputStream(kv.getValue())) { + indexer.index(bais); + } catch (IOException ex) { + LOG.warn("Could not index [" + kv.getKey() + "] - " + ex.getMessage()); + } + } + + OverridableIndex overridableIndex = OverridableIndex.create(combinedIndex.getIndex(), indexer.complete()); - Schema schema = SchemaBuilder.build(index, graphQLConfig.autoNameStrategy); + Schema schema = SchemaBuilder.build(overridableIndex, graphQLConfig.autoNameStrategy); RuntimeValue initialized = recorder.createExecutionService(beanContainer.getValue(), schema); graphQLInitializedProducer.produce(new SmallRyeGraphQLInitializedBuildItem(initialized)); diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java index 5976f6ffed18df..8b25292acd725d 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java @@ -1,5 +1,8 @@ package io.quarkus.smallrye.graphql.deployment; +import static io.quarkus.smallrye.graphql.deployment.AbstractGraphQLTest.MEDIATYPE_JSON; + +import org.hamcrest.CoreMatchers; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; @@ -9,6 +12,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.test.QuarkusDevModeTest; +import io.restassured.RestAssured; /** * Test Hot reload after a code change @@ -25,6 +29,79 @@ public class HotReloadTest extends AbstractGraphQLTest { .addAsResource(new StringAsset(getPropertyAsString()), "application.properties") .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")); + @Test + public void testAddAndRemoveFieldChange() { + + String fooRequest = getPayload("{\n" + + " foo {\n" + + " message\n" + + " randomNumber{\n" + + " value\n" + + " }\n" + + " foo\n" + + " list\n" + + " }\n" + + "}"); + + // Do a request + RestAssured.given().when() + .accept(MEDIATYPE_JSON) + .contentType(MEDIATYPE_JSON) + .body(fooRequest) + .post("/graphql") + .then() + .assertThat() + .statusCode(200) + .and() + .body(CoreMatchers.containsString( + "{\"errors\":[{\"message\":\"Validation error of type FieldUndefined: Field 'foo' in type 'TestPojo' is undefined @ 'foo/foo'\",\"locations\":[{\"line\":7,\"column\":5}],\"extensions\":{\"classification\":\"ValidationError\"}}],\"data\":null}")); + LOG.info("Initial request done"); + + // Make a code change (add a field) + TEST.modifySourceFile("TestPojo.java", s -> s.replace("// ", + "private String foo = \"bar\";\n" + + " public String getFoo(){\n" + + " return foo;\n" + + " }")); + LOG.info("Code change done - field added"); + + // Do the request again + RestAssured.given().when() + .accept(MEDIATYPE_JSON) + .contentType(MEDIATYPE_JSON) + .body(fooRequest) + .post("/graphql") + .then() + .assertThat() + .statusCode(200) + .and() + .body(CoreMatchers.containsString( + "{\"data\":{\"foo\":{\"message\":\"bar\",\"randomNumber\":{\"value\":123.0},\"foo\":\"bar\",\"list\":[\"a\",\"b\",\"c\"]}}}")); + LOG.info("Hot reload done"); + + // Make a code change again (remove) + TEST.modifySourceFile("TestPojo.java", s -> s.replace("private String foo = \"bar\";\n" + + " public String getFoo(){\n" + + " return foo;\n" + + " }", "// ")); + + // Do the request yet again + RestAssured.given().when() + .accept(MEDIATYPE_JSON) + .contentType(MEDIATYPE_JSON) + .body(fooRequest) + .post("/graphql") + .then() + .assertThat() + .statusCode(200) + .and() + .body(CoreMatchers.containsString( + "{\"errors\":[{\"message\":\"Validation error of type FieldUndefined: Field 'foo' in type 'TestPojo' is undefined @ 'foo/foo'\",\"locations\":[{\"line\":7,\"column\":5}],\"extensions\":{\"classification\":\"ValidationError\"}}],\"data\":null}")); + + LOG.info("Code change done - field removed"); + + } + @Test public void testCodeChange() { // Do a request diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestPojo.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestPojo.java index 65ff1aea165485..ad707a3149bfd6 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestPojo.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestPojo.java @@ -45,6 +45,8 @@ public void setNumber(Number number) { this.number = number; } + // + @Override public String toString() { return "TestPojo{" + "message=" + message + ", list=" + list + ", number=" + number + '}'; diff --git a/integration-tests/hibernate-orm-graphql-panache/pom.xml b/integration-tests/hibernate-orm-graphql-panache/pom.xml new file mode 100644 index 00000000000000..983efc7595d192 --- /dev/null +++ b/integration-tests/hibernate-orm-graphql-panache/pom.xml @@ -0,0 +1,122 @@ + + + 4.0.0 + + quarkus-integration-tests-parent + io.quarkus + 999-SNAPSHOT + + + quarkus-integration-test-hibernate-orm-graphql-panache + Quarkus - Integration Tests - GraphQL and Hibernate ORM with Panache + + + + io.quarkus + quarkus-smallrye-graphql + + + io.quarkus + quarkus-jdbc-h2 + + + io.quarkus + quarkus-hibernate-orm-panache + + + io.quarkus + quarkus-hibernate-validator + + + io.quarkus + quarkus-junit5 + test + + + io.quarkus + quarkus-test-h2 + test + + + org.assertj + assertj-core + test + + + io.rest-assured + rest-assured + test + + + + + io.quarkus + quarkus-hibernate-orm-panache-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-smallrye-graphql-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-jdbc-h2-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-hibernate-validator-deployment + ${project.version} + pom + test + + + * + * + + + + + + + + + io.quarkus + quarkus-maven-plugin + + + + build + + + + + + + + \ No newline at end of file diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Author.java b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Author.java new file mode 100644 index 00000000000000..952f7062fd7c5e --- /dev/null +++ b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Author.java @@ -0,0 +1,14 @@ +package io.quarkus.it.hibertnate.orm.graphql.panache; + +import java.time.LocalDate; + +import javax.persistence.Entity; + +import io.quarkus.hibernate.orm.panache.PanacheEntity; + +@Entity +public class Author extends PanacheEntity { + + public String name; + public LocalDate dob; +} diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Book.java b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Book.java new file mode 100644 index 00000000000000..1a636496400c1c --- /dev/null +++ b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Book.java @@ -0,0 +1,41 @@ +package io.quarkus.it.hibertnate.orm.graphql.panache; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.validation.constraints.NotBlank; + +@Entity +public class Book { + + @Id + @GeneratedValue + private Long id; + + @NotBlank + private String title; + + @ManyToOne + private Author author; + + public Long getId() { + return id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Author getAuthor() { + return author; + } + + public void setAuthor(Author author) { + this.author = author; + } +} diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/BookRepository.java b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/BookRepository.java new file mode 100644 index 00000000000000..35052b9b0976ae --- /dev/null +++ b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/BookRepository.java @@ -0,0 +1,9 @@ +package io.quarkus.it.hibertnate.orm.graphql.panache; + +import javax.enterprise.context.ApplicationScoped; + +import io.quarkus.hibernate.orm.panache.PanacheRepository; + +@ApplicationScoped +public class BookRepository implements PanacheRepository { +} diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/GraphQLResource.java b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/GraphQLResource.java new file mode 100644 index 00000000000000..a3e8b1d1a1e314 --- /dev/null +++ b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/GraphQLResource.java @@ -0,0 +1,32 @@ +package io.quarkus.it.hibertnate.orm.graphql.panache; + +import java.util.List; + +import javax.inject.Inject; + +import org.eclipse.microprofile.graphql.Description; +import org.eclipse.microprofile.graphql.GraphQLApi; +import org.eclipse.microprofile.graphql.Query; + +import io.quarkus.logging.Log; + +@GraphQLApi +public class GraphQLResource { + + @Inject + BookRepository bookRepository; + + @Query("authors") + @Description("Retrieve the stored authors") + public List getAuthors() { + Log.info("Getting all authors"); + return Author.listAll(); + } + + @Query("books") + @Description("Retrieve the stored books") + public List getBooks() { + Log.info("Getting all books"); + return bookRepository.listAll(); + } +} diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/resources/application.properties b/integration-tests/hibernate-orm-graphql-panache/src/main/resources/application.properties new file mode 100644 index 00000000000000..bbcff456cb710f --- /dev/null +++ b/integration-tests/hibernate-orm-graphql-panache/src/main/resources/application.properties @@ -0,0 +1,9 @@ +quarkus.datasource.db-kind=h2 +quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test +quarkus.datasource.jdbc.max-size=8 +quarkus.hibernate-orm.database.generation=drop-and-create +#quarkus.hibernate-orm.log.sql=true +quarkus.hibernate-orm.sql-load-script=import.sql + +quarkus.default-locale=en_US +quarkus.locales=en_US \ No newline at end of file diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/resources/import.sql b/integration-tests/hibernate-orm-graphql-panache/src/main/resources/import.sql new file mode 100644 index 00000000000000..91854e2f738d88 --- /dev/null +++ b/integration-tests/hibernate-orm-graphql-panache/src/main/resources/import.sql @@ -0,0 +1,6 @@ +insert into author(id, name, dob) values (nextval('hibernate_sequence'), 'Fyodor Dostoevsky', '1821-11-11'); + +insert into book(id, title, author_id) values (nextval('hibernate_sequence'), 'Crime and Punishment', 1); +insert into book(id, title, author_id) values (nextval('hibernate_sequence'), 'Idiot', 1); +insert into book(id, title, author_id) values (nextval('hibernate_sequence'), 'Demons', 1); +insert into book(id, title, author_id) values (nextval('hibernate_sequence'), 'The adolescent', 1); diff --git a/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheIT.java b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheIT.java new file mode 100644 index 00000000000000..f9ac8e27659c9f --- /dev/null +++ b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheIT.java @@ -0,0 +1,7 @@ +package io.quarkus.it.hibertnate.orm.graphql.panache; + +import io.quarkus.test.junit.NativeImageTest; + +@NativeImageTest +class HibernateOrmGraphQLPanacheIT extends HibernateOrmGraphQLPanacheTest { +} diff --git a/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheTest.java b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheTest.java new file mode 100644 index 00000000000000..2f9224fdf81cae --- /dev/null +++ b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheTest.java @@ -0,0 +1,69 @@ +package io.quarkus.it.hibertnate.orm.graphql.panache; + +import static io.restassured.RestAssured.given; +import static org.hamcrest.Matchers.contains; + +import org.junit.jupiter.api.Test; + +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest +class HibernateOrmGraphQLPanacheTest { + + private static final int DOSTOEVSKY_ID = 1; + + private static final String DOSTOEVSKY_NAME = "Fyodor Dostoevsky"; + + private static final String DOSTOEVSKY_DOB = "1821-11-11"; + + private static final int CRIME_AND_PUNISHMENT_ID = 2; + + private static final String CRIME_AND_PUNISHMENT_TITLE = "Crime and Punishment"; + + private static final int IDIOT_ID = 3; + + private static final String IDIOT_TITLE = "Idiot"; + + private static final int DEMONS_ID = 4; + + private static final String DEMONS_TITLE = "Demons"; + + private static final int THE_ADOLESCENT_ID = 5; + + private static final String THE_ADOLESCENT_TITLE = "The adolescent"; + + @Test + void testEndpoint() { + + String bookAndAuthorRequest = PayloadCreator.getPayload("{\n" + + " authors {\n" + + " id\n" + + " name\n" + + " dob\n" + + " }\n" + + " books {\n" + + " id\n" + + " title\n" + + " author {\n" + + " name\n" + + " }\n" + + " }\n" + + "}"); + + given() + .when() + .accept("application/json") + .contentType("application/json") + .body(bookAndAuthorRequest) + .post("/graphql") + .then() + .statusCode(200) + .and().body("data.authors.id", contains(DOSTOEVSKY_ID)) + .and().body("data.authors.name", contains(DOSTOEVSKY_NAME)) + .and().body("data.authors.dob", contains(DOSTOEVSKY_DOB)) + .and().body("data.books.id", contains(CRIME_AND_PUNISHMENT_ID, IDIOT_ID, DEMONS_ID, THE_ADOLESCENT_ID)) + .and().body("data.books.title", + contains(CRIME_AND_PUNISHMENT_TITLE, IDIOT_TITLE, DEMONS_TITLE, THE_ADOLESCENT_TITLE)); + } + +} diff --git a/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/PayloadCreator.java b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/PayloadCreator.java new file mode 100644 index 00000000000000..47682edf351acd --- /dev/null +++ b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/PayloadCreator.java @@ -0,0 +1,31 @@ +package io.quarkus.it.hibertnate.orm.graphql.panache; + +import javax.json.Json; +import javax.json.JsonObject; + +public class PayloadCreator { + + private PayloadCreator() { + } + + public static String getPayload(String query) { + JsonObject jsonObject = createRequestBody(query); + return jsonObject.toString(); + } + + private static JsonObject createRequestBody(String graphQL) { + return createRequestBody(graphQL, null); + } + + private static JsonObject createRequestBody(String graphQL, JsonObject variables) { + // Create the request + if (variables == null || variables.isEmpty()) { + variables = Json.createObjectBuilder().build(); + } + return Json.createObjectBuilder().add(QUERY, graphQL).add(VARIABLES, variables).build(); + } + + public static final String MEDIATYPE_JSON = "application/json"; + private static final String QUERY = "query"; + private static final String VARIABLES = "variables"; +} diff --git a/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/TestResources.java b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/TestResources.java new file mode 100644 index 00000000000000..87980f0eb266dc --- /dev/null +++ b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/TestResources.java @@ -0,0 +1,8 @@ +package io.quarkus.it.hibertnate.orm.graphql.panache; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.h2.H2DatabaseTestResource; + +@QuarkusTestResource(H2DatabaseTestResource.class) +public class TestResources { +} diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index c7cadd1fe67ba0..e8c89c8a265275 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -153,6 +153,7 @@ jpa-oracle hibernate-orm-panache hibernate-orm-rest-data-panache + hibernate-orm-graphql-panache hibernate-orm-panache-kotlin hibernate-reactive-db2 hibernate-reactive-mysql From 61ef8d84a29fb774619fb2a2fb3193400bd6f0e7 Mon Sep 17 00:00:00 2001 From: Sergey Beryozkin Date: Mon, 6 Sep 2021 13:29:53 +0100 Subject: [PATCH 103/138] Mark oidc-client and oidc-client-filter as stable and update descriptions for all OIDC extensions --- .../main/asciidoc/images/dev-ui-oidc-card.png | Bin 11227 -> 13414 bytes .../images/dev-ui-oidc-keycloak-card.png | Bin 13497 -> 15714 bytes extensions/oidc-client-filter/runtime/pom.xml | 2 +- .../resources/META-INF/quarkus-extension.yaml | 2 +- .../runtime/pom.xml | 2 +- extensions/oidc-client/runtime/pom.xml | 2 +- .../resources/META-INF/quarkus-extension.yaml | 2 +- .../oidc-token-propagation/runtime/pom.xml | 2 +- extensions/oidc/runtime/pom.xml | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/src/main/asciidoc/images/dev-ui-oidc-card.png b/docs/src/main/asciidoc/images/dev-ui-oidc-card.png index 5bd40cab30bc6ce9f5d3d630c1379cd37a847e26..b972a88330a7b68842de81a4284836e8bb8795dc 100644 GIT binary patch literal 13414 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 literal 11227 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�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 znIA<&Q5lLH7Q}`quarkus-oidc-client-filter Quarkus - OpenID Connect Client Filter - Runtime - Use JAX-RS client filter to get and refresh the access tokens and set them as HTTP Authorization Bearer values + Use JAX-RS Client filter to get and refresh access tokens with OpenId Connect Client and send them as HTTP Authorization Bearer tokens io.quarkus diff --git a/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 6b87f37707e2cd..a88e19aebb088d 100644 --- a/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -11,6 +11,6 @@ metadata: guide: "https://quarkus.io/guides/security-openid-connect-client" categories: - "security" - status: "preview" + status: "stable" config: - "quarkus.oidc-client." diff --git a/extensions/oidc-client-reactive-filter/runtime/pom.xml b/extensions/oidc-client-reactive-filter/runtime/pom.xml index 31034ca04b9a7e..9fbb3bd9b2593c 100644 --- a/extensions/oidc-client-reactive-filter/runtime/pom.xml +++ b/extensions/oidc-client-reactive-filter/runtime/pom.xml @@ -12,7 +12,7 @@ quarkus-oidc-client-reactive-filter Quarkus - OpenID Connect Client Reactive Filter - Runtime - Use Reactive RestClient filter to get and refresh the access tokens and set them as HTTP Authorization Bearer values + Use Reactive RestClient filter to get and refresh access tokens with OpenId Connect Client and send them as HTTP Authorization Bearer tokens io.quarkus diff --git a/extensions/oidc-client/runtime/pom.xml b/extensions/oidc-client/runtime/pom.xml index e3825023299458..7becfd54a8a8d4 100644 --- a/extensions/oidc-client/runtime/pom.xml +++ b/extensions/oidc-client/runtime/pom.xml @@ -12,7 +12,7 @@ quarkus-oidc-client Quarkus - OpenID Connect Client - Runtime - Use OpenID Connect Client to get and refresh access tokens + Get and refresh access tokens from OpenID Connect providers io.quarkus diff --git a/extensions/oidc-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/oidc-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml index b3b4af7ed627e4..434ccf025932b2 100644 --- a/extensions/oidc-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/oidc-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -10,7 +10,7 @@ metadata: guide: "https://quarkus.io/guides/security-openid-connect-client" categories: - "security" - status: "preview" + status: "stable" config: - "quarkus.oidc-client." - "quarkus.oidc." diff --git a/extensions/oidc-token-propagation/runtime/pom.xml b/extensions/oidc-token-propagation/runtime/pom.xml index 1b9d5e48774f96..3f47c7e1982eac 100644 --- a/extensions/oidc-token-propagation/runtime/pom.xml +++ b/extensions/oidc-token-propagation/runtime/pom.xml @@ -12,7 +12,7 @@ quarkus-oidc-token-propagation Quarkus - OpenID Connect Token Propagation - Runtime - Use JAX-RS client filter to propagate the current access token as HTTP Authorization Bearer value + Use JAX-RS Client filter to propagate the incoming Bearer access token or token acquired from Authorization Code Flow as HTTP Authorization Bearer token io.quarkus diff --git a/extensions/oidc/runtime/pom.xml b/extensions/oidc/runtime/pom.xml index 162f0a5c95ea4e..d0d4cb9319de46 100644 --- a/extensions/oidc/runtime/pom.xml +++ b/extensions/oidc/runtime/pom.xml @@ -11,7 +11,7 @@ quarkus-oidc Quarkus - OpenID Connect Adapter - Runtime - Secure your applications with OpenID Connect Adapter + Verify Bearer access tokens and authenticate users with Authorization Code Flow io.quarkus From 05b4d363ade67cb76dd5d46760f8e32a5fa7192b Mon Sep 17 00:00:00 2001 From: Alexey Loubyansky Date: Thu, 2 Sep 2021 10:53:01 +0200 Subject: [PATCH 104/138] Experimental Maven goal to check for Quarkus platform and extension updates Co-authored-by: Guillaume Smet --- .../io/quarkus/maven/CheckForUpdatesMojo.java | 412 ++++++++++++++++++ .../io/quarkus/maven/CreateProjectMojo.java | 2 +- .../handlers/CreateProjectCommandHandler.java | 5 +- 3 files changed, 416 insertions(+), 3 deletions(-) create mode 100644 devtools/maven/src/main/java/io/quarkus/maven/CheckForUpdatesMojo.java diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CheckForUpdatesMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CheckForUpdatesMojo.java new file mode 100644 index 00000000000000..4fbf90c7fdc906 --- /dev/null +++ b/devtools/maven/src/main/java/io/quarkus/maven/CheckForUpdatesMojo.java @@ -0,0 +1,412 @@ +package io.quarkus.maven; + +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.StringWriter; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.apache.maven.model.Dependency; +import org.apache.maven.model.Plugin; +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.project.MavenProject; +import org.eclipse.aether.RepositorySystem; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; +import org.eclipse.aether.impl.RemoteRepositoryManager; +import org.eclipse.aether.repository.RemoteRepository; +import org.eclipse.aether.resolution.ArtifactRequest; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.resolution.ArtifactResult; + +import io.quarkus.bootstrap.BootstrapConstants; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.project.QuarkusProjectHelper; +import io.quarkus.maven.utilities.MojoUtils; +import io.quarkus.platform.tools.maven.MojoMessageWriter; +import io.quarkus.registry.ExtensionCatalogResolver; +import io.quarkus.registry.RegistryResolutionException; +import io.quarkus.registry.catalog.Extension; +import io.quarkus.registry.catalog.ExtensionCatalog; +import io.quarkus.registry.catalog.ExtensionOrigin; +import io.quarkus.registry.catalog.selection.ExtensionOrigins; +import io.quarkus.registry.catalog.selection.OriginCombination; +import io.quarkus.registry.catalog.selection.OriginPreference; +import io.quarkus.registry.catalog.selection.OriginSelector; +import io.quarkus.registry.util.PlatformArtifacts; + +/** + * NOTE: this mojo is experimental + */ +@Mojo(name = "check-for-updates", requiresProject = true) +public class CheckForUpdatesMojo extends AbstractMojo { + + @Parameter(defaultValue = "${project}") + protected MavenProject project; + + @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true, required = true) + private List repos; + + @Parameter(defaultValue = "${repositorySystemSession}", readonly = true) + private RepositorySystemSession repoSession; + + @Component + private RepositorySystem repoSystem; + + @Component + RemoteRepositoryManager remoteRepoManager; + + @SuppressWarnings("unchecked") + @Override + public void execute() throws MojoExecutionException, MojoFailureException { + + getLog().warn( + "This goal is experimental. Its name, parameters, output and implementation will be evolving without the promise of keeping backward compatibility"); + + if (project.getFile() == null) { + throw new MojoExecutionException("This goal requires a project"); + } + + if (!QuarkusProjectHelper.isRegistryClientEnabled()) { + throw new MojoExecutionException("This goal requires a Quarkus extension registry client to be enabled"); + } + + final Map previousExtensions = getDirectExtensionDependencies(); + if (previousExtensions.isEmpty()) { + getLog().info("The project does not appear to depend on any Quarkus extension directly"); + return; + } + + final MavenArtifactResolver mvn; + try { + mvn = MavenArtifactResolver.builder() + .setRepositorySystem(repoSystem) + .setRepositorySystemSession( + getLog().isDebugEnabled() ? repoSession : MojoUtils.muteTransferListener(repoSession)) + .setRemoteRepositories(repos) + .setRemoteRepositoryManager(remoteRepoManager) + .build(); + } catch (Exception e) { + throw new MojoExecutionException("Failed to initialize Maven artifact resolver", e); + } + final MojoMessageWriter log = new MojoMessageWriter(getLog()); + final ExtensionCatalogResolver catalogResolver; + try { + catalogResolver = QuarkusProjectHelper.getCatalogResolver(mvn, log); + } catch (RegistryResolutionException e) { + throw new MojoExecutionException("Failed to initialize Quarkus extension registry client", e); + } + + if (!catalogResolver.hasRegistries()) { + throw new MojoExecutionException("Configured Quarkus extension registries aren't available"); + } + + final ExtensionCatalog latestCatalog; + try { + latestCatalog = catalogResolver.resolveExtensionCatalog(); + } catch (RegistryResolutionException e) { + throw new MojoExecutionException( + "Failed to resolve the latest Quarkus extension catalog from the configured extension registries", e); + } + + final Map recommendedExtensionMap = new HashMap<>(latestCatalog.getExtensions().size()); + final Map> recommendedExtensionsByOrigin = new HashMap<>(); + for (Extension e : latestCatalog.getExtensions()) { + recommendedExtensionMap.put(e.getArtifact().getKey(), e); + for (ExtensionOrigin origin : e.getOrigins()) { + recommendedExtensionsByOrigin.computeIfAbsent(origin.getId(), k -> new ArrayList<>()) + .add(e.getArtifact().getKey()); + } + } + + final List notAvailableExtensions = new ArrayList<>(0); + final List recommendedExtensions = new ArrayList<>(previousExtensions.size()); + for (ArtifactKey key : previousExtensions.keySet()) { + final Extension e = recommendedExtensionMap.get(key); + if (e == null) { + notAvailableExtensions.add(e); + } else { + recommendedExtensions.add(e); + } + } + + if (!notAvailableExtensions.isEmpty()) { + final StringBuilder buf = new StringBuilder(); + buf.append( + "Could not find any information about the following extensions in the currently configured registries: "); + buf.append(notAvailableExtensions.get(0).getArtifact().getKey().toGacString()); + for (int i = 1; i < notAvailableExtensions.size(); ++i) { + buf.append(", ").append(notAvailableExtensions.get(i).getArtifact().getKey().toGacString()); + } + getLog().warn(buf.toString()); + return; + } + + final List recommendedOrigins; + try { + recommendedOrigins = getRecommendedOrigins(latestCatalog, recommendedExtensions); + } catch (QuarkusCommandException e) { + getLog().warn(e.getLocalizedMessage()); + return; + } + + final List previousBomImports = new ArrayList<>(); + for (Dependency d : project.getDependencyManagement().getDependencies()) { + if (PlatformArtifacts.isCatalogArtifactId(d.getArtifactId())) { + final ArtifactCoords platformBomCoords = new ArtifactCoords(d.getGroupId(), + PlatformArtifacts.ensureBomArtifactId(d.getArtifactId()), "pom", d.getVersion()); + if (d.getArtifactId().startsWith("quarkus-universe-bom-")) { + // in pre-2.x quarkus versions, the quarkus-bom descriptor would show up as a parent of the quarkus-universe-bom one + // even if it was not actually imported, so here we simply remove it, if it was found + previousBomImports.remove(new ArtifactCoords(platformBomCoords.getGroupId(), "quarkus-bom", "pom", + platformBomCoords.getVersion())); + } + previousBomImports.add(platformBomCoords); + } + } + + final List recommendedBomImports = new ArrayList<>(); + final Map nonPlatformUpdates = new LinkedHashMap<>(0); + + for (ExtensionCatalog origin : recommendedOrigins) { + if (origin.isPlatform()) { + if (!previousBomImports.remove(origin.getBom())) { + recommendedBomImports.add(origin.getBom()); + } + for (ArtifactKey extKey : recommendedExtensionsByOrigin.getOrDefault(origin.getId(), Collections.emptyList())) { + previousExtensions.remove(extKey); + } + } else { + for (ArtifactKey extKey : recommendedExtensionsByOrigin.getOrDefault(origin.getId(), Collections.emptyList())) { + final Extension recommendedExt = recommendedExtensionMap.get(extKey); + final String prevVersion = previousExtensions.remove(extKey); + if (prevVersion != null && !prevVersion.equals(recommendedExt.getArtifact().getVersion())) { + nonPlatformUpdates.put(recommendedExt.getArtifact(), prevVersion); + } + } + } + } + + if (recommendedBomImports.isEmpty() && nonPlatformUpdates.isEmpty()) { + log.info("The project is up-to-date"); + return; + } + + ArtifactCoords prevPluginCoords = null; + for (Plugin p : project.getBuildPlugins()) { + if (p.getArtifactId().equals("quarkus-maven-plugin")) { + prevPluginCoords = new ArtifactCoords(p.getGroupId(), p.getArtifactId(), p.getVersion()); + break; + } + } + + ExtensionCatalog core = null; + for (ExtensionOrigin o : recommendedOrigins) { + if (o.isPlatform() && o.getBom().getArtifactId().equals("quarkus-bom")) { + core = (ExtensionCatalog) o; + } + } + + ArtifactCoords recommendedPluginCoords = null; + if (core != null) { + final Map props = (Map) ((Map) core.getMetadata().getOrDefault("project", + Collections.emptyMap())).getOrDefault("properties", Collections.emptyMap()); + final String pluginGroupId = (String) props.get("maven-plugin-groupId"); + final String pluginArtifactId = (String) props.get("maven-plugin-artifactId"); + final String pluginVersion = (String) props.get("maven-plugin-version"); + if (pluginGroupId == null || pluginArtifactId == null || pluginVersion == null) { + log.warn("Failed to locate the recommended Quarkus Maven plugin coordinates"); + } else { + recommendedPluginCoords = new ArtifactCoords(pluginGroupId, pluginArtifactId, pluginVersion); + } + } + + final StringWriter buf = new StringWriter(); + try (BufferedWriter writer = new BufferedWriter(buf)) { + + writer.append("Currently recommended updates for the application include:"); + writer.newLine(); + writer.newLine(); + + if (!previousBomImports.isEmpty()) { + writer.append(" * BOM imports to be replaced:"); + writer.newLine(); + writer.newLine(); + for (ArtifactCoords bom : previousBomImports) { + logBomImport(writer, bom); + } + writer.newLine(); + } + + if (!recommendedBomImports.isEmpty()) { + writer.append(" * New recommended BOM imports:"); + writer.newLine(); + writer.newLine(); + for (ArtifactCoords bom : recommendedBomImports) { + logBomImport(writer, bom); + } + writer.newLine(); + } + + if (!nonPlatformUpdates.isEmpty()) { + writer.append(" * New recommended extension versions (not managed by the BOMs):"); + writer.newLine(); + writer.newLine(); + + for (ArtifactCoords coords : nonPlatformUpdates.keySet()) { + writer.append(" "); + writer.newLine(); + writer.append(" ").append(coords.getGroupId()).append(""); + writer.newLine(); + writer.append(" ").append(coords.getArtifactId()).append(""); + writer.newLine(); + writer.append(" ").append(coords.getVersion()).append(""); + writer.newLine(); + writer.append(" "); + writer.newLine(); + } + writer.newLine(); + } + + if (prevPluginCoords != null && recommendedPluginCoords != null + && !prevPluginCoords.equals(recommendedPluginCoords)) { + writer.append(" * Recommended Quarkus Maven plugin:"); + writer.newLine(); + writer.newLine(); + writer.append(" "); + writer.newLine(); + writer.append(" ").append(recommendedPluginCoords.getGroupId()).append(""); + writer.newLine(); + writer.append(" ").append(recommendedPluginCoords.getArtifactId()).append(""); + writer.newLine(); + writer.append(" ").append(recommendedPluginCoords.getVersion()).append(""); + writer.newLine(); + writer.append(" "); + writer.newLine(); + + } + } catch (IOException e) { + throw new MojoExecutionException("Failed to compose the update report", e); + } + + getLog().info(buf.toString()); + } + + private void logBomImport(BufferedWriter writer, ArtifactCoords bom) throws IOException { + writer.append(" "); + writer.newLine(); + writer.append(" ").append(bom.getGroupId()).append(""); + writer.newLine(); + writer.append(" ").append(bom.getArtifactId()).append(""); + writer.newLine(); + writer.append(" ").append(bom.getVersion()).append(""); + writer.newLine(); + writer.append(" pom"); + writer.newLine(); + writer.append(" import"); + writer.newLine(); + writer.append(" "); + writer.newLine(); + } + + private Map getDirectExtensionDependencies() throws MojoExecutionException { + final List modelDeps = project.getModel().getDependencies(); + final List requests = new ArrayList<>(modelDeps.size()); + for (Dependency d : modelDeps) { + if ("jar".equals(d.getType())) { + requests.add(new ArtifactRequest().setArtifact( + new DefaultArtifact(d.getGroupId(), d.getArtifactId(), d.getClassifier(), d.getType(), d.getVersion())) + .setRepositories(repos)); + } + } + final List artifactResults; + try { + artifactResults = repoSystem.resolveArtifacts(repoSession, requests); + } catch (ArtifactResolutionException e) { + throw new MojoExecutionException("Failed to resolve project dependencies", e); + } + final Map extensions = new HashMap<>(artifactResults.size()); + for (ArtifactResult ar : artifactResults) { + final Artifact a = ar.getArtifact(); + if (isExtension(a.getFile().toPath())) { + extensions.put(new ArtifactKey(a.getGroupId(), a.getArtifactId(), a.getClassifier(), a.getExtension()), + a.getVersion()); + } + } + return extensions; + } + + private static boolean isExtension(Path p) throws MojoExecutionException { + if (!Files.exists(p)) { + throw new MojoExecutionException("Extension artifact " + p + " does not exist"); + } + if (Files.isDirectory(p)) { + return Files.exists(p.resolve(BootstrapConstants.DESCRIPTOR_PATH)); + } else { + try (FileSystem fs = FileSystems.newFileSystem(p, (ClassLoader) null)) { + return Files.exists(fs.getPath(BootstrapConstants.DESCRIPTOR_PATH)); + } catch (IOException e) { + throw new MojoExecutionException("Failed to read archive " + p, e); + } + } + } + + private static List getRecommendedOrigins(ExtensionCatalog extensionCatalog, List extensions) + throws QuarkusCommandException { + final List extOrigins = new ArrayList<>(extensions.size()); + for (Extension e : extensions) { + addOrigins(extOrigins, e); + } + final OriginSelector os = new OriginSelector(extOrigins); + os.calculateCompatibleCombinations(); + + final OriginCombination recommendedCombination = os.getRecommendedCombination(); + if (recommendedCombination == null) { + final StringBuilder buf = new StringBuilder(); + buf.append("Failed to determine a compatible Quarkus version for the requested extensions: "); + buf.append(extensions.get(0).getArtifact().getKey().toGacString()); + for (int i = 1; i < extensions.size(); ++i) { + buf.append(", ").append(extensions.get(i).getArtifact().getKey().toGacString()); + } + throw new QuarkusCommandException(buf.toString()); + } + return recommendedCombination.getUniqueSortedOrigins().stream().map(o -> o.getCatalog()).collect(Collectors.toList()); + } + + private static void addOrigins(final List extOrigins, Extension e) { + ExtensionOrigins.Builder eoBuilder = null; + for (ExtensionOrigin o : e.getOrigins()) { + if (!(o instanceof ExtensionCatalog)) { + continue; + } + final ExtensionCatalog c = (ExtensionCatalog) o; + final OriginPreference op = (OriginPreference) c.getMetadata().get("origin-preference"); + if (op == null) { + continue; + } + if (eoBuilder == null) { + eoBuilder = ExtensionOrigins.builder(e.getArtifact().getKey()); + } + eoBuilder.addOrigin(c, op); + } + if (eoBuilder != null) { + extOrigins.add(eoBuilder.build()); + } + } +} diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java index e5e6a77cd81171..12df08a031baa1 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java @@ -251,7 +251,7 @@ public void execute() throws MojoExecutionException { } } else if (containsAtLeastOneGradleFile) { throw new MojoExecutionException( - "You are trying to create maven project in a directory that contains only gradle build files."); + "You are trying to create a Maven project in a directory that contains only Gradle build files."); } } else if (BuildTool.GRADLE.equals(buildToolEnum) || BuildTool.GRADLE_KOTLIN_DSL.equals(buildToolEnum)) { if (containsAtLeastOneGradleFile) { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java index d33429cbfeb496..d06ba6177c47b8 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java @@ -189,7 +189,8 @@ private List computeRequiredExtensions(ExtensionCatalog catalog, return extensionsToAdd; } - private List getExtensionOrigins(ExtensionCatalog extensionCatalog, List extensionsToAdd) + private static List getExtensionOrigins(ExtensionCatalog extensionCatalog, + List extensionsToAdd) throws QuarkusCommandException { final List extOrigins = new ArrayList<>(extensionsToAdd.size()); @@ -227,7 +228,7 @@ private List getExtensionOrigins(ExtensionCatalog extensionCat return recommendedCombination.getUniqueSortedOrigins().stream().map(o -> o.getCatalog()).collect(Collectors.toList()); } - public void addOrigins(final List extOrigins, Extension e) { + private static void addOrigins(final List extOrigins, Extension e) { ExtensionOrigins.Builder eoBuilder = null; for (ExtensionOrigin o : e.getOrigins()) { if (!(o instanceof ExtensionCatalog)) { From 7c04caeae1c8c93ca00e9cea8b619ae05b68a6b5 Mon Sep 17 00:00:00 2001 From: Matej Novotny Date: Mon, 6 Sep 2021 15:50:52 +0200 Subject: [PATCH 105/138] Make TransactionSynchronizationRegistry producer @Unremovable once again --- .../io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java index 1a2fcc03bd25fe..85e4b99d2e17e2 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java @@ -14,6 +14,8 @@ import com.arjuna.ats.jbossatx.jta.RecoveryManagerService; import com.arjuna.ats.jta.UserTransaction; +import io.quarkus.arc.Unremovable; + @Dependent public class NarayanaJtaProducers { @@ -37,6 +39,7 @@ public XAResourceRecoveryRegistry xaResourceRecoveryRegistry() { @Produces @ApplicationScoped + @Unremovable public TransactionSynchronizationRegistry transactionSynchronizationRegistry() { return new TransactionSynchronizationRegistryImple(); } From 68be98e02d00ab7b5f10bb83fcff11abaa7cf4c0 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Mon, 6 Sep 2021 17:01:14 +0200 Subject: [PATCH 106/138] Fix build report archive name for Initial JDK 11 build --- .github/workflows/ci-actions-incremental.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml index 375315315fe8bd..2147f54e4daa76 100644 --- a/.github/workflows/ci-actions-incremental.yml +++ b/.github/workflows/ci-actions-incremental.yml @@ -178,7 +178,7 @@ jobs: uses: actions/upload-artifact@v2 if: ${{ failure() || cancelled() }} with: - name: "build-reports-JVM Tests - JDK ${{matrix.java.name}}" + name: "build-reports-Initial JDK 11 Build" path: | target/build-report.json retention-days: 2 From 370d94426dd560618465f4682c05f2c77a12b889 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Mon, 6 Sep 2021 17:04:34 +0200 Subject: [PATCH 107/138] CI - Always include a file at the root to get the full hierarchy The upload-artifact action takes the common ancestor as the root path of the archive which will lead to issues when we have only one file. Always uploading a file from the root of the repository should fix this. --- .github/workflows/ci-actions-incremental.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml index 2147f54e4daa76..c5011fc09bcec6 100644 --- a/.github/workflows/ci-actions-incremental.yml +++ b/.github/workflows/ci-actions-incremental.yml @@ -181,6 +181,7 @@ jobs: name: "build-reports-Initial JDK 11 Build" path: | target/build-report.json + LICENSE.txt retention-days: 2 calculate-test-jobs: @@ -322,6 +323,7 @@ jobs: path: | **/target/*-reports/TEST-*.xml target/build-report.json + LICENSE.txt retention-days: 2 - name: Upload gc.log uses: actions/upload-artifact@v2 @@ -388,6 +390,7 @@ jobs: path: | **/target/*-reports/TEST-*.xml target/build-report.json + LICENSE.txt retention-days: 2 gradle-tests: @@ -447,6 +450,7 @@ jobs: **/build/test-results/test/TEST-*.xml **/target/*-reports/TEST-*.xml target/build-report.json + LICENSE.txt retention-days: 2 devtools-tests: @@ -506,6 +510,7 @@ jobs: path: | **/target/*-reports/TEST-*.xml target/build-report.json + LICENSE.txt retention-days: 2 tcks-test: @@ -564,6 +569,7 @@ jobs: path: | **/target/*-reports/TEST-*.xml target/build-report.json + LICENSE.txt retention-days: 2 native-tests: @@ -643,4 +649,5 @@ jobs: **/target/*-reports/TEST-*.xml **/build/test-results/test/TEST-*.xml target/build-report.json + LICENSE.txt retention-days: 2 From a7f87e266f8f68028fd7b0c4d51e1d4038ba59a2 Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Fri, 3 Sep 2021 14:59:43 +0100 Subject: [PATCH 108/138] Override the Oracle JDBC automatic native-image metadata and re-implement it explicitly --- .../deployment/OracleMetadataOverrides.java | 99 +++++++++++++++++++ .../oracle/deployment/OracleReflections.java | 19 ---- .../oracle/deployment/RegexMatchTest.java | 45 +++++++++ .../src/main/resources/application.properties | 5 +- 4 files changed, 148 insertions(+), 20 deletions(-) create mode 100644 extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java create mode 100644 extensions/jdbc/jdbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/RegexMatchTest.java diff --git a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java new file mode 100644 index 00000000000000..a2d917a0d07c3b --- /dev/null +++ b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java @@ -0,0 +1,99 @@ +package io.quarkus.jdbc.oracle.deployment; + +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.nativeimage.ExcludeConfigBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; + +/** + * The Oracle JDBC driver includes a {@literal META-INF/native-image} which enables a set + * of global flags we need to control better, so to ensure such flags do not interfere + * with requirements of other libraries. + *

    + * For this reason, the {@literal META-INF/native-image/native-image.properties} resource + * is excluded explicitly; then we re-implement the equivalent directives using Quarkus + * build items. + *

    + * Other resources such as {@literal jni-config.json} and {@literal resource-config.json} + * are not excluded, so to ensure we match the recommendations from the Oracle JDBC + * engineering team and make it easier to pick up improvements in these when the driver + * gets updated. + *

    + * Regarding {@literal reflect-config.json}, we also prefer excluding it for the time + * being even though it's strictly not necessary: the reason is that the previous driver + * version had a build-breaking mistake; this was fixed in version 21.3 so should no + * longer be necessary, but the previous driver had been tested more widely and would + * require it, so this would facilitate the option to revert to the older version in + * case of problems. + */ +public final class OracleMetadataOverrides { + + static final String DRIVER_JAR_MATCH_REGEX = ".*com\\.oracle\\.database\\.jdbc.*"; + static final String NATIVE_IMAGE_RESOURCE_MATCH_REGEX = "/META-INF/native-image/(?:native-image\\.properties|reflect-config\\.json)"; + + /** + * Should match the contents of {@literal reflect-config.json} + * + * @param reflectiveClass builItem producer + */ + @BuildStep + void build(BuildProducer reflectiveClass) { + //This is to match the Oracle metadata (which we excluded so that we can apply fixes): + reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, "oracle.jdbc.internal.ACProxyable")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.jdbc.driver.T4CDriverExtension")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.jdbc.driver.T2CDriverExtension")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.jdbc.driver.ShardingDriverExtension")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.net.ano.Ano")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.net.ano.AuthenticationService")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.net.ano.DataIntegrityService")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.net.ano.EncryptionService")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.net.ano.SupervisorService")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.jdbc.driver.Message11")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, true, "oracle.sql.TypeDescriptor")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.sql.TypeDescriptorFactory")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.sql.AnyDataFactory")); + reflectiveClass + .produce(new ReflectiveClassBuildItem(true, false, false, "com.sun.rowset.providers.RIOptimisticProvider")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, "oracle.jdbc.logging.annotations.Supports")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, "oracle.jdbc.logging.annotations.Feature")); + } + + @BuildStep + void runtimeInitializeDriver(BuildProducer runtimeInitialized) { + //These re-implement all the "--initialize-at-build-time" arguments found in the native-image.properties : + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.OracleDriver")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.OracleDriver")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("java.sql.DriverManager")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.LogicalConnection")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.pool.OraclePooledConnection")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.pool.OracleDataSource")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.datasource.impl.OracleDataSource")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.pool.OracleOCIConnectionPool")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.OracleTimeoutThreadPerVM")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TimeoutInterruptHandler")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.HAManager")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.Clock")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TcpMultiplexer")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TcpMultiplexer")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TcpMultiplexer$LazyHolder")); + runtimeInitialized + .produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem( + "oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource$BlockReleaser")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.xa.client.OracleXADataSource")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.replay.OracleXADataSourceImpl")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.datasource.OracleXAConnection")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.xa.client.OracleXAConnection")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.xa.client.OracleXAHeteroConnection")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.T4CXAConnection")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.security.o5logon.O5Logon")); + } + + @BuildStep + ExcludeConfigBuildItem excludeOracleDirectives() { + // Excludes both native-image.properties and reflect-config.json, which are reimplemented above + return new ExcludeConfigBuildItem(DRIVER_JAR_MATCH_REGEX, NATIVE_IMAGE_RESOURCE_MATCH_REGEX); + } + +} diff --git a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleReflections.java b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleReflections.java index 53854430001ff2..118a24d4c1fddb 100644 --- a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleReflections.java +++ b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleReflections.java @@ -3,7 +3,6 @@ import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; /** * Registers the {@code oracle.jdbc.driver.OracleDriver} so that it can be loaded @@ -24,22 +23,4 @@ void build(BuildProducer reflectiveClass) { reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, driverName)); } - @BuildStep - void runtimeInitializeDriver(BuildProducer runtimeInitialized) { - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.OracleDriver")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.SQLUtil$XMLFactory")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.NamedTypeAccessor$XMLFactory")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.OracleTimeoutThreadPerVM")); - runtimeInitialized - .produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.T4CTTIoauthenticate")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TcpMultiplexer$LazyHolder")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.security.o5logon.O5Logon")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem( - "oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource$BlockReleaser")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TimeoutInterruptHandler")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.Clock")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.NoSupportHAManager")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.LogicalConnection")); - } } diff --git a/extensions/jdbc/jdbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/RegexMatchTest.java b/extensions/jdbc/jdbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/RegexMatchTest.java new file mode 100644 index 00000000000000..5a66b4d51b26ab --- /dev/null +++ b/extensions/jdbc/jdbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/RegexMatchTest.java @@ -0,0 +1,45 @@ +package io.quarkus.jdbc.oracle.deployment; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.junit.jupiter.api.Test; + +import io.smallrye.common.constraint.Assert; + +/** + * The metadata override facility of GraalVM's native-image + * works with regular expressions. + * We're testing our expressions here to match against the + * constants the compiler is expecting (inferred by debugging + * the compiler) as it's otherwise a bit tricky to assert + * if they have been applied. + */ +public class RegexMatchTest { + + @Test + public void jarRegexIsMatching() { + final String EXAMPLE_CLASSPATH = "/home/sanne/sources/quarkus/integration-tests/jpa-oracle/target/quarkus-integration-test-jpa-oracle-999-SNAPSHOT-native-image-source-jar/lib/com.oracle.database.jdbc.ojdbc11-21.3.0.0.jar"; + final Pattern pattern = Pattern.compile(OracleMetadataOverrides.DRIVER_JAR_MATCH_REGEX); + final Matcher matcher = pattern.matcher(EXAMPLE_CLASSPATH); + Assert.assertTrue(matcher.find()); + } + + @Test + public void resourceRegexIsMatching() { + //We need to exclude both of these: + final String RES1 = "/META-INF/native-image/native-image.properties"; + final String RES2 = "/META-INF/native-image/reflect-config.json"; + final Pattern pattern = Pattern.compile(OracleMetadataOverrides.NATIVE_IMAGE_RESOURCE_MATCH_REGEX); + + Assert.assertTrue(pattern.matcher(RES1).find()); + Assert.assertTrue(pattern.matcher(RES2).find()); + + //While this one should NOT be ignored: + final String RES3 = "/META-INF/native-image/resource-config.json"; + final String RES4 = "/META-INF/native-image/jni-config.json"; + Assert.assertFalse(pattern.matcher(RES3).find()); + Assert.assertFalse(pattern.matcher(RES4).find()); + } + +} diff --git a/integration-tests/jpa-oracle/src/main/resources/application.properties b/integration-tests/jpa-oracle/src/main/resources/application.properties index 7c08376aa4a756..9d2e3ec2d86dc3 100644 --- a/integration-tests/jpa-oracle/src/main/resources/application.properties +++ b/integration-tests/jpa-oracle/src/main/resources/application.properties @@ -4,4 +4,7 @@ quarkus.datasource.password=hibernate_orm_test quarkus.datasource.jdbc.url=${oracledb.url} quarkus.datasource.jdbc.max-size=1 quarkus.hibernate-orm.database.generation=drop-and-create -quarkus.datasource.jdbc.additional-jdbc-properties."oracle.jdbc.timezoneAsRegion"=false \ No newline at end of file +quarkus.datasource.jdbc.additional-jdbc-properties."oracle.jdbc.timezoneAsRegion"=false + +#Unfortunately, this is currently required when using the Oracle JDBC driver: +quarkus.native.additional-build-args=--allow-incomplete-classpath From 5fab70f27a5380ec85db3da373930445634d75a4 Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Mon, 6 Sep 2021 12:59:44 +0100 Subject: [PATCH 109/138] Introduce a build item to control flag --allow-incomplete-classpath of native-image --- ...IncompleteClasspathAggregateBuildItem.java | 21 ++++++++++ ...mageAllowIncompleteClasspathBuildItem.java | 32 ++++++++++++++++ .../pkg/steps/NativeImageBuildStep.java | 17 ++++++++- ...AllowIncompleteClasspathAggregateStep.java | 38 +++++++++++++++++++ .../deployment/OracleMetadataOverrides.java | 6 +++ .../src/main/resources/application.properties | 3 -- 6 files changed, 113 insertions(+), 4 deletions(-) create mode 100644 core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageAllowIncompleteClasspathAggregateBuildItem.java create mode 100644 core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageAllowIncompleteClasspathBuildItem.java create mode 100644 core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAllowIncompleteClasspathAggregateStep.java diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageAllowIncompleteClasspathAggregateBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageAllowIncompleteClasspathAggregateBuildItem.java new file mode 100644 index 00000000000000..147d85716e390a --- /dev/null +++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageAllowIncompleteClasspathAggregateBuildItem.java @@ -0,0 +1,21 @@ +package io.quarkus.deployment.builditem.nativeimage; + +import io.quarkus.builder.item.SimpleBuildItem; + +/** + * Do not use directly: use {@see io.quarkus.deployment.builditem.nativeimage.NativeImageAllowIncompleteClasspathBuildItem} + * instead. + */ +public final class NativeImageAllowIncompleteClasspathAggregateBuildItem extends SimpleBuildItem { + + private final boolean allow; + + public NativeImageAllowIncompleteClasspathAggregateBuildItem(boolean allow) { + this.allow = allow; + } + + public boolean isAllow() { + return allow; + } + +} diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageAllowIncompleteClasspathBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageAllowIncompleteClasspathBuildItem.java new file mode 100644 index 00000000000000..c0d6223607f54f --- /dev/null +++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageAllowIncompleteClasspathBuildItem.java @@ -0,0 +1,32 @@ +package io.quarkus.deployment.builditem.nativeimage; + +import io.quarkus.builder.item.MultiBuildItem; + +/** + * If any build item of this type is produced, the native-image build tool + * will run with {@literal --allow-incomplete-classpath} set. + *

    + * This should be strongly discouraged as it makes diagnostics of any issue + * much more complex, and we have it seen affect error message of code + * seemingly unrelated to the code which is having the broken classpath. + *

    + * Use of this build item will trigger a warning during build. + * + * @Deprecated Please don't use it unless there is general consensus that we can't practically find a better solution. + */ +@Deprecated +public final class NativeImageAllowIncompleteClasspathBuildItem extends MultiBuildItem { + + private final String extensionName; + + /** + * @param extensionName Name the extension requiring this, so that it can be shamed appropriately during build. + */ + public NativeImageAllowIncompleteClasspathBuildItem(String extensionName) { + this.extensionName = extensionName; + } + + public String getExtensionName() { + return extensionName; + } +} diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java index 2236dd642d26b0..75ba060b0e62c5 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java @@ -27,6 +27,7 @@ import io.quarkus.bootstrap.util.IoUtils; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.nativeimage.ExcludeConfigBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageAllowIncompleteClasspathAggregateBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageSecurityProviderBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem; import io.quarkus.deployment.pkg.NativeConfig; @@ -83,7 +84,8 @@ ArtifactResultBuildItem nativeSourcesResult(NativeConfig nativeConfig, OutputTargetBuildItem outputTargetBuildItem, PackageConfig packageConfig, List nativeImageProperties, - List excludeConfigs) { + List excludeConfigs, + NativeImageAllowIncompleteClasspathAggregateBuildItem incompleteClassPathAllowed) { Path outputDir; try { @@ -102,6 +104,7 @@ ArtifactResultBuildItem nativeSourcesResult(NativeConfig nativeConfig, .setNativeConfig(nativeConfig) .setOutputTargetBuildItem(outputTargetBuildItem) .setNativeImageProperties(nativeImageProperties) + .setBrokenClasspath(incompleteClassPathAllowed.isAllow()) .setExcludeConfigs(excludeConfigs) .setOutputDir(outputDir) .setRunnerJarName(runnerJar.getFileName().toString()) @@ -134,6 +137,7 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa CurateOutcomeBuildItem curateOutcomeBuildItem, List nativeImageProperties, List excludeConfigs, + NativeImageAllowIncompleteClasspathAggregateBuildItem incompleteClassPathAllowed, List nativeImageSecurityProviders, Optional processInheritIODisabled) { if (nativeConfig.debug.enabled) { @@ -192,6 +196,7 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa .setOutputTargetBuildItem(outputTargetBuildItem) .setNativeImageProperties(nativeImageProperties) .setExcludeConfigs(excludeConfigs) + .setBrokenClasspath(incompleteClassPathAllowed.isAllow()) .setNativeImageSecurityProviders(nativeImageSecurityProviders) .setOutputDir(outputDir) .setRunnerJarName(runnerJarName) @@ -490,6 +495,7 @@ static class Builder { private boolean isContainerBuild = false; private GraalVM.Version graalVMVersion = GraalVM.Version.UNVERSIONED; private String nativeImageName; + private boolean classpathIsBroken; public Builder setNativeConfig(NativeConfig nativeConfig) { this.nativeConfig = nativeConfig; @@ -506,6 +512,11 @@ public Builder setNativeImageProperties(List return this; } + public Builder setBrokenClasspath(boolean classpathIsBroken) { + this.classpathIsBroken = classpathIsBroken; + return this; + } + public Builder setExcludeConfigs(List excludeConfigs) { this.excludeConfigs = excludeConfigs; return this; @@ -604,6 +615,10 @@ public NativeImageInvokerInfo build() { nativeImageArgs.add("-H:FallbackThreshold=0"); } + if (classpathIsBroken) { + nativeImageArgs.add("--allow-incomplete-classpath"); + } + if (nativeConfig.reportErrorsAtRuntime) { nativeImageArgs.add("-H:+ReportUnsupportedElementsAtRuntime"); } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAllowIncompleteClasspathAggregateStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAllowIncompleteClasspathAggregateStep.java new file mode 100644 index 00000000000000..d30507eaad93a0 --- /dev/null +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAllowIncompleteClasspathAggregateStep.java @@ -0,0 +1,38 @@ +package io.quarkus.deployment.steps; + +import java.util.List; +import java.util.stream.Collectors; + +import org.jboss.logging.Logger; + +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.nativeimage.NativeImageAllowIncompleteClasspathAggregateBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageAllowIncompleteClasspathBuildItem; + +@SuppressWarnings("deprecation") +public final class NativeImageAllowIncompleteClasspathAggregateStep { + + private static final Logger log = Logger.getLogger(NativeImageAllowIncompleteClasspathAggregateStep.class); + + @BuildStep + NativeImageAllowIncompleteClasspathAggregateBuildItem aggregateIndividualItems( + List list) { + if (list.isEmpty()) { + return new NativeImageAllowIncompleteClasspathAggregateBuildItem(false); + } else { + final String extensionsRequiringBrokenClasspath = list.stream() + .map(NativeImageAllowIncompleteClasspathBuildItem::getExtensionName) + .collect(Collectors.joining(",")); + log.warn("The following extensions have required the '--allow-incomplete-classpath' flag to be set: {" + + extensionsRequiringBrokenClasspath + + "}. This is a global flag which might have unexpected effects on other extensions as well, and is a hint of the library " + + + "needing some additional refactoring to better support GraalVM native-image. In the case of 3rd party dependencies and/or" + + + " proprietary code there is not much we can do - please ask for support to your library vendor." + + " If you incur in any problem with other Quarkus extensions, please try reproducing the problem without these extensions first."); + return new NativeImageAllowIncompleteClasspathAggregateBuildItem(true); + } + } + +} diff --git a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java index a2d917a0d07c3b..3970870f72b534 100644 --- a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java +++ b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java @@ -3,6 +3,7 @@ import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.nativeimage.ExcludeConfigBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageAllowIncompleteClasspathBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; @@ -96,4 +97,9 @@ ExcludeConfigBuildItem excludeOracleDirectives() { return new ExcludeConfigBuildItem(DRIVER_JAR_MATCH_REGEX, NATIVE_IMAGE_RESOURCE_MATCH_REGEX); } + @BuildStep + NativeImageAllowIncompleteClasspathBuildItem naughtyDriver() { + return new NativeImageAllowIncompleteClasspathBuildItem("quarkus-jdbc-oracle"); + } + } diff --git a/integration-tests/jpa-oracle/src/main/resources/application.properties b/integration-tests/jpa-oracle/src/main/resources/application.properties index 9d2e3ec2d86dc3..0abd503fde3ec0 100644 --- a/integration-tests/jpa-oracle/src/main/resources/application.properties +++ b/integration-tests/jpa-oracle/src/main/resources/application.properties @@ -5,6 +5,3 @@ quarkus.datasource.jdbc.url=${oracledb.url} quarkus.datasource.jdbc.max-size=1 quarkus.hibernate-orm.database.generation=drop-and-create quarkus.datasource.jdbc.additional-jdbc-properties."oracle.jdbc.timezoneAsRegion"=false - -#Unfortunately, this is currently required when using the Oracle JDBC driver: -quarkus.native.additional-build-args=--allow-incomplete-classpath From ab82e7ae303c15908f54616ad87f61da7457edc6 Mon Sep 17 00:00:00 2001 From: Geoffrey GREBERT Date: Mon, 6 Sep 2021 17:23:12 +0200 Subject: [PATCH 110/138] add mailer-deployment to bom --- bom/application/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index adb765635e09ba..086acd38e252df 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -1620,6 +1620,11 @@ quarkus-mailer ${project.version} + + io.quarkus + quarkus-mailer-deployment + ${project.version} + io.quarkus quarkus-mongodb-client From 3504a54217e64a482b88c1345106a01a86b9f005 Mon Sep 17 00:00:00 2001 From: Roberto Cortez Date: Mon, 6 Sep 2021 15:51:15 +0100 Subject: [PATCH 111/138] Revert "Register @ConfigMappings directly into the Config builder" This reverts commit fd4b3028 --- .../configuration/ConfigMappingUtils.java | 150 ------------------ .../RunTimeConfigurationGenerator.java | 27 ---- .../steps/ConfigGenerationBuildStep.java | 15 +- .../runtime/configuration/ConfigUtils.java | 9 -- .../arc/deployment/ConfigBuildStep.java | 139 +++++++++++++++- .../arc/deployment}/ConfigClassBuildItem.java | 4 +- .../HibernateValidatorProcessor.java | 2 +- .../config/ConfigurableExceptionMapper.java | 10 +- .../it/smallrye/config/ExceptionConfig.java | 8 - 9 files changed, 139 insertions(+), 225 deletions(-) delete mode 100644 core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigMappingUtils.java rename {core/deployment/src/main/java/io/quarkus/deployment/builditem => extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment}/ConfigClassBuildItem.java (94%) delete mode 100644 integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ExceptionConfig.java diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigMappingUtils.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigMappingUtils.java deleted file mode 100644 index 2cbe8dc5f73405..00000000000000 --- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigMappingUtils.java +++ /dev/null @@ -1,150 +0,0 @@ -package io.quarkus.deployment.configuration; - -import static io.quarkus.deployment.builditem.ConfigClassBuildItem.Type.MAPPING; -import static io.quarkus.deployment.builditem.ConfigClassBuildItem.Type.PROPERTIES; -import static java.util.Collections.emptySet; -import static org.eclipse.microprofile.config.inject.ConfigProperties.UNCONFIGURED_PREFIX; -import static org.jboss.jandex.AnnotationTarget.Kind.CLASS; -import static org.jboss.jandex.AnnotationTarget.Kind.FIELD; -import static org.jboss.jandex.AnnotationTarget.Kind.METHOD_PARAMETER; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Optional; -import java.util.Set; - -import org.jboss.jandex.AnnotationInstance; -import org.jboss.jandex.AnnotationTarget; -import org.jboss.jandex.AnnotationValue; -import org.jboss.jandex.ClassInfo; -import org.jboss.jandex.ClassType; -import org.jboss.jandex.DotName; -import org.jboss.jandex.MethodInfo; - -import io.quarkus.deployment.annotations.BuildProducer; -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.ConfigClassBuildItem; -import io.quarkus.deployment.builditem.GeneratedClassBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.smallrye.config.ConfigMapping; -import io.smallrye.config.ConfigMappingLoader; -import io.smallrye.config.ConfigMappingMetadata; - -public class ConfigMappingUtils { - public static final DotName CONFIG_MAPPING_NAME = DotName.createSimple(ConfigMapping.class.getName()); - - private ConfigMappingUtils() { - } - - @BuildStep - public static void generateConfigClasses( - CombinedIndexBuildItem combinedIndex, - BuildProducer generatedClasses, - BuildProducer reflectiveClasses, - BuildProducer configClasses, - DotName configAnnotation) { - - for (AnnotationInstance instance : combinedIndex.getIndex().getAnnotations(configAnnotation)) { - AnnotationTarget target = instance.target(); - AnnotationValue annotationPrefix = instance.value("prefix"); - - if (target.kind().equals(FIELD)) { - if (annotationPrefix != null && !annotationPrefix.asString().equals(UNCONFIGURED_PREFIX)) { - configClasses.produce( - toConfigClassBuildItem(instance, toClass(target.asField().type().name()), - annotationPrefix.asString())); - continue; - } - } - - if (target.kind().equals(METHOD_PARAMETER)) { - if (annotationPrefix != null && !annotationPrefix.asString().equals(UNCONFIGURED_PREFIX)) { - ClassType classType = target.asMethodParameter().method().parameters() - .get(target.asMethodParameter().position()).asClassType(); - configClasses - .produce(toConfigClassBuildItem(instance, toClass(classType.name()), annotationPrefix.asString())); - continue; - } - } - - if (!target.kind().equals(CLASS)) { - continue; - } - - Class configClass = toClass(target.asClass().name()); - String prefix = Optional.ofNullable(annotationPrefix).map(AnnotationValue::asString).orElse(""); - - List configMappingsMetadata = ConfigMappingLoader.getConfigMappingsMetadata(configClass); - Set generatedClassesNames = new HashSet<>(); - Set mappingsInfo = new HashSet<>(); - configMappingsMetadata.forEach(mappingMetadata -> { - generatedClasses.produce( - new GeneratedClassBuildItem(true, mappingMetadata.getClassName(), mappingMetadata.getClassBytes())); - reflectiveClasses - .produce(ReflectiveClassBuildItem.builder(mappingMetadata.getInterfaceType()).methods(true).build()); - reflectiveClasses - .produce(ReflectiveClassBuildItem.builder(mappingMetadata.getClassName()).constructors(true).build()); - - for (Class parent : getHierarchy(mappingMetadata.getInterfaceType())) { - reflectiveClasses.produce(ReflectiveClassBuildItem.builder(parent).methods(true).build()); - } - - generatedClassesNames.add(mappingMetadata.getClassName()); - - ClassInfo mappingInfo = combinedIndex.getIndex() - .getClassByName(DotName.createSimple(mappingMetadata.getInterfaceType().getName())); - if (mappingInfo != null) { - mappingsInfo.add(mappingInfo); - } - }); - - // For implicit converters - for (ClassInfo classInfo : mappingsInfo) { - for (MethodInfo method : classInfo.methods()) { - reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, method.returnType().name().toString())); - } - } - - configClasses.produce(toConfigClassBuildItem(instance, configClass, generatedClassesNames, prefix)); - } - } - - private static Class toClass(DotName dotName) { - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - try { - return classLoader.loadClass(dotName.toString()); - } catch (ClassNotFoundException e) { - throw new IllegalStateException("The class (" + dotName.toString() + ") cannot be created during deployment.", e); - } - } - - private static ConfigClassBuildItem toConfigClassBuildItem( - AnnotationInstance instance, - Class configClass, - String prefix) { - return toConfigClassBuildItem(instance, configClass, emptySet(), prefix); - } - - private static ConfigClassBuildItem toConfigClassBuildItem( - AnnotationInstance instance, - Class configClass, - Set generatedClasses, - String prefix) { - if (instance.name().equals(CONFIG_MAPPING_NAME)) { - return new ConfigClassBuildItem(configClass, generatedClasses, prefix, MAPPING); - } else { - return new ConfigClassBuildItem(configClass, generatedClasses, prefix, PROPERTIES); - } - } - - private static List> getHierarchy(Class mapping) { - List> interfaces = new ArrayList<>(); - for (Class i : mapping.getInterfaces()) { - interfaces.add(i); - interfaces.addAll(getHierarchy(i)); - } - return interfaces; - } -} diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java index 377bac70e18c28..ee5ebd04d064db 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java @@ -70,7 +70,6 @@ import io.quarkus.runtime.configuration.RuntimeConfigSource; import io.quarkus.runtime.configuration.RuntimeConfigSourceFactory; import io.quarkus.runtime.configuration.RuntimeConfigSourceProvider; -import io.smallrye.config.ConfigMappings.ConfigClassWithPrefix; import io.smallrye.config.Converters; import io.smallrye.config.PropertiesConfigSource; import io.smallrye.config.SmallRyeConfig; @@ -175,8 +174,6 @@ public final class RunTimeConfigurationGenerator { static final MethodDescriptor CU_ADD_SOURCE_FACTORY_PROVIDER = MethodDescriptor.ofMethod(ConfigUtils.class, "addSourceFactoryProvider", void.class, SmallRyeConfigBuilder.class, ConfigSourceFactoryProvider.class); - static final MethodDescriptor CU_WITH_MAPPING = MethodDescriptor.ofMethod(ConfigUtils.class, "addMapping", - void.class, SmallRyeConfigBuilder.class, String.class, String.class); static final MethodDescriptor RCS_NEW = MethodDescriptor.ofConstructor(RuntimeConfigSource.class, String.class); static final MethodDescriptor RCSP_NEW = MethodDescriptor.ofConstructor(RuntimeConfigSourceProvider.class, String.class); @@ -301,7 +298,6 @@ public static final class GenerateOperation implements AutoCloseable { final Set runtimeConfigSources; final Set runtimeConfigSourceProviders; final Set runtimeConfigSourceFactories; - final Set configMappings; /** * Regular converters organized by type. Each converter is stored in a separate field. Some are used * only at build time, some only at run time, and some at both times. @@ -339,7 +335,6 @@ public static final class GenerateOperation implements AutoCloseable { runtimeConfigSources = builder.getRuntimeConfigSources(); runtimeConfigSourceProviders = builder.getRuntimeConfigSourceProviders(); runtimeConfigSourceFactories = builder.getRuntimeConfigSourceFactories(); - configMappings = builder.getConfigMappings(); cc = ClassCreator.builder().classOutput(classOutput).className(CONFIG_CLASS_NAME).setFinal(true).build(); generateEmptyParsers(cc); // not instantiable @@ -428,11 +423,6 @@ public static final class GenerateOperation implements AutoCloseable { clinit.invokeStaticMethod(CU_ADD_SOURCE_FACTORY_PROVIDER, buildTimeBuilder, clinit.newInstance(RCSF_NEW, clinit.load(discoveredConfigSourceFactory))); } - // add mappings - for (ConfigClassWithPrefix configMapping : configMappings) { - clinit.invokeStaticMethod(CU_WITH_MAPPING, buildTimeBuilder, - clinit.load(configMapping.getKlass().getName()), clinit.load(configMapping.getPrefix())); - } clinitConfig = clinit.checkCast(clinit.invokeVirtualMethod(SRCB_BUILD, buildTimeBuilder), SmallRyeConfig.class); @@ -676,12 +666,6 @@ public void run() { readConfig.newInstance(RCSF_NEW, readConfig.load(discoveredConfigSourceFactory))); } - // add mappings - for (ConfigClassWithPrefix configMapping : configMappings) { - readConfig.invokeStaticMethod(CU_WITH_MAPPING, runTimeBuilder, - readConfig.load(configMapping.getKlass().getName()), readConfig.load(configMapping.getPrefix())); - } - ResultHandle bootstrapConfig = null; if (bootstrapConfigSetupNeeded()) { bootstrapConfig = readBootstrapConfig.invokeVirtualMethod(SRCB_BUILD, bootstrapBuilder); @@ -1703,8 +1687,6 @@ public static final class Builder { private Set runtimeConfigSourceProviders; private Set runtimeConfigSourceFactories; - private Set configMappings; - Builder() { } @@ -1816,15 +1798,6 @@ public Builder setRuntimeConfigSourceFactories(final Set runtimeConfigSo return this; } - Set getConfigMappings() { - return configMappings; - } - - public Builder setConfigMappings(final Set configMappings) { - this.configMappings = configMappings; - return this; - } - public GenerateOperation build() { return new GenerateOperation(this); } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java index 76baaac11caab7..0eacb06801099f 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java @@ -2,9 +2,7 @@ import static io.quarkus.deployment.steps.ConfigBuildSteps.SERVICES_PREFIX; import static io.quarkus.deployment.util.ServiceUtil.classNamesNamedIn; -import static io.smallrye.config.ConfigMappings.ConfigClassWithPrefix.configClassWithPrefix; import static java.util.stream.Collectors.toList; -import static java.util.stream.Collectors.toSet; import java.io.IOException; import java.lang.reflect.Modifier; @@ -31,7 +29,6 @@ import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.AdditionalBootstrapConfigSourceProviderBuildItem; import io.quarkus.deployment.builditem.AdditionalStaticInitConfigSourceProviderBuildItem; -import io.quarkus.deployment.builditem.ConfigClassBuildItem; import io.quarkus.deployment.builditem.ConfigurationBuildItem; import io.quarkus.deployment.builditem.ConfigurationTypeBuildItem; import io.quarkus.deployment.builditem.GeneratedClassBuildItem; @@ -54,7 +51,6 @@ import io.quarkus.runtime.configuration.ConfigChangeRecorder; import io.quarkus.runtime.configuration.ConfigurationRuntimeConfig; import io.quarkus.runtime.configuration.RuntimeOverrideConfigSource; -import io.smallrye.config.ConfigMappings.ConfigClassWithPrefix; import io.smallrye.config.ConfigSourceFactory; import io.smallrye.config.PropertiesLocationConfigSourceFactory; @@ -92,8 +88,7 @@ void generateConfigClass( LiveReloadBuildItem liveReloadBuildItem, List additionalBootstrapConfigSourceProviders, List staticInitConfigSourceProviders, - List staticInitConfigSourceFactories, - List configClasses) + List staticInitConfigSourceFactories) throws IOException { if (liveReloadBuildItem.isLiveReload()) { @@ -135,7 +130,6 @@ void generateConfigClass( .setRuntimeConfigSources(discoveredConfigSources) .setRuntimeConfigSourceProviders(discoveredConfigSourceProviders) .setRuntimeConfigSourceFactories(discoveredConfigSourceFactories) - .setConfigMappings(getConfigClassesWithPrefix(configClasses)) .build() .run(); } @@ -249,11 +243,4 @@ private static Set staticSafeServices(Set services) { } return staticSafe; } - - private static Set getConfigClassesWithPrefix(List configClasses) { - return configClasses.stream() - .filter(ConfigClassBuildItem::isMapping) - .map(configMapping -> configClassWithPrefix(configMapping.getConfigClass(), configMapping.getPrefix())) - .collect(toSet()); - } } diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java index b362ff6e39826a..c9d2c35e3088c9 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java @@ -191,15 +191,6 @@ public static void addSourceFactoryProvider(SmallRyeConfigBuilder builder, Confi builder.withSources(provider.getConfigSourceFactory(Thread.currentThread().getContextClassLoader())); } - public static void addMapping(SmallRyeConfigBuilder builder, String mappingClass, String prefix) { - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - try { - builder.withMapping(contextClassLoader.loadClass(mappingClass), prefix); - } catch (ClassNotFoundException e) { - throw new RuntimeException(e); - } - } - /** * Checks if a property is present in the current Configuration. * diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java index ee60809ab577f7..a0d855f1ce38ff 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java @@ -1,12 +1,17 @@ package io.quarkus.arc.deployment; +import static io.quarkus.arc.deployment.ConfigClassBuildItem.Type.MAPPING; +import static io.quarkus.arc.deployment.ConfigClassBuildItem.Type.PROPERTIES; import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT; -import static io.quarkus.deployment.configuration.ConfigMappingUtils.CONFIG_MAPPING_NAME; import static io.smallrye.config.ConfigMappings.ConfigClassWithPrefix.configClassWithPrefix; +import static java.util.Collections.emptySet; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; +import static org.eclipse.microprofile.config.inject.ConfigProperties.UNCONFIGURED_PREFIX; import static org.jboss.jandex.AnnotationInstance.create; import static org.jboss.jandex.AnnotationTarget.Kind.CLASS; +import static org.jboss.jandex.AnnotationTarget.Kind.FIELD; +import static org.jboss.jandex.AnnotationTarget.Kind.METHOD_PARAMETER; import static org.jboss.jandex.AnnotationValue.createStringValue; import java.util.ArrayList; @@ -14,6 +19,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.function.Supplier; import java.util.stream.Stream; @@ -25,8 +31,10 @@ import org.eclipse.microprofile.config.inject.ConfigProperties; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.jandex.AnnotationInstance; +import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; +import org.jboss.jandex.ClassType; import org.jboss.jandex.DotName; import org.jboss.jandex.FieldInfo; import org.jboss.jandex.IndexView; @@ -46,15 +54,16 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.ConfigClassBuildItem; import io.quarkus.deployment.builditem.ConfigurationBuildItem; import io.quarkus.deployment.builditem.GeneratedClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.configuration.ConfigMappingUtils; import io.quarkus.deployment.configuration.definition.RootDefinition; import io.quarkus.deployment.recording.RecorderContext; import io.quarkus.gizmo.ResultHandle; import io.quarkus.runtime.annotations.ConfigPhase; +import io.smallrye.config.ConfigMapping; +import io.smallrye.config.ConfigMappingLoader; +import io.smallrye.config.ConfigMappingMetadata; import io.smallrye.config.ConfigMappings.ConfigClassWithPrefix; import io.smallrye.config.inject.ConfigProducer; @@ -66,6 +75,7 @@ public class ConfigBuildStep { private static final DotName MP_CONFIG_PROPERTIES_NAME = DotName.createSimple(ConfigProperties.class.getName()); private static final DotName MP_CONFIG_VALUE_NAME = DotName.createSimple(ConfigValue.class.getName()); + private static final DotName CONFIG_MAPPING_NAME = DotName.createSimple(ConfigMapping.class.getName()); private static final DotName MAP_NAME = DotName.createSimple(Map.class.getName()); private static final DotName SET_NAME = DotName.createSimple(Set.class.getName()); private static final DotName LIST_NAME = DotName.createSimple(List.class.getName()); @@ -242,11 +252,79 @@ void generateConfigClasses( BuildProducer reflectiveClasses, BuildProducer configClasses) { - // TODO - Generation of Mapping interface classes can be done in core because they don't require CDI - ConfigMappingUtils.generateConfigClasses(combinedIndex, generatedClasses, reflectiveClasses, configClasses, - CONFIG_MAPPING_NAME); - ConfigMappingUtils.generateConfigClasses(combinedIndex, generatedClasses, reflectiveClasses, configClasses, - MP_CONFIG_PROPERTIES_NAME); + List mappingAnnotations = new ArrayList<>(); + mappingAnnotations.addAll(combinedIndex.getIndex().getAnnotations(CONFIG_MAPPING_NAME)); + mappingAnnotations.addAll(combinedIndex.getIndex().getAnnotations(MP_CONFIG_PROPERTIES_NAME)); + + for (AnnotationInstance instance : mappingAnnotations) { + AnnotationTarget target = instance.target(); + AnnotationValue annotationPrefix = instance.value("prefix"); + + if (target.kind().equals(FIELD)) { + if (annotationPrefix != null && !annotationPrefix.asString().equals(UNCONFIGURED_PREFIX)) { + configClasses.produce( + toConfigClassBuildItem(instance, toClass(target.asField().type().name()), + annotationPrefix.asString())); + continue; + } + } + + if (target.kind().equals(METHOD_PARAMETER)) { + if (annotationPrefix != null && !annotationPrefix.asString().equals(UNCONFIGURED_PREFIX)) { + ClassType classType = target.asMethodParameter().method().parameters() + .get(target.asMethodParameter().position()).asClassType(); + configClasses + .produce(toConfigClassBuildItem(instance, toClass(classType.name()), annotationPrefix.asString())); + continue; + } + } + + if (!target.kind().equals(CLASS)) { + continue; + } + + Class configClass = toClass(target.asClass().name()); + String prefix = Optional.ofNullable(annotationPrefix).map(AnnotationValue::asString).orElse(""); + + List configMappingsMetadata = ConfigMappingLoader.getConfigMappingsMetadata(configClass); + Set generatedClassesNames = new HashSet<>(); + Set mappingsInfo = new HashSet<>(); + configMappingsMetadata.forEach(mappingMetadata -> { + generatedClasses.produce( + new GeneratedClassBuildItem(true, mappingMetadata.getClassName(), mappingMetadata.getClassBytes())); + reflectiveClasses + .produce(ReflectiveClassBuildItem.builder(mappingMetadata.getInterfaceType()).methods(true).build()); + reflectiveClasses + .produce(ReflectiveClassBuildItem.builder(mappingMetadata.getClassName()).constructors(true).build()); + + for (Class parent : getHierarchy(mappingMetadata.getInterfaceType())) { + reflectiveClasses.produce(ReflectiveClassBuildItem.builder(parent).methods(true).build()); + } + + generatedClassesNames.add(mappingMetadata.getClassName()); + + ClassInfo mappingInfo = combinedIndex.getIndex() + .getClassByName(DotName.createSimple(mappingMetadata.getInterfaceType().getName())); + if (mappingInfo != null) { + mappingsInfo.add(mappingInfo); + } + }); + + // Search and register possible classes for implicit Converter methods + for (ClassInfo classInfo : mappingsInfo) { + for (MethodInfo method : classInfo.methods()) { + if (!isHandledByProducers(method.returnType()) && + mappingsInfo.stream() + .map(ClassInfo::name) + .noneMatch(name -> name.equals(method.returnType().name()))) { + reflectiveClasses + .produce(new ReflectiveClassBuildItem(true, false, method.returnType().name().toString())); + } + } + } + + configClasses.produce(toConfigClassBuildItem(instance, configClass, generatedClassesNames, prefix)); + } } @BuildStep @@ -327,6 +405,12 @@ void registerConfigClasses( configClassWithPrefix -> Stream.of(configClassWithPrefix.getKlass(), configClassWithPrefix.getPrefix()) .collect(toList())); + recorder.registerConfigMappings( + configClasses.stream() + .filter(ConfigClassBuildItem::isMapping) + .map(configMapping -> configClassWithPrefix(configMapping.getConfigClass(), configMapping.getPrefix())) + .collect(toSet())); + recorder.registerConfigProperties( configClasses.stream() .filter(ConfigClassBuildItem::isProperties) @@ -335,6 +419,45 @@ void registerConfigClasses( .collect(toSet())); } + private static Class toClass(DotName dotName) { + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + try { + return classLoader.loadClass(dotName.toString()); + } catch (ClassNotFoundException e) { + throw new IllegalStateException("The class (" + dotName.toString() + ") cannot be created during deployment.", e); + } + } + + private static ConfigClassBuildItem toConfigClassBuildItem( + AnnotationInstance instance, + Class configClass, + String prefix) { + return toConfigClassBuildItem(instance, configClass, emptySet(), prefix); + } + + private static ConfigClassBuildItem toConfigClassBuildItem( + AnnotationInstance instance, + Class configClass, + Set generatedClasses, + String prefix) { + if (instance.name().equals(CONFIG_MAPPING_NAME)) { + return new ConfigClassBuildItem(configClass, generatedClasses, prefix, MAPPING); + } else if (instance.name().equals(MP_CONFIG_PROPERTIES_NAME)) { + return new ConfigClassBuildItem(configClass, generatedClasses, prefix, PROPERTIES); + } else { + throw new IllegalArgumentException(); + } + } + + private static List> getHierarchy(Class mapping) { + List> interfaces = new ArrayList<>(); + for (Class i : mapping.getInterfaces()) { + interfaces.add(i); + interfaces.addAll(getHierarchy(i)); + } + return interfaces; + } + private String getPropertyName(String name, ClassInfo declaringClass) { StringBuilder builder = new StringBuilder(); if (declaringClass.enclosingClass() == null) { diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigClassBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigClassBuildItem.java similarity index 94% rename from core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigClassBuildItem.java rename to extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigClassBuildItem.java index fb3e80e17225e2..1d011ddbe5824d 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigClassBuildItem.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigClassBuildItem.java @@ -1,4 +1,4 @@ -package io.quarkus.deployment.builditem; +package io.quarkus.arc.deployment; import java.util.Set; @@ -48,6 +48,6 @@ public boolean isProperties() { public enum Type { MAPPING, - PROPERTIES + PROPERTIES; } } diff --git a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java index 7c0363ef1a5f77..aea65fd304db8d 100644 --- a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java +++ b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java @@ -49,6 +49,7 @@ import io.quarkus.arc.deployment.AutoAddScopeBuildItem; import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem; import io.quarkus.arc.deployment.BeanContainerListenerBuildItem; +import io.quarkus.arc.deployment.ConfigClassBuildItem; import io.quarkus.arc.deployment.SyntheticBeanBuildItem; import io.quarkus.arc.deployment.UnremovableBeanBuildItem; import io.quarkus.arc.processor.BeanInfo; @@ -62,7 +63,6 @@ import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.ConfigClassBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem; import io.quarkus.deployment.builditem.ShutdownContextBuildItem; diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapper.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapper.java index 8a1e5132fd9937..ff1f0f1125489a 100644 --- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapper.java +++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapper.java @@ -13,15 +13,13 @@ public class ConfigurableExceptionMapper @Inject @ConfigProperty(name = "exception.message") String message; - @Inject - ExceptionConfig exceptionConfig; + + public ConfigurableExceptionMapper() { + System.out.println("ConfigurableExceptionMapper.ConfigurableExceptionMapper"); + } @Override public Response toResponse(final ConfigurableExceptionMapperException exception) { - if (!message.equals(exceptionConfig.message())) { - return Response.serverError().build(); - } - return Response.ok().entity(message).build(); } diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ExceptionConfig.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ExceptionConfig.java deleted file mode 100644 index 669464b2504c97..00000000000000 --- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ExceptionConfig.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.quarkus.it.smallrye.config; - -import io.smallrye.config.ConfigMapping; - -@ConfigMapping(prefix = "exception") -public interface ExceptionConfig { - String message(); -} From 056706e9f27ecddd52b71035b1893f2fde8ed08f Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Mon, 6 Sep 2021 22:46:56 +0300 Subject: [PATCH 112/138] Make labels a general container-image setting instead of Jib specific Closes: #19903 --- .../docker/deployment/DockerProcessor.java | 8 +++++-- .../image/jib/deployment/JibConfig.java | 3 +++ .../image/jib/deployment/JibProcessor.java | 21 ++++++++++++------- .../deployment/ContainerImageConfig.java | 7 +++++++ 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java index e2afb940d65e58..dba24339b49038 100644 --- a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java +++ b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java @@ -136,7 +136,7 @@ private String createContainerImage(ContainerImageConfig containerImageConfig, D PackageConfig packageConfig) { DockerfilePaths dockerfilePaths = getDockerfilePaths(dockerConfig, forNative, packageConfig, out); - String[] dockerArgs = getDockerArgs(containerImageInfo.getImage(), dockerfilePaths, dockerConfig); + String[] dockerArgs = getDockerArgs(containerImageInfo.getImage(), dockerfilePaths, containerImageConfig, dockerConfig); log.infof("Executing the following command to build docker image: '%s %s'", dockerConfig.executableName, String.join(" ", dockerArgs)); boolean buildSuccessful = ExecUtil.exec(out.getOutputDirectory().toFile(), reader, dockerConfig.executableName, @@ -178,12 +178,16 @@ private String createContainerImage(ContainerImageConfig containerImageConfig, D return containerImageInfo.getImage(); } - private String[] getDockerArgs(String image, DockerfilePaths dockerfilePaths, DockerConfig dockerConfig) { + private String[] getDockerArgs(String image, DockerfilePaths dockerfilePaths, ContainerImageConfig containerImageConfig, + DockerConfig dockerConfig) { List dockerArgs = new ArrayList<>(6 + dockerConfig.buildArgs.size()); dockerArgs.addAll(Arrays.asList("build", "-f", dockerfilePaths.getDockerfilePath().toAbsolutePath().toString())); for (Map.Entry entry : dockerConfig.buildArgs.entrySet()) { dockerArgs.addAll(Arrays.asList("--build-arg", entry.getKey() + "=" + entry.getValue())); } + for (Map.Entry entry : containerImageConfig.labels.entrySet()) { + dockerArgs.addAll(Arrays.asList("--label", String.format("%s=%s", entry.getKey(), entry.getValue()))); + } if (dockerConfig.cacheFrom.isPresent()) { List cacheFrom = dockerConfig.cacheFrom.get(); if (!cacheFrom.isEmpty()) { diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java index c1d476e7e52d99..f8f74492a59795 100644 --- a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java +++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java @@ -85,8 +85,11 @@ public class JibConfig { /** * Custom labels to add to the generated image + * + * @deprecated Use 'quarkus.container-image.labels' instead */ @ConfigItem + @Deprecated public Map labels; /** diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java index 5b6dd138834425..910bc79d776cca 100644 --- a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java +++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java @@ -119,10 +119,11 @@ public void buildFromJar(ContainerImageConfig containerImageConfig, JibConfig ji JibContainerBuilder jibContainerBuilder; String packageType = packageConfig.type; if (packageConfig.isLegacyJar() || packageType.equalsIgnoreCase(PackageConfig.UBER_JAR)) { - jibContainerBuilder = createContainerBuilderFromLegacyJar(jibConfig, + jibContainerBuilder = createContainerBuilderFromLegacyJar(jibConfig, containerImageConfig, sourceJar, outputTarget, mainClass, containerImageLabels); } else if (packageConfig.isFastJar()) { - jibContainerBuilder = createContainerBuilderFromFastJar(jibConfig, sourceJar, curateOutcome, containerImageLabels, + jibContainerBuilder = createContainerBuilderFromFastJar(jibConfig, containerImageConfig, sourceJar, curateOutcome, + containerImageLabels, appCDSResult); } else { throw new IllegalArgumentException( @@ -161,7 +162,7 @@ public void buildFromNative(ContainerImageConfig containerImageConfig, JibConfig "The native binary produced by the build is not a Linux binary and therefore cannot be used in a Linux container image. Consider adding \"quarkus.native.container-build=true\" to your configuration"); } - JibContainerBuilder jibContainerBuilder = createContainerBuilderFromNative(jibConfig, + JibContainerBuilder jibContainerBuilder = createContainerBuilderFromNative(jibConfig, containerImageConfig, nativeImage, containerImageLabels); setUser(jibConfig, jibContainerBuilder); setPlatforms(jibConfig, jibContainerBuilder); @@ -280,6 +281,7 @@ private Logger.Level toJBossLoggingLevel(LogEvent.Level level) { * */ private JibContainerBuilder createContainerBuilderFromFastJar(JibConfig jibConfig, + ContainerImageConfig containerImageConfig, JarBuildItem sourceJarBuildItem, CurateOutcomeBuildItem curateOutcome, List containerImageLabels, Optional appCDSResult) { @@ -427,7 +429,7 @@ private JibContainerBuilder createContainerBuilderFromFastJar(JibConfig jibConfi .setWorkingDirectory(workDirInContainer) .setEntrypoint(entrypoint) .setEnvironment(getEnvironmentVariables(jibConfig)) - .setLabels(allLabels(jibConfig, containerImageLabels)) + .setLabels(allLabels(jibConfig, containerImageConfig, containerImageLabels)) .setCreationTime(Instant.now()); for (int port : jibConfig.ports) { jibContainerBuilder.addExposedPort(Port.tcp(port)); @@ -468,6 +470,7 @@ private void setPlatforms(JibConfig jibConfig, JibContainerBuilder jibContainerB } private JibContainerBuilder createContainerBuilderFromLegacyJar(JibConfig jibConfig, + ContainerImageConfig containerImageConfig, JarBuildItem sourceJarBuildItem, OutputTargetBuildItem outputTargetBuildItem, MainClassBuildItem mainClassBuildItem, @@ -502,7 +505,7 @@ private JibContainerBuilder createContainerBuilderFromLegacyJar(JibConfig jibCon JibContainerBuilder jibContainerBuilder = javaContainerBuilder.toContainerBuilder() .setEnvironment(getEnvironmentVariables(jibConfig)) - .setLabels(allLabels(jibConfig, containerImageLabels)) + .setLabels(allLabels(jibConfig, containerImageConfig, containerImageLabels)) .setCreationTime(Instant.now()); if (jibConfig.jvmEntrypoint.isPresent()) { @@ -517,7 +520,7 @@ private JibContainerBuilder createContainerBuilderFromLegacyJar(JibConfig jibCon } } - private JibContainerBuilder createContainerBuilderFromNative(JibConfig jibConfig, + private JibContainerBuilder createContainerBuilderFromNative(JibConfig jibConfig, ContainerImageConfig containerImageConfig, NativeImageBuildItem nativeImageBuildItem, List containerImageLabels) { List entrypoint; @@ -541,7 +544,7 @@ private JibContainerBuilder createContainerBuilderFromNative(JibConfig jibConfig .setWorkingDirectory(workDirInContainer) .setEntrypoint(entrypoint) .setEnvironment(getEnvironmentVariables(jibConfig)) - .setLabels(allLabels(jibConfig, containerImageLabels)) + .setLabels(allLabels(jibConfig, containerImageConfig, containerImageLabels)) .setCreationTime(Instant.now()); for (int port : jibConfig.ports) { jibContainerBuilder.addExposedPort(Port.tcp(port)); @@ -604,12 +607,14 @@ private void handleExtraFiles(OutputTargetBuildItem outputTarget, JibContainerBu } } - private Map allLabels(JibConfig jibConfig, List containerImageLabels) { + private Map allLabels(JibConfig jibConfig, ContainerImageConfig containerImageConfig, + List containerImageLabels) { if (jibConfig.labels.isEmpty() && containerImageLabels.isEmpty()) { return Collections.emptyMap(); } final Map allLabels = new HashMap<>(jibConfig.labels); + allLabels.putAll(containerImageConfig.labels); for (ContainerImageLabelBuildItem containerImageLabel : containerImageLabels) { // we want the user supplied labels to take precedence so the user can override labels generated from other extensions if desired allLabels.putIfAbsent(containerImageLabel.getName(), containerImageLabel.getValue()); diff --git a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java index 87547b9f92a7b8..457555aad35f1c 100644 --- a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java +++ b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java @@ -1,6 +1,7 @@ package io.quarkus.container.image.deployment; import java.util.List; +import java.util.Map; import java.util.Optional; import io.quarkus.runtime.annotations.ConfigItem; @@ -33,6 +34,12 @@ public class ContainerImageConfig { @ConfigItem public Optional> additionalTags; + /** + * Custom labels to add to the generated image. + */ + @ConfigItem + public Map labels; + /** * The container registry to use */ From 847b9019d947bc2988d46869ba7d075bb7db536c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Sep 2021 21:08:04 +0000 Subject: [PATCH 113/138] Bump flyway-core from 7.14.1 to 7.15.0 Bumps [flyway-core](https://github.com/flyway/flyway) from 7.14.1 to 7.15.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.14.1...flyway-7.15.0) --- updated-dependencies: - dependency-name: org.flywaydb:flyway-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 086acd38e252df..15c7d79c4fb96c 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -156,7 +156,7 @@ 4.1.0 1.0.9 5.12.0.202106070339-r - 7.14.1 + 7.15.0 1.0.9 4.4.3 4.4.3 From 9df8e4f61f7fd594c5dd439d8cb9d89e1e7e3ee0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Sep 2021 21:15:04 +0000 Subject: [PATCH 114/138] Bump awssdk.version from 2.17.33 to 2.17.34 Bumps `awssdk.version` from 2.17.33 to 2.17.34. Updates `software.amazon.awssdk:bom` from 2.17.33 to 2.17.34 - [Release notes](https://github.com/aws/aws-sdk-java-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java-v2/compare/2.17.33...2.17.34) Updates `apache-client` from 2.17.33 to 2.17.34 --- updated-dependencies: - dependency-name: software.amazon.awssdk:bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:apache-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 086acd38e252df..06b6c13f88bda9 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -145,7 +145,7 @@ 3.10.0 1.6 2.9.1 - 2.17.33 + 2.17.34 2.40.0 1.4.2 1.5.30 From 31138b0896045aa53099422d0185a45ad06b6c2d Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Tue, 7 Sep 2021 08:15:42 +1000 Subject: [PATCH 115/138] Fix log assertions This should not prevent Quarkus from shutting down --- .../src/main/java/io/quarkus/test/QuarkusUnitTest.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java index 8d28ccae9e6d3f..463cc04bb00c6c 100644 --- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java +++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java @@ -572,8 +572,9 @@ private Throwable unwrapException(Throwable cause) { public void afterAll(ExtensionContext extensionContext) throws Exception { actualTestClass = null; actualTestInstance = null; + List records = null; if (assertLogRecords != null) { - assertLogRecords.accept(inMemoryLogHandler.records); + records = new ArrayList<>(inMemoryLogHandler.records); } rootLogger.setHandlers(originalHandlers); inMemoryLogHandler.clearRecords(); @@ -606,9 +607,12 @@ public void afterAll(ExtensionContext extensionContext) throws Exception { if (afterAllCustomizer != null) { afterAllCustomizer.run(); } + ClearCache.clearAnnotationCache(); + GroovyCacheCleaner.clearGroovyCache(); + } + if (records != null) { + assertLogRecords.accept(records); } - ClearCache.clearAnnotationCache(); - GroovyCacheCleaner.clearGroovyCache(); } @Override From 18852338c81eb38cc9cc22ab98a36a771b10fddb Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Tue, 7 Sep 2021 10:29:27 +1000 Subject: [PATCH 116/138] Fix continuous testing race Files to watch must be updated before the listeners are notified, otherwise the test may modify the config file before the file set has been updated, and the tests will not be run. --- .../io/quarkus/deployment/dev/testing/JunitTestRunner.java | 7 +++++++ .../java/io/quarkus/deployment/dev/testing/TestRunner.java | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java index f3ebf58184b3ca..1c6f5009c660cb 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java @@ -73,8 +73,10 @@ import io.quarkus.deployment.QuarkusClassWriter; import io.quarkus.deployment.dev.ClassScanResult; import io.quarkus.deployment.dev.DevModeContext; +import io.quarkus.deployment.dev.RuntimeUpdatesProcessor; import io.quarkus.deployment.util.IoUtil; import io.quarkus.dev.console.QuarkusConsole; +import io.quarkus.dev.testing.TestWatchedFiles; import io.quarkus.dev.testing.TracingHandler; /** @@ -379,6 +381,11 @@ public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry e QuarkusConsole.INSTANCE.setOutputFilter(null); + //this has to happen before notifying the listeners + Map watched = TestWatchedFiles.retrieveWatchedFilePaths(); + if (watched != null) { + RuntimeUpdatesProcessor.INSTANCE.setWatchedFilePaths(watched, true); + } for (TestRunListener listener : listeners) { listener.runComplete(new TestRunResults(runId, classScanResult, classScanResult == null, start, System.currentTimeMillis(), toResultsMap(testState.getCurrentResults()))); diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestRunner.java index 3c057a5422295c..cdbe69cf0fdd46 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestRunner.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestRunner.java @@ -24,8 +24,6 @@ import io.quarkus.bootstrap.app.CuratedApplication; import io.quarkus.deployment.dev.ClassScanResult; import io.quarkus.deployment.dev.DevModeContext; -import io.quarkus.deployment.dev.RuntimeUpdatesProcessor; -import io.quarkus.dev.testing.TestWatchedFiles; import io.quarkus.runtime.configuration.HyphenateEnumConverter; public class TestRunner { @@ -254,10 +252,6 @@ public void noTests(TestRunResults results) { synchronized (this) { runner = null; } - Map watched = TestWatchedFiles.retrieveWatchedFilePaths(); - if (watched != null) { - RuntimeUpdatesProcessor.INSTANCE.setWatchedFilePaths(watched, true); - } if (disabled) { return; } From fb37943764b5f700b3e2a2127de23bc6adee271f Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Tue, 7 Sep 2021 09:13:26 +1000 Subject: [PATCH 117/138] SCI's can't add websocket endpoints Fixes #19781 --- .../runtime/UndertowDeploymentRecorder.java | 6 ++- .../websockets/client/deployment/pom.xml | 4 ++ .../deployment/WebsocketClientProcessor.java | 20 +++++---- .../client/runtime/WebsocketCoreRecorder.java | 10 ++++- .../it/websocket/AddWebSocketHandler.java | 41 +++++++++++++++++++ .../io/quarkus/it/main/WebsocketTestCase.java | 25 +++++++++++ 6 files changed, 96 insertions(+), 10 deletions(-) create mode 100644 integration-tests/main/src/main/java/io/quarkus/it/websocket/AddWebSocketHandler.java diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java index 730b858eea0931..32f006d18ccc35 100644 --- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java +++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java @@ -523,7 +523,11 @@ public void run() { } public void addServletContextAttribute(RuntimeValue deployment, String key, Object value1) { - deployment.getValue().addServletContextAttribute(key, value1); + if (value1 instanceof RuntimeValue) { + deployment.getValue().addServletContextAttribute(key, ((RuntimeValue) value1).getValue()); + } else { + deployment.getValue().addServletContextAttribute(key, value1); + } } public void addServletExtension(RuntimeValue deployment, ServletExtension extension) { diff --git a/extensions/websockets/client/deployment/pom.xml b/extensions/websockets/client/deployment/pom.xml index 079ab2aa0e009c..0fa240617ff7e9 100644 --- a/extensions/websockets/client/deployment/pom.xml +++ b/extensions/websockets/client/deployment/pom.xml @@ -21,6 +21,10 @@ io.quarkus quarkus-websockets-client + + io.quarkus + quarkus-undertow-spi + io.quarkus quarkus-junit5-internal diff --git a/extensions/websockets/client/deployment/src/main/java/io/quarkus/undertow/websockets/client/deployment/WebsocketClientProcessor.java b/extensions/websockets/client/deployment/src/main/java/io/quarkus/undertow/websockets/client/deployment/WebsocketClientProcessor.java index 44574779a8e86e..c38f426a850e0a 100644 --- a/extensions/websockets/client/deployment/src/main/java/io/quarkus/undertow/websockets/client/deployment/WebsocketClientProcessor.java +++ b/extensions/websockets/client/deployment/src/main/java/io/quarkus/undertow/websockets/client/deployment/WebsocketClientProcessor.java @@ -12,6 +12,7 @@ import javax.websocket.ContainerProvider; import javax.websocket.Endpoint; import javax.websocket.server.ServerApplicationConfig; +import javax.websocket.server.ServerContainer; import javax.websocket.server.ServerEndpointConfig; import org.jboss.jandex.AnnotationInstance; @@ -34,10 +35,11 @@ import io.quarkus.deployment.builditem.ServiceStartBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem; -import io.quarkus.netty.deployment.EventLoopSupplierBuildItem; import io.quarkus.runtime.RuntimeValue; +import io.quarkus.undertow.deployment.ServletContextAttributeBuildItem; import io.quarkus.undertow.websockets.client.runtime.WebsocketCoreRecorder; import io.undertow.websockets.DefaultContainerConfigurator; +import io.undertow.websockets.ServerWebSocketContainer; import io.undertow.websockets.UndertowContainerProvider; import io.undertow.websockets.WebSocketDeploymentInfo; @@ -70,16 +72,16 @@ void scanForAnnotatedEndpoints(CombinedIndexBuildItem indexBuildItem, } @BuildStep - @Record(ExecutionTime.RUNTIME_INIT) + @Record(ExecutionTime.STATIC_INIT) public ServerWebSocketContainerBuildItem deploy(final CombinedIndexBuildItem indexBuildItem, WebsocketCoreRecorder recorder, BuildProducer reflection, - EventLoopSupplierBuildItem eventLoopSupplierBuildItem, List annotatedEndpoints, BeanContainerBuildItem beanContainerBuildItem, WebsocketConfig websocketConfig, BuildProducer infoBuildItemBuildProducer, - Optional factoryBuildItem) throws Exception { + Optional factoryBuildItem, + BuildProducer servletContextAttributeBuildItemBuildProducer) throws Exception { final Set endpoints = new HashSet<>(); final Set config = new HashSet<>(); @@ -121,10 +123,14 @@ public ServerWebSocketContainerBuildItem deploy(final CombinedIndexBuildItem ind websocketConfig.maxFrameSize, websocketConfig.dispatchToWorker); infoBuildItemBuildProducer.produce(new WebSocketDeploymentInfoBuildItem(deploymentInfo)); + RuntimeValue serverContainer = recorder.createServerContainer( + beanContainerBuildItem.getValue(), + deploymentInfo, + factoryBuildItem.map(ServerWebSocketContainerFactoryBuildItem::getFactory).orElse(null)); + servletContextAttributeBuildItemBuildProducer + .produce(new ServletContextAttributeBuildItem(ServerContainer.class.getName(), serverContainer)); return new ServerWebSocketContainerBuildItem( - recorder.createServerContainer(beanContainerBuildItem.getValue(), eventLoopSupplierBuildItem.getMainSupplier(), - deploymentInfo, - factoryBuildItem.map(ServerWebSocketContainerFactoryBuildItem::getFactory).orElse(null))); + serverContainer); } public static void registerCodersForReflection(BuildProducer reflection, diff --git a/extensions/websockets/client/runtime/src/main/java/io/quarkus/undertow/websockets/client/runtime/WebsocketCoreRecorder.java b/extensions/websockets/client/runtime/src/main/java/io/quarkus/undertow/websockets/client/runtime/WebsocketCoreRecorder.java index 1c384fc46a3e5d..1a420478fefb49 100644 --- a/extensions/websockets/client/runtime/src/main/java/io/quarkus/undertow/websockets/client/runtime/WebsocketCoreRecorder.java +++ b/extensions/websockets/client/runtime/src/main/java/io/quarkus/undertow/websockets/client/runtime/WebsocketCoreRecorder.java @@ -19,6 +19,7 @@ import io.quarkus.arc.runtime.BeanContainer; import io.quarkus.runtime.RuntimeValue; import io.quarkus.runtime.annotations.Recorder; +import io.quarkus.vertx.core.runtime.VertxCoreRecorder; import io.undertow.websockets.ServerWebSocketContainer; import io.undertow.websockets.UndertowContainerProvider; import io.undertow.websockets.WebSocketDeploymentInfo; @@ -26,6 +27,7 @@ import io.undertow.websockets.util.ObjectFactory; import io.undertow.websockets.util.ObjectHandle; import io.undertow.websockets.util.ObjectIntrospecter; +import io.vertx.core.impl.VertxInternal; @Recorder public class WebsocketCoreRecorder { @@ -105,7 +107,6 @@ public RuntimeValue createDeploymentInfo(Set an } public RuntimeValue createServerContainer(BeanContainer beanContainer, - Supplier eventLoopGroupSupplier, RuntimeValue infoVal, ServerWebSocketContainerFactory serverContainerFactory) throws DeploymentException { WebSocketDeploymentInfo info = infoVal.getValue(); @@ -136,7 +137,12 @@ public void release() { } }; } - }, Thread.currentThread().getContextClassLoader(), eventLoopGroupSupplier, + }, Thread.currentThread().getContextClassLoader(), new Supplier() { + @Override + public EventLoopGroup get() { + return ((VertxInternal) VertxCoreRecorder.getVertx().get()).getEventLoopGroup(); + } + }, Collections.singletonList(new ContextSetupHandler() { @Override public Action create(Action action) { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/websocket/AddWebSocketHandler.java b/integration-tests/main/src/main/java/io/quarkus/it/websocket/AddWebSocketHandler.java new file mode 100644 index 00000000000000..93dd2b62228804 --- /dev/null +++ b/integration-tests/main/src/main/java/io/quarkus/it/websocket/AddWebSocketHandler.java @@ -0,0 +1,41 @@ +package io.quarkus.it.websocket; + +import javax.enterprise.inject.spi.DeploymentException; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import javax.servlet.annotation.WebListener; +import javax.websocket.Endpoint; +import javax.websocket.EndpointConfig; +import javax.websocket.Session; +import javax.websocket.server.ServerContainer; +import javax.websocket.server.ServerEndpointConfig; + +import io.quarkus.runtime.annotations.RegisterForReflection; + +@WebListener +public class AddWebSocketHandler implements ServletContextListener { + @Override + public void contextDestroyed(ServletContextEvent sce) { + } + + @Override + public void contextInitialized(ServletContextEvent sce) { + try { + ((ServerContainer) sce.getServletContext().getAttribute(ServerContainer.class.getName())) + .addEndpoint(ServerEndpointConfig.Builder.create(WebSocketEndpoint.class, "/added-dynamic").build()); + + } catch (DeploymentException | javax.websocket.DeploymentException e) { + throw new RuntimeException(e); + } + } + + @RegisterForReflection + public static class WebSocketEndpoint extends Endpoint { + + @Override + public void onOpen(Session session, EndpointConfig config) { + session.getAsyncRemote().sendText("DYNAMIC"); + } + + } +} diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java index 2fcf61f794671c..e92668b8eb883a 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java @@ -32,6 +32,8 @@ public class WebsocketTestCase { @TestHTTPResource("wsopen") URI openURI; + @TestHTTPResource("added-dynamic") + URI added; @Test public void websocketTest() throws Exception { @@ -57,6 +59,29 @@ public void onMessage(String s) { } } + @Test + public void addedWebSocketTest() throws Exception { + + LinkedBlockingDeque message = new LinkedBlockingDeque<>(); + Session session = ContainerProvider.getWebSocketContainer().connectToServer(new Endpoint() { + @Override + public void onOpen(Session session, EndpointConfig endpointConfig) { + session.addMessageHandler(new MessageHandler.Whole() { + @Override + public void onMessage(String s) { + message.add(s); + } + }); + } + }, ClientEndpointConfig.Builder.create().build(), added); + + try { + Assertions.assertEquals("DYNAMIC", message.poll(20, TimeUnit.SECONDS)); + } finally { + session.close(); + } + } + @Test public void websocketServerEncodingAndDecodingTest() throws Exception { LinkedBlockingDeque message = new LinkedBlockingDeque<>(); From f704ef96e3a5f44f9234a4804c5ccc41d4ad1762 Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Fri, 3 Sep 2021 10:09:58 +1000 Subject: [PATCH 118/138] Use the same parent CL for both test and dev The isolated test CL does not need to access anything from the dev CL, and it just causes leakage problems. Fixes #19888 --- .../java/io/quarkus/deployment/dev/testing/TestSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java index bbbf37d8acbb09..1e65b09d078233 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java @@ -129,7 +129,7 @@ public void init() { .setAssertionsEnabled(true) .setDisableClasspathCache(false) .setIsolateDeployment(true) - .setBaseClassLoader(getClass().getClassLoader()) + .setBaseClassLoader(getClass().getClassLoader().getParent()) .setTest(true) .setAuxiliaryApplication(true) .setHostApplicationIsTestOnly(devModeType == DevModeType.TEST_ONLY) From c3baf659b0b0b0bcf733d774455f51e97a671ae6 Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Fri, 3 Sep 2021 11:30:41 +1000 Subject: [PATCH 119/138] Add QuarkusMainTest and QuarkusMainIntegrationTest These allow you to test running a command mode application to completion, and verify the outcome. Also coverts the Picocli tests to use this, rather than testing using a rest endpoint. --- .../deployment/console/AeshConsole.java | 12 +- .../deployment/console/ConsoleHelper.java | 28 ++- .../dev/testing/JunitTestRunner.java | 72 ++---- .../dev/testing/LogCapturingOutputFilter.java | 86 +++++++ .../runner/bootstrap/StartupActionImpl.java | 32 +++ .../io/quarkus/dev/console/BasicConsole.java | 16 +- .../quarkus/dev/console/QuarkusConsole.java | 29 ++- .../dev/console/RedirectPrintStream.java | 8 +- .../main/asciidoc/command-mode-reference.adoc | 55 +++- .../picocli/runtime/PicocliRunner.java | 7 +- .../quarkus/bootstrap/app/StartupAction.java | 5 + .../client/TestRegistryClientFactory.java | 13 +- .../maven/MavenRegistryClientFactory.java | 2 +- integration-tests/picocli-native/pom.xml | 22 -- .../it/picocli/ChildOfParentCommand.java | 4 +- .../it/picocli/CommandUsedAsParent.java | 2 +- .../picocli/CompletionReflectionCommand.java | 2 +- .../picocli/CustomDefaultValueProvider.java | 2 +- .../picocli/DefaultValueProviderCommand.java | 6 +- .../picocli/DynamicProxyInvokerCommand.java | 19 ++ .../DynamicVersionProviderCommand.java | 4 +- .../it/picocli/LocalizedCommandOne.java | 3 +- .../it/picocli/LocalizedCommandTwo.java | 2 +- .../main/java/io/quarkus/it/picocli/Main.java | 15 -- .../MutuallyExclusiveOptionsCommand.java | 9 +- .../io/quarkus/it/picocli/TestCommand.java | 15 +- .../io/quarkus/it/picocli/TestResource.java | 124 ---------- .../io/quarkus/it/picocli/TopTestCommand.java | 21 ++ .../quarkus/it/picocli/UnmatchedCommand.java | 12 +- .../it/picocli/WithMethodSubCommand.java | 8 +- .../src/main/resources/application.properties | 2 + .../java/io/quarkus/it/picocli/PicocliIT.java | 4 +- .../io/quarkus/it/picocli/PicocliTest.java | 90 ++++++- .../quarkus/test/common/ArtifactLauncher.java | 30 ++- .../DefaultDockerContainerLauncher.java | 19 +- .../test/common/DefaultJarLauncher.java | 73 ++++-- .../common/DefaultNativeImageLauncher.java | 73 ++++-- .../io/quarkus/test/common/ProcessReader.java | 38 +++ .../common/RestorableSystemProperties.java | 40 +++ .../AbstractJvmQuarkusTestExtension.java | 198 +++++++++++++++ .../DisabledOnIntegrationTestCondition.java | 5 +- .../test/junit/IntegrationTestUtil.java | 12 +- .../test/junit/NativeTestExtension.java | 5 + .../QuarkusMainIntegrationTestExtension.java | 234 ++++++++++++++++++ .../test/junit/QuarkusMainTestExtension.java | 189 ++++++++++++++ .../test/junit/QuarkusTestExtension.java | 179 +------------- .../io/quarkus/test/junit/main/Launch.java | 24 ++ .../quarkus/test/junit/main/LaunchResult.java | 25 ++ .../main/QuarkusMainIntegrationTest.java | 32 +++ .../test/junit/main/QuarkusMainLauncher.java | 7 + .../test/junit/main/QuarkusMainTest.java | 29 +++ .../quarkus/test/junit/util/CloseAdaptor.java | 17 ++ 52 files changed, 1460 insertions(+), 500 deletions(-) create mode 100644 core/deployment/src/main/java/io/quarkus/deployment/dev/testing/LogCapturingOutputFilter.java create mode 100644 integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicProxyInvokerCommand.java delete mode 100644 integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/Main.java delete mode 100644 integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestResource.java create mode 100644 integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TopTestCommand.java create mode 100644 integration-tests/picocli-native/src/main/resources/application.properties create mode 100644 test-framework/common/src/main/java/io/quarkus/test/common/ProcessReader.java create mode 100644 test-framework/common/src/main/java/io/quarkus/test/common/RestorableSystemProperties.java create mode 100644 test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java create mode 100644 test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java create mode 100644 test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java create mode 100644 test-framework/junit5/src/main/java/io/quarkus/test/junit/main/Launch.java create mode 100644 test-framework/junit5/src/main/java/io/quarkus/test/junit/main/LaunchResult.java create mode 100644 test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainIntegrationTest.java create mode 100644 test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainLauncher.java create mode 100644 test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainTest.java create mode 100644 test-framework/junit5/src/main/java/io/quarkus/test/junit/util/CloseAdaptor.java diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java b/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java index e7b734ba2ea8ad..e876e9a9b5b65c 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java @@ -289,7 +289,7 @@ int countLines(String s, int cursorPos) { return lines; } - public void write(String s) { + public void write(boolean errorStream, String s) { if (IN_WRITE.get()) { return; } @@ -319,10 +319,8 @@ public void write(String s) { StringBuilder buffer = new StringBuilder(); synchronized (this) { - if (outputFilter != null) { - if (!outputFilter.test(s)) { - return; - } + if (!shouldWrite(errorStream, s)) { + return; } if (totalStatusLines == 0) { bottomBlankSpace = 0; //just to be safe, will only happen if status is added then removed, which is not really likely @@ -384,8 +382,8 @@ public void write(String s) { deadlockSafeWrite(); } - public void write(byte[] buf, int off, int len) { - write(new String(buf, off, len, connection.outputEncoding())); + public void write(boolean errorStream, byte[] buf, int off, int len) { + write(errorStream, new String(buf, off, len, connection.outputEncoding())); } @Override diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java index 7f6854dff0eab5..e568b2d7f91fff 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java @@ -1,6 +1,7 @@ package io.quarkus.deployment.console; import java.io.IOException; +import java.io.PrintStream; import java.util.concurrent.LinkedBlockingDeque; import java.util.function.Consumer; import java.util.function.Supplier; @@ -17,6 +18,24 @@ public class ConsoleHelper { + static boolean redirectsInstalled = false; + + final static PrintStream out = System.out; + final static PrintStream err = System.err; + + public synchronized static void installRedirects() { + if (redirectsInstalled) { + return; + } + redirectsInstalled = true; + + //force console init + //otherwise you can get a stack overflow as it sees the redirected output + QuarkusConsole.INSTANCE.isInputSupported(); + System.setOut(new RedirectPrintStream(false)); + System.setErr(new RedirectPrintStream(true)); + } + public static synchronized void installConsole(TestConfig config, ConsoleConfig consoleConfig, ConsoleRuntimeConfig consoleRuntimeConfig, io.quarkus.runtime.logging.ConsoleConfig logConfig, boolean test) { if (QuarkusConsole.installed) { @@ -31,7 +50,7 @@ public static synchronized void installConsole(TestConfig config, ConsoleConfig if (!inputSupport) { //note that in this case we don't hold onto anything from this class loader //which is important for the test suite - QuarkusConsole.INSTANCE = new BasicConsole(colorEnabled, false, System.out, System.console()); + QuarkusConsole.INSTANCE = new BasicConsole(colorEnabled, false, out, System.console()); return; } try { @@ -90,11 +109,8 @@ public Integer get() { } }); } catch (IOException e) { - QuarkusConsole.INSTANCE = new BasicConsole(colorEnabled, false, System.out, System.console()); + QuarkusConsole.INSTANCE = new BasicConsole(colorEnabled, false, out, System.console()); } - - RedirectPrintStream ps = new RedirectPrintStream(); - System.setOut(ps); - System.setErr(ps); + installRedirects(); } } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java index 1c6f5009c660cb..7e7b66e13853de 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java @@ -1,12 +1,10 @@ package io.quarkus.deployment.dev.testing; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -26,7 +24,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; import java.util.function.Function; -import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -86,6 +83,7 @@ public class JunitTestRunner { private static final Logger log = Logger.getLogger(JunitTestRunner.class); public static final DotName QUARKUS_TEST = DotName.createSimple("io.quarkus.test.junit.QuarkusTest"); + public static final DotName QUARKUS_MAIN_TEST = DotName.createSimple("io.quarkus.test.junit.main.QuarkusMainTest"); public static final DotName QUARKUS_INTEGRATION_TEST = DotName.createSimple("io.quarkus.test.junit.QuarkusIntegrationTest"); public static final DotName NATIVE_IMAGE_TEST = DotName.createSimple("io.quarkus.test.junit.NativeImageTest"); public static final DotName TEST_PROFILE = DotName.createSimple("io.quarkus.test.junit.TestProfile"); @@ -134,6 +132,8 @@ public JunitTestRunner(Builder builder) { public void runTests() { long start = System.currentTimeMillis(); ClassLoader old = Thread.currentThread().getContextClassLoader(); + LogCapturingOutputFilter logHandler = new LogCapturingOutputFilter(testApplication, true, true, + TestSupport.instance().get()::isDisplayTestOutput); try (QuarkusClassLoader tcl = testApplication.createDeploymentClassLoader()) { synchronized (this) { if (aborted) { @@ -198,8 +198,7 @@ public FilterResult apply(TestDescriptor testDescriptor) { listener.runStarted(toRun); } log.debug("Starting test run with " + testPlan.countTestIdentifiers((s) -> true) + " tests"); - TestLogCapturingHandler logHandler = new TestLogCapturingHandler(); - QuarkusConsole.INSTANCE.setOutputFilter(logHandler); + QuarkusConsole.INSTANCE.addOutputFilter(logHandler); final Deque> touchedClasses = new LinkedBlockingDeque<>(); Map startTimes = new HashMap<>(); @@ -379,7 +378,7 @@ public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry e testState.classesRemoved(classScanResult.getDeletedClassNames()); } - QuarkusConsole.INSTANCE.setOutputFilter(null); + QuarkusConsole.INSTANCE.removeOutputFilter(logHandler); //this has to happen before notifying the listeners Map watched = TestWatchedFiles.retrieveWatchedFilePaths(); @@ -398,7 +397,7 @@ public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry e } finally { try { TracingHandler.setTracingHandler(null); - QuarkusConsole.INSTANCE.setOutputFilter(null); + QuarkusConsole.INSTANCE.removeOutputFilter(logHandler); Thread.currentThread().setContextClassLoader(old); } finally { synchronized (this) { @@ -547,12 +546,14 @@ private DiscoveryResult discoverTestClasses(DevModeContext devModeContext) { } } Set quarkusTestClasses = new HashSet<>(); - for (AnnotationInstance i : index.getAnnotations(QUARKUS_TEST)) { - DotName name = i.target().asClass().name(); - quarkusTestClasses.add(name.toString()); - for (ClassInfo clazz : index.getAllKnownSubclasses(name)) { - if (!integrationTestClasses.contains(clazz.name().toString())) { - quarkusTestClasses.add(clazz.name().toString()); + for (var a : Arrays.asList(QUARKUS_TEST, QUARKUS_MAIN_TEST)) { + for (AnnotationInstance i : index.getAnnotations(a)) { + DotName name = i.target().asClass().name(); + quarkusTestClasses.add(name.toString()); + for (ClassInfo clazz : index.getAllKnownSubclasses(name)) { + if (!integrationTestClasses.contains(clazz.name().toString())) { + quarkusTestClasses.add(clazz.name().toString()); + } } } } @@ -681,51 +682,6 @@ public boolean isRunning() { return testsRunning; } - private class TestLogCapturingHandler implements Predicate { - - private final List logOutput; - - public TestLogCapturingHandler() { - this.logOutput = new ArrayList<>(); - } - - public List captureOutput() { - List ret = new ArrayList<>(logOutput); - logOutput.clear(); - return ret; - } - - @Override - public boolean test(String logRecord) { - Thread thread = Thread.currentThread(); - ClassLoader cl = thread.getContextClassLoader(); - if (cl == null) { - return true; - } - while (cl.getParent() != null) { - if (cl == testApplication.getAugmentClassLoader() - || cl == testApplication.getBaseRuntimeClassLoader()) { - //TODO: for convenience we save the log records as HTML rather than ANSI here - synchronized (logOutput) { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - HtmlAnsiOutputStream outputStream = new HtmlAnsiOutputStream(out) { - }; - try { - outputStream.write(logRecord.getBytes(StandardCharsets.UTF_8)); - logOutput.add(new String(out.toByteArray(), StandardCharsets.UTF_8)); - } catch (IOException e) { - log.error("Failed to capture log record", e); - logOutput.add(logRecord); - } - } - return TestSupport.instance().get().isDisplayTestOutput(); - } - cl = cl.getParent(); - } - return true; - } - } - static class Builder { private TestType testType = TestType.ALL; private TestState testState; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/LogCapturingOutputFilter.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/LogCapturingOutputFilter.java new file mode 100644 index 00000000000000..36aeaf7aeee9d3 --- /dev/null +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/LogCapturingOutputFilter.java @@ -0,0 +1,86 @@ +package io.quarkus.deployment.dev.testing; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; +import java.util.function.BiPredicate; +import java.util.function.Supplier; + +import org.jboss.logging.Logger; + +import io.quarkus.bootstrap.app.CuratedApplication; + +public class LogCapturingOutputFilter implements BiPredicate { + private static final Logger log = Logger.getLogger(LogCapturingOutputFilter.class); + + private final CuratedApplication application; + private final List logOutput = new ArrayList<>(); + private final List errorOutput = new ArrayList<>(); + private final boolean mergeErrorStream; + private final boolean convertToHtml; + private final Supplier finalPredicate; + + public LogCapturingOutputFilter(CuratedApplication application, boolean mergeErrorStream, boolean convertToHtml, + Supplier finalPredicate) { + this.application = application; + this.mergeErrorStream = mergeErrorStream; + this.convertToHtml = convertToHtml; + this.finalPredicate = finalPredicate; + } + + public List captureOutput() { + List ret = new ArrayList<>(logOutput); + logOutput.clear(); + return ret; + } + + public List captureErrorOutput() { + List ret = new ArrayList<>(errorOutput); + errorOutput.clear(); + return ret; + } + + @Override + public boolean test(String logRecord, Boolean errorStream) { + Thread thread = Thread.currentThread(); + ClassLoader cl = thread.getContextClassLoader(); + if (cl == null) { + return true; + } + while (cl.getParent() != null) { + if (cl == application.getAugmentClassLoader() + || cl == application.getBaseRuntimeClassLoader()) { + //TODO: for convenience we save the log records as HTML rather than ANSI here + synchronized (logOutput) { + if (convertToHtml) { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + HtmlAnsiOutputStream outputStream = new HtmlAnsiOutputStream(out) { + }; + try { + outputStream.write(logRecord.getBytes(StandardCharsets.UTF_8)); + if (mergeErrorStream || !errorStream) { + logOutput.add(out.toString(StandardCharsets.UTF_8)); + } else { + errorOutput.add(out.toString(StandardCharsets.UTF_8)); + } + } catch (IOException e) { + log.error("Failed to capture log record", e); + logOutput.add(logRecord); + } + } else { + if (mergeErrorStream || !errorStream) { + logOutput.add(logRecord); + } else { + errorOutput.add(logRecord); + } + } + } + return finalPredicate.get(); + } + cl = cl.getParent(); + } + return true; + } +} diff --git a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java index 97dbb820bb5c1d..b0710e1efbb24e 100644 --- a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java +++ b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java @@ -14,6 +14,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; import org.jboss.logging.Logger; @@ -33,6 +34,7 @@ import io.quarkus.deployment.builditem.TransformedClassesBuildItem; import io.quarkus.deployment.configuration.RunTimeConfigurationGenerator; import io.quarkus.dev.appstate.ApplicationStateNotification; +import io.quarkus.runtime.ApplicationLifecycleManager; import io.quarkus.runtime.Quarkus; import io.quarkus.runtime.configuration.RuntimeOverrideConfigSource; @@ -141,7 +143,37 @@ public void close() throws IOException { } finally { Thread.currentThread().setContextClassLoader(old); } + } + @Override + public int runMainClassBlocking(String... args) throws Exception { + //we have our class loaders + ClassLoader old = Thread.currentThread().getContextClassLoader(); + Thread.currentThread().setContextClassLoader(runtimeClassLoader); + final String className = buildResult.consume(MainClassBuildItem.class).getClassName(); + try { + CompletableFuture result = new CompletableFuture<>(); + Class lifecycleManager = Class.forName(ApplicationLifecycleManager.class.getName(), true, runtimeClassLoader); + lifecycleManager.getDeclaredMethod("setDefaultExitCodeHandler", Consumer.class).invoke(null, + new Consumer() { + @Override + public void accept(Integer integer) { + result.complete(integer); + } + }); + // force init here + Class appClass = Class.forName(className, true, runtimeClassLoader); + Method start = appClass.getMethod("main", String[].class); + start.invoke(null, (Object) (args == null ? new String[0] : args)); + Integer returnVal = result.get(); + Class q = Class.forName(Quarkus.class.getName(), true, runtimeClassLoader); + q.getMethod("blockingExit").invoke(null); + + return returnVal; + } finally { + runtimeClassLoader.close(); + Thread.currentThread().setContextClassLoader(old); + } } @Override diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/console/BasicConsole.java b/core/devmode-spi/src/main/java/io/quarkus/dev/console/BasicConsole.java index 408a0485fe702f..6d82fd3c2b8c1f 100644 --- a/core/devmode-spi/src/main/java/io/quarkus/dev/console/BasicConsole.java +++ b/core/devmode-spi/src/main/java/io/quarkus/dev/console/BasicConsole.java @@ -153,13 +153,11 @@ public void setPromptMessage(String prompt) { } @Override - public void write(String s) { - if (outputFilter != null) { - if (!outputFilter.test(s)) { - //we still test, the output filter may be recording output - if (!DISABLE_FILTER.get()) { - return; - } + public void write(boolean errorStream, String s) { + if (!shouldWrite(errorStream, s)) { + //we still test, the output filter may be recording output + if (!DISABLE_FILTER.get()) { + return; } } if (!color) { @@ -171,8 +169,8 @@ public void write(String s) { } @Override - public void write(byte[] buf, int off, int len) { - write(new String(buf, off, len, StandardCharsets.UTF_8)); + public void write(boolean errorStream, byte[] buf, int off, int len) { + write(errorStream, new String(buf, off, len, StandardCharsets.UTF_8)); } @Override diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.java b/core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.java index 13bcb196e1e3eb..f2655d4329ed64 100644 --- a/core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.java +++ b/core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.java @@ -1,8 +1,10 @@ package io.quarkus.dev.console; +import java.util.List; import java.util.Locale; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.function.BiPredicate; import java.util.function.Consumer; -import java.util.function.Predicate; public abstract class QuarkusConsole { @@ -39,7 +41,7 @@ public abstract class QuarkusConsole { public static volatile boolean installed; - protected volatile Predicate outputFilter; + protected static final List> outputFilters = new CopyOnWriteArrayList<>(); private volatile boolean started = false; @@ -84,9 +86,9 @@ public void setInputHandler(Consumer inputHandler) { public abstract void setPromptMessage(String message); - public abstract void write(String s); + public abstract void write(boolean errorStream, String s); - public abstract void write(byte[] buf, int off, int len); + public abstract void write(boolean errorStream, byte[] buf, int off, int len); protected String stripAnsiCodes(String s) { if (s == null) { @@ -96,8 +98,23 @@ protected String stripAnsiCodes(String s) { return s; } - public void setOutputFilter(Predicate logHandler) { - this.outputFilter = logHandler; + public static void addOutputFilter(BiPredicate logHandler) { + outputFilters.add(logHandler); + } + + public static void removeOutputFilter(BiPredicate logHandler) { + outputFilters.remove(logHandler); + } + + protected boolean shouldWrite(boolean errorStream, String s) { + boolean ok = true; + for (var i : outputFilters) { + if (!i.test(s, errorStream)) { + //no early exit as filters can also record output + ok = false; + } + } + return ok; } public boolean isInputSupported() { diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/console/RedirectPrintStream.java b/core/devmode-spi/src/main/java/io/quarkus/dev/console/RedirectPrintStream.java index d0ad38c06e4879..e0c971353f8d80 100644 --- a/core/devmode-spi/src/main/java/io/quarkus/dev/console/RedirectPrintStream.java +++ b/core/devmode-spi/src/main/java/io/quarkus/dev/console/RedirectPrintStream.java @@ -8,18 +8,20 @@ public class RedirectPrintStream extends PrintStream { private Formatter formatter; + private final boolean errorStream; - public RedirectPrintStream() { + public RedirectPrintStream(boolean errorStream) { super(new ByteArrayOutputStream(0)); // never used + this.errorStream = errorStream; } @Override public void write(byte[] buf, int off, int len) { - QuarkusConsole.INSTANCE.write(buf, off, len); + QuarkusConsole.INSTANCE.write(errorStream, buf, off, len); } void write(String s) { - QuarkusConsole.INSTANCE.write(s); + QuarkusConsole.INSTANCE.write(errorStream, s); } @Override diff --git a/docs/src/main/asciidoc/command-mode-reference.adoc b/docs/src/main/asciidoc/command-mode-reference.adoc index daf09a605683ff..5b7467679a5686 100644 --- a/docs/src/main/asciidoc/command-mode-reference.adoc +++ b/docs/src/main/asciidoc/command-mode-reference.adoc @@ -40,8 +40,8 @@ import io.quarkus.runtime.annotations.QuarkusMain; public class HelloWorldMain implements QuarkusApplication { @Override public int run(String... args) throws Exception { // <.> - System.out.println("Hello World"); - return 10; + System.out.println("Hello " + args[1]); + return 0; } } ---- @@ -129,4 +129,55 @@ Press [space] to restart, [e] to edit command line args (currently '-w --tags 1. You can press the `Space bar` key and the application will be started again. You can also use the `e` hotkey to edit the command line arguments and restart your application. +== Testing Command Mode Applications +Command Mode applications can be tested using the `@QuarkusMainTest` and `@QuarkusMainIntegrationTest` annotations. These +work in a similar way to `@QuarkusTest` and `@QuarkusIntegrationTest` where `@QuarkusMainTest` will run the CLI tests +within the current JVM, while `QuarkusIntegrationTest` is used to run the generated executable (both jars and native). + +We can write a simple test for our CLI application above as follows: + +[source,java] +---- +import io.quarkus.test.junit.main.Launch; +import io.quarkus.test.junit.main.LaunchResult; +import io.quarkus.test.junit.main.QuarkusMainLauncher; +import io.quarkus.test.junit.main.QuarkusMainTest; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +@QuarkusMainTest +public class HelloTest { + + @Test + @Launch("World") + public void testLaunchCommand(LaunchResult result) { + Assertions.assertEquals("Hello World", result.getOutput()); + } + + @Test + @Launch(value = {}, exitCode = 1) + public void testLaunchCommandFailed() { + } + + @Test + public void testManualLaunch(QuarkusMainLauncher launcher) { + LaunchResult result = launcher.launch("Everyone"); + Assertions.assertEquals(0, result.exitCode()); + Assertions.assertEquals("Hello Everyone", result.getOutput()); + } +} + +---- + +We can then extend this with an integration test that can be used to test the native executable or runnable jar: + +[source,java] +---- +import io.quarkus.test.junit.main.QuarkusMainIntegrationTest; + +@QuarkusMainIntegrationTest +public class HelloIT extends HelloTest { +} + +---- \ No newline at end of file diff --git a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliRunner.java b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliRunner.java index 79b95041a3a7b3..33393a9dd5bceb 100644 --- a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliRunner.java +++ b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliRunner.java @@ -36,6 +36,11 @@ public PicocliRunner(CommandLine commandLine, Event par @Override public int run(String... args) throws Exception { - return commandLine.execute(args); + try { + return commandLine.execute(args); + } finally { + commandLine.getOut().flush(); + commandLine.getErr().flush(); + } } } diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/StartupAction.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/StartupAction.java index f4598b0e8dbc14..d4ddb2a1390875 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/StartupAction.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/StartupAction.java @@ -26,4 +26,9 @@ public interface StartupAction { */ RunningQuarkusApplication runMainClass(String... args) throws Exception; + /** + * Runs the application by running the main method of the main class, and runs it to completion + */ + int runMainClassBlocking(String... args) throws Exception; + } diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientFactory.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientFactory.java index 8003a183e4e067..79b6c2a0f30811 100644 --- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientFactory.java +++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientFactory.java @@ -1,5 +1,6 @@ package io.quarkus.devtools.testing.registry.client; +import io.quarkus.bootstrap.classloading.QuarkusClassLoader; import io.quarkus.registry.RegistryResolutionException; import io.quarkus.registry.client.RegistryClient; import io.quarkus.registry.client.RegistryClientFactory; @@ -11,7 +12,13 @@ public class TestRegistryClientFactory implements RegistryClientFactory { private static TestRegistryClientFactory instance; public static TestRegistryClientFactory getInstance(RegistryClientEnvironment env) { - return instance == null ? instance = new TestRegistryClientFactory(env) : instance; + if (instance != null) { + return instance; + } + if (Thread.currentThread().getContextClassLoader() instanceof QuarkusClassLoader) { + ((QuarkusClassLoader) Thread.currentThread().getContextClassLoader()).addCloseTask(() -> instance = null); + } + return instance = new TestRegistryClientFactory(env); } private final RegistryClientEnvironment env; @@ -24,4 +31,8 @@ private TestRegistryClientFactory(RegistryClientEnvironment env) { public RegistryClient buildRegistryClient(RegistryConfig config) throws RegistryResolutionException { return new TestRegistryClient(env, config); } + + public static void reset() { + instance = null; + } } diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java index 7edb924e28bdd2..7ebca7f054610c 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java @@ -90,7 +90,7 @@ public RegistryClient buildRegistryClient(RegistryConfig config) throws Registry if (areMatching(registryRepos, aggregatedRepos)) { // the original and aggregated repos are matching, meaning no mirrors/proxies have been applied // there is nothing to fallback to - throw new RegistryResolutionException(getDescriptorResolutionFailureMessage(config, resolver, e)); + throw new RegistryResolutionException(getDescriptorResolutionFailureMessage(config, resolver, e), e); } // if the mirror and proxies in the user settings were configured w/o taking the extension registry into account // we will warn the user and try the original registry repos as a fallback diff --git a/integration-tests/picocli-native/pom.xml b/integration-tests/picocli-native/pom.xml index 6c6edd06efa854..0b92365a2fb868 100644 --- a/integration-tests/picocli-native/pom.xml +++ b/integration-tests/picocli-native/pom.xml @@ -13,10 +13,6 @@ Quarkus - Integration Tests - Picocli Native Module that contains Picocli test with native test - - io.quarkus - quarkus-resteasy - io.quarkus quarkus-picocli @@ -32,11 +28,6 @@ quarkus-junit5 test - - io.rest-assured - rest-assured - test - @@ -52,19 +43,6 @@ - - io.quarkus - quarkus-resteasy-deployment - ${project.version} - pom - test - - - * - * - - - diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/ChildOfParentCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/ChildOfParentCommand.java index c3e435dcf87605..574c0d3140c30b 100644 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/ChildOfParentCommand.java +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/ChildOfParentCommand.java @@ -1,7 +1,5 @@ package io.quarkus.it.picocli; -import org.assertj.core.api.Assertions; - import picocli.CommandLine; @CommandLine.Command(name = "child") @@ -12,6 +10,6 @@ public class ChildOfParentCommand implements Runnable { @Override public void run() { - Assertions.assertThat(parent.parentValue).isEqualTo("testValue"); + System.out.println(parent.parentValue); } } diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CommandUsedAsParent.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CommandUsedAsParent.java index 61e22bc493d8a8..72170aef4c9d50 100644 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CommandUsedAsParent.java +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CommandUsedAsParent.java @@ -2,7 +2,7 @@ import picocli.CommandLine; -@CommandLine.Command(subcommands = ChildOfParentCommand.class) +@CommandLine.Command(subcommands = ChildOfParentCommand.class, name = "command-used-as-parent") public class CommandUsedAsParent { @CommandLine.Option(names = "-p", description = "Value read by child command.") diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CompletionReflectionCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CompletionReflectionCommand.java index 8d3cb97820bfb9..5e256680c1c5e8 100644 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CompletionReflectionCommand.java +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CompletionReflectionCommand.java @@ -23,4 +23,4 @@ public Iterator iterator() { return Arrays.asList("one", "two").iterator(); } } -} \ No newline at end of file +} diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CustomDefaultValueProvider.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CustomDefaultValueProvider.java index eff3cceedcff20..58fcb2dd5191af 100644 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CustomDefaultValueProvider.java +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CustomDefaultValueProvider.java @@ -7,6 +7,6 @@ public class CustomDefaultValueProvider implements IDefaultValueProvider { @Override public String defaultValue(ArgSpec argSpec) throws Exception { - return "false"; + return "default-value"; } } diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DefaultValueProviderCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DefaultValueProviderCommand.java index 5b22fce355b87a..5906b6de8872f2 100644 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DefaultValueProviderCommand.java +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DefaultValueProviderCommand.java @@ -2,11 +2,15 @@ import picocli.CommandLine; -@CommandLine.Command(name = "defaultvalueprovider", mixinStandardHelpOptions = true, defaultValueProvider = CustomDefaultValueProvider.class) +@CommandLine.Command(name = "default-value-provider", mixinStandardHelpOptions = false, defaultValueProvider = CustomDefaultValueProvider.class) public class DefaultValueProviderCommand implements Runnable { + @CommandLine.Option(names = "--defaulted") + String defaulted; + @Override public void run() { + System.out.println("default:" + defaulted); } } diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicProxyInvokerCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicProxyInvokerCommand.java new file mode 100644 index 00000000000000..7fda7767a654e6 --- /dev/null +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicProxyInvokerCommand.java @@ -0,0 +1,19 @@ +package io.quarkus.it.picocli; + +import javax.inject.Inject; + +import picocli.CommandLine; + +@CommandLine.Command(name = "dynamic-proxy") +public class DynamicProxyInvokerCommand implements Runnable { + @Inject + CommandLine.IFactory factory; + + @Override + public void run() { + CommandLine cmd = new CommandLine(DynamicProxyCommand.class, factory); + cmd.parseArgs("-t", "2007-12-03T10:15:30"); + DynamicProxyCommand parsedCommand = cmd.getCommand(); + System.out.println(parsedCommand.time()); + } +} diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicVersionProviderCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicVersionProviderCommand.java index c008b2dc3ff6cd..63269d32b55143 100644 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicVersionProviderCommand.java +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicVersionProviderCommand.java @@ -1,6 +1,6 @@ package io.quarkus.it.picocli; -import org.assertj.core.api.Assertions; +import java.util.Arrays; import picocli.CommandLine; @@ -12,6 +12,6 @@ public class DynamicVersionProviderCommand implements Runnable { @Override public void run() { - Assertions.assertThat(commandSpec.version()).containsExactly("quarkus version 1.0"); + System.out.println(Arrays.toString(commandSpec.version())); } } diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandOne.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandOne.java index fdb7429ad80379..6e7e1785e091ed 100644 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandOne.java +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandOne.java @@ -2,8 +2,9 @@ import picocli.CommandLine; -@CommandLine.Command(resourceBundle = "i18s.LocalizedCommandOne") +@CommandLine.Command(name = "localized-command-one", mixinStandardHelpOptions = true, resourceBundle = "i18s.LocalizedCommandOne") public class LocalizedCommandOne { @CommandLine.Option(names = "--first") String firstOption; + } diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandTwo.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandTwo.java index 71f3da76c870f2..66be63ed7914f6 100644 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandTwo.java +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandTwo.java @@ -2,7 +2,7 @@ import picocli.CommandLine; -@CommandLine.Command(resourceBundle = "i18s.LocalizedCommandTwo") +@CommandLine.Command(name = "localized-command-two", mixinStandardHelpOptions = true, resourceBundle = "i18s.LocalizedCommandTwo") public class LocalizedCommandTwo { @CommandLine.Option(names = "--first") String firstOption; diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/Main.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/Main.java deleted file mode 100644 index 2602f186ad12d6..00000000000000 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/Main.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.quarkus.it.picocli; - -import io.quarkus.runtime.Quarkus; -import io.quarkus.runtime.QuarkusApplication; -import io.quarkus.runtime.annotations.QuarkusMain; - -@QuarkusMain -public class Main implements QuarkusApplication { - @Override - public int run(String... args) throws Exception { - // just wait for test execution to finish. - Quarkus.waitForExit(); - return 0; - } -} diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/MutuallyExclusiveOptionsCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/MutuallyExclusiveOptionsCommand.java index ab6399bce7959d..ce983d4e00229e 100644 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/MutuallyExclusiveOptionsCommand.java +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/MutuallyExclusiveOptionsCommand.java @@ -3,11 +3,18 @@ import picocli.CommandLine; @CommandLine.Command(name = "exclusivedemo") -public class MutuallyExclusiveOptionsCommand { +public class MutuallyExclusiveOptionsCommand implements Runnable { @CommandLine.ArgGroup(exclusive = true, multiplicity = "1") Exclusive exclusive; + @Override + public void run() { + System.out.println("-a:" + exclusive.a); + System.out.println("-b:" + exclusive.b); + System.out.println("-c:" + exclusive.c); + } + static class Exclusive { @CommandLine.Option(names = "-a", required = true) int a; diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestCommand.java index 71c188c2420b7d..9ad798ff02d1ee 100644 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestCommand.java +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestCommand.java @@ -2,12 +2,14 @@ import java.net.InetAddress; import java.net.Proxy; +import java.util.Arrays; import java.util.Map; +import java.util.concurrent.Callable; import picocli.CommandLine; -@CommandLine.Command(description = "Basic Tests for reflection.") -public class TestCommand extends BaseTestCommand { +@CommandLine.Command(name = "test-command", description = "Basic Tests for reflection.") +public class TestCommand extends BaseTestCommand implements Callable { @CommandLine.Option(names = { "-p", "--private" }, description = "Test private field access.") private String privateEntry; @@ -24,4 +26,13 @@ public class TestCommand extends BaseTestCommand { public String getPrivateEntry() { return privateEntry; } + + @Override + public Integer call() throws Exception { + System.out.println("-p:" + privateEntry); + System.out.println("-s:" + status); + System.out.println("-h:" + proxies); + System.out.println("positional:" + Arrays.toString(positional)); + return 0; + } } diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestResource.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestResource.java deleted file mode 100644 index 6c6f9d7d0f8615..00000000000000 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestResource.java +++ /dev/null @@ -1,124 +0,0 @@ -package io.quarkus.it.picocli; - -import java.io.File; -import java.net.InetAddress; -import java.net.Proxy; -import java.net.UnknownHostException; - -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import org.assertj.core.api.Assertions; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import picocli.CommandLine; - -@Path("/picocli/test") -public class TestResource { - - private static final Logger LOGGER = LoggerFactory.getLogger(TestResource.class); - - private final CommandLine.IFactory factory; - - @Inject - public TestResource(CommandLine.IFactory factory) { - this.factory = factory; - } - - @GET - @Produces(MediaType.TEXT_PLAIN) - public String getTestResults() throws UnknownHostException { - testBasicReflection(); - testMethodSubCommand(); - testParentCommand(); - testCommandWithArgGroup(); - testDynamicProxy(); - testDynamicVersionProvider(); - testUnmatched(); - testI18s(); - testCompletionReflection(); - testDefaultValueProvider(); - return "OK"; - } - - private void testBasicReflection() throws UnknownHostException { - CommandLine cmd = new CommandLine(TestCommand.class, factory); - CommandLine.ParseResult parseResult = cmd.parseArgs("-f", "test.txt", "-f", "test2.txt", "-f", "test3.txt", "-s", - "ERROR", "-h", "SOCKS=5.5.5.5", "-p", "privateValue", "pos1", "pos2"); - TestCommand parsedCommand = cmd.getCommand(); - Assertions.assertThat(parsedCommand.status).isEqualTo(Status.ERROR); - Assertions.assertThat(parsedCommand.proxies) - .containsOnly(Assertions.entry(Proxy.Type.SOCKS, InetAddress.getByAddress(new byte[] { 5, 5, 5, 5 }))); - Assertions.assertThat(parsedCommand.getFiles()) - .containsExactly(new File("test.txt"), new File("test2.txt"), new File("test3.txt")); - Assertions.assertThat(parseResult.matchedOption("s").description()).containsExactly("Test enum with ERROR, SUCCESS"); - Assertions.assertThat(parsedCommand.getPrivateEntry()).isEqualTo("privateValue"); - Assertions.assertThat(parsedCommand.positional).containsExactly("pos1", "pos2"); - } - - private void testMethodSubCommand() { - CommandLine helloCmd = new CommandLine(WithMethodSubCommand.class, factory); - Assertions.assertThat(helloCmd.execute("hello", "-n", "World!")).isZero(); - CommandLine goodByeCmd = new CommandLine(WithMethodSubCommand.class, factory); - Assertions.assertThat(goodByeCmd.execute("goodBye", "-n", "Test?")).isZero(); - } - - private void testParentCommand() { - CommandLine parentCommand = new CommandLine(CommandUsedAsParent.class, factory); - Assertions.assertThat(parentCommand.execute("-p", "testValue", "child")).isZero(); - } - - private void testCommandWithArgGroup() { - CommandLine argGroupCommand = new CommandLine(MutuallyExclusiveOptionsCommand.class, factory); - argGroupCommand.parseArgs("-b", "150"); - MutuallyExclusiveOptionsCommand parsedCommand = argGroupCommand.getCommand(); - Assertions.assertThat(parsedCommand.exclusive.a).isZero(); - Assertions.assertThat(parsedCommand.exclusive.b).isEqualTo(150); - Assertions.assertThat(parsedCommand.exclusive.c).isZero(); - } - - private void testDynamicProxy() { - CommandLine cmd = new CommandLine(DynamicProxyCommand.class, factory); - cmd.parseArgs("-t", "2007-12-03T10:15:30"); - DynamicProxyCommand parsedCommand = cmd.getCommand(); - Assertions.assertThat(parsedCommand.time()).isEqualTo("2007-12-03T10:15:30"); - } - - private void testDynamicVersionProvider() { - CommandLine cmd = new CommandLine(DynamicVersionProviderCommand.class, factory); - Assertions.assertThat(cmd.execute()).isZero(); - - } - - private void testUnmatched() { - CommandLine cmd = new CommandLine(UnmatchedCommand.class, factory); - cmd.parseArgs("-x", "-a", "AAA", "More"); - UnmatchedCommand parsedCommand = cmd.getCommand(); - Assertions.assertThat(parsedCommand.alpha).isEqualTo("AAA"); - Assertions.assertThat(parsedCommand.beta).isNull(); - Assertions.assertThat(parsedCommand.remainder).containsExactly("More"); - Assertions.assertThat(parsedCommand.unmatched).containsExactly("-x"); - } - - private void testI18s() { - CommandLine cmdOne = new CommandLine(LocalizedCommandOne.class, factory); - Assertions.assertThat(cmdOne.getCommandSpec().findOption("first").description()).containsExactly("First in CommandOne"); - - CommandLine cmdTwo = new CommandLine(LocalizedCommandTwo.class, factory); - Assertions.assertThat(cmdTwo.getCommandSpec().findOption("first").description()).containsExactly("First in CommandTwo"); - } - - private void testCompletionReflection() { - CommandLine completionReflectionCommand = new CommandLine(CompletionReflectionCommand.class, factory); - completionReflectionCommand.execute("one"); - } - - private void testDefaultValueProvider() { - CommandLine cmd = new CommandLine(DefaultValueProviderCommand.class, factory); - Assertions.assertThat(cmd.execute()).isZero(); - } -} diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TopTestCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TopTestCommand.java new file mode 100644 index 00000000000000..d97ba1b3c65678 --- /dev/null +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TopTestCommand.java @@ -0,0 +1,21 @@ +package io.quarkus.it.picocli; + +import io.quarkus.picocli.runtime.annotations.TopCommand; +import picocli.CommandLine; + +@TopCommand +@CommandLine.Command(name = "test", mixinStandardHelpOptions = true, commandListHeading = "%nCommands:%n", synopsisHeading = "%nUsage: ", optionListHeading = "%nOptions:%n", subcommands = { + CommandUsedAsParent.class, + CompletionReflectionCommand.class, + DefaultValueProviderCommand.class, + DynamicVersionProviderCommand.class, + LocalizedCommandOne.class, + LocalizedCommandTwo.class, + MutuallyExclusiveOptionsCommand.class, + TestCommand.class, + UnmatchedCommand.class, + DynamicProxyInvokerCommand.class, + WithMethodSubCommand.class }) +public class TopTestCommand { + +} diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/UnmatchedCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/UnmatchedCommand.java index 04042ef4da7f50..e7e647dd93b44d 100644 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/UnmatchedCommand.java +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/UnmatchedCommand.java @@ -1,10 +1,12 @@ package io.quarkus.it.picocli; +import java.util.Arrays; import java.util.List; import picocli.CommandLine; -public class UnmatchedCommand { +@CommandLine.Command(name = "unmatched") +public class UnmatchedCommand implements Runnable { @CommandLine.Option(names = "-a") String alpha; @CommandLine.Option(names = "-b") @@ -13,4 +15,12 @@ public class UnmatchedCommand { String[] remainder; @CommandLine.Unmatched List unmatched; + + @Override + public void run() { + System.out.println("-a:" + alpha); + System.out.println("-b:" + beta); + System.out.println("remainder:" + Arrays.toString(remainder)); + System.out.println("unmatched" + unmatched); + } } diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/WithMethodSubCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/WithMethodSubCommand.java index 8f9e643d4097b4..2582e1ce121071 100644 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/WithMethodSubCommand.java +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/WithMethodSubCommand.java @@ -1,19 +1,17 @@ package io.quarkus.it.picocli; -import org.assertj.core.api.Assertions; - import picocli.CommandLine; -@CommandLine.Command +@CommandLine.Command(name = "with-method-sub-command") public class WithMethodSubCommand { @CommandLine.Command void hello(@CommandLine.Option(names = { "-n", "--names" }, description = "Parameter option") String name) { - Assertions.assertThat(name).isEqualTo("World!"); + System.out.println("Hello " + name); } @CommandLine.Command void goodBye(@CommandLine.Mixin NameMixin mixin) { - Assertions.assertThat(mixin.name).isEqualTo("Test?"); + System.out.println("Goodbye " + mixin.name); } } diff --git a/integration-tests/picocli-native/src/main/resources/application.properties b/integration-tests/picocli-native/src/main/resources/application.properties new file mode 100644 index 00000000000000..e7d912c48073b8 --- /dev/null +++ b/integration-tests/picocli-native/src/main/resources/application.properties @@ -0,0 +1,2 @@ +quarkus.log.level=WARN +quarkus.banner.enabled=false \ No newline at end of file diff --git a/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliIT.java b/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliIT.java index 8473b42d491a05..45e389c036dea3 100644 --- a/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliIT.java +++ b/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliIT.java @@ -1,7 +1,7 @@ package io.quarkus.it.picocli; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.main.QuarkusMainIntegrationTest; -@NativeImageTest +@QuarkusMainIntegrationTest public class PicocliIT extends PicocliTest { } diff --git a/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliTest.java b/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliTest.java index 36f699d65aa1f4..43a97fc52c6a20 100644 --- a/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliTest.java +++ b/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliTest.java @@ -1,18 +1,96 @@ package io.quarkus.it.picocli; -import static org.hamcrest.Matchers.is; +import static org.assertj.core.api.Assertions.assertThat; + +import java.net.UnknownHostException; import org.junit.jupiter.api.Test; -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; +import io.quarkus.test.junit.main.Launch; +import io.quarkus.test.junit.main.LaunchResult; +import io.quarkus.test.junit.main.QuarkusMainLauncher; +import io.quarkus.test.junit.main.QuarkusMainTest; -@QuarkusTest +@QuarkusMainTest public class PicocliTest { @Test - public void testCommands() { - RestAssured.when().get("/picocli/test").then().body(is("OK")); + @Launch({ "test-command", "-f", "test.txt", "-f", "test2.txt", "-f", "test3.txt", "-s", "ERROR", "-h", "SOCKS=5.5.5.5", + "-p", "privateValue", "pos1", "pos2" }) + public void testBasicReflection(LaunchResult result) throws UnknownHostException { + assertThat(result.getOutput()) + .contains("-s", "ERROR") + .contains("-p:privateValue") + .contains("-p:privateValue") + .contains("positional:[pos1, pos2]"); + } + + @Test + public void testMethodSubCommand(QuarkusMainLauncher launcher) { + LaunchResult result = launcher.launch("with-method-sub-command", "hello", "-n", "World!"); + assertThat(result.exitCode()).isZero(); + assertThat(result.getOutput()).isEqualTo("Hello World!"); + result = launcher.launch("with-method-sub-command", "goodBye", "-n", "Test?"); + assertThat(result.exitCode()).isZero(); + assertThat(result.getOutput()).isEqualTo("Goodbye Test?"); + } + + @Test + @Launch({ "command-used-as-parent", "-p", "testValue", "child" }) + public void testParentCommand(LaunchResult result) { + assertThat(result.getOutput()).isEqualTo("testValue"); + } + + @Test + @Launch({ "exclusivedemo", "-b", "150" }) + public void testCommandWithArgGroup(LaunchResult result) { + assertThat(result.getOutput()) + .contains("-a:0") + .contains("-b:150") + .contains("-c:0"); + } + + @Test + @Launch({ "dynamic-proxy" }) + public void testDynamicProxy(LaunchResult result) { + assertThat(result.getOutput()).isEqualTo("2007-12-03T10:15:30"); + } + + @Test + @Launch("quarkus") + public void testDynamicVersionProvider(LaunchResult launchResult) { + assertThat(launchResult.getOutput()).contains("quarkus version 1.0"); + } + + @Test + @Launch({ "unmatched", "-x", "-a", "AAA", "More" }) + public void testUnmatched(LaunchResult launchResult) { + assertThat(launchResult.getOutput()) + .contains("-a:AAA") + .contains("-b:null") + .contains("remainder:[More]") + .contains("unmatched[-x]"); + } + + @Test + public void testI18s(QuarkusMainLauncher launcher) { + LaunchResult result = launcher.launch("localized-command-one", "--help"); + assertThat(result.getOutput()) + .contains("First in CommandOne"); + result = launcher.launch("localized-command-two", "--help"); + assertThat(result.getOutput()) + .contains("First in CommandTwo"); } + @Test + @Launch({ "completion-reflection", "test" }) + public void testCompletionReflection() { + + } + + @Test + @Launch("default-value-provider") + public void testDefaultValueProvider(LaunchResult result) { + assertThat(result.getOutput()).isEqualTo("default:default-value"); + } } diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/ArtifactLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/ArtifactLauncher.java index 2b897e1dc1c586..580a24bffcad31 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/ArtifactLauncher.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/ArtifactLauncher.java @@ -12,6 +12,8 @@ public interface ArtifactLauncher extend void start() throws IOException; + LaunchResult runToCompletion(String[] args); + void includeAsSysProps(Map systemProps); boolean listensOnSsl(); @@ -30,11 +32,37 @@ interface InitContext { ArtifactLauncher.InitContext.DevServicesLaunchResult getDevServicesLaunchResult(); - interface DevServicesLaunchResult { + interface DevServicesLaunchResult extends AutoCloseable { Map properties(); String networkId(); + + void close(); + } + } + + class LaunchResult { + final int statusCode; + final byte[] output; + final byte[] stderror; + + public LaunchResult(int statusCode, byte[] output, byte[] stderror) { + this.statusCode = statusCode; + this.output = output; + this.stderror = stderror; + } + + public int getStatusCode() { + return statusCode; + } + + public byte[] getOutput() { + return output; + } + + public byte[] getStderror() { + return stderror; } } } diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java index 25bee7ee66de85..bd118a8e900892 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java @@ -47,6 +47,12 @@ public void init(DockerContainerArtifactLauncher.DockerInitContext initContext) this.pullRequired = initContext.pullRequired(); } + @Override + public LaunchResult runToCompletion(String[] args) { + throw new UnsupportedOperationException("not implemented for docker yet"); + } + + @Override public void start() throws IOException { if (pullRequired) { @@ -86,11 +92,14 @@ public void start() throws IOException { if (devServicesLaunchResult.networkId() != null) { args.add("--net=" + devServicesLaunchResult.networkId()); } - args.addAll(toEnvVar("quarkus.http.port", "" + httpPort)); - args.addAll(toEnvVar("quarkus.http.ssl-port", "" + httpsPort)); - // this won't be correct when using the random port but it's really only used by us for the rest client tests - // in the main module, since those tests hit the application itself - args.addAll(toEnvVar("test.url", TestHTTPResourceManager.getUri())); + + if (DefaultJarLauncher.HTTP_PRESENT) { + args.addAll(toEnvVar("quarkus.http.port", "" + httpPort)); + args.addAll(toEnvVar("quarkus.http.ssl-port", "" + httpsPort)); + // this won't be correct when using the random port but it's really only used by us for the rest client tests + // in the main module, since those tests hit the application itself + args.addAll(toEnvVar("test.url", TestHTTPResourceManager.getUri())); + } if (testProfile != null) { args.addAll(toEnvVar("quarkus.profile", testProfile)); } diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java index c5b0df5c7b765c..92074dcc385be5 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java @@ -9,6 +9,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -18,6 +19,19 @@ public class DefaultJarLauncher implements JarArtifactLauncher { + private static final String VERTX_HTTP_RECORDER = "io.quarkus.vertx.http.runtime.VertxHttpRecorder"; + static boolean HTTP_PRESENT; + + static { + boolean http = true; + try { + Class.forName(VERTX_HTTP_RECORDER); + } catch (ClassNotFoundException e) { + http = false; + } + HTTP_PRESENT = http; + } + private int httpPort; private int httpsPort; private long waitTimeSeconds; @@ -41,6 +55,39 @@ public void init(JarArtifactLauncher.JarInitContext initContext) { } public void start() throws IOException { + start(new String[0], true); + Function startedFunction = createStartedFunction(); + var logFile = PropertyTestUtil.getLogFilePath(); + if (startedFunction != null) { + IntegrationTestStartedNotifier.Result result = waitForStartedFunction(startedFunction, quarkusProcess, + waitTimeSeconds, logFile); + isSsl = result.isSsl(); + } else { + ListeningAddress result = waitForCapturedListeningData(quarkusProcess, logFile, waitTimeSeconds); + updateConfigForPort(result.getPort()); + isSsl = result.isSsl(); + } + } + + @Override + public LaunchResult runToCompletion(String[] args) { + try { + start(args, false); + ProcessReader error = new ProcessReader(quarkusProcess.getErrorStream()); + ProcessReader stdout = new ProcessReader(quarkusProcess.getInputStream()); + Thread t = new Thread(error, "Error stream reader"); + t.start(); + t = new Thread(stdout, "Stdout stream reader"); + t.start(); + byte[] s = stdout.get(); + byte[] e = error.get(); + return new LaunchResult(quarkusProcess.waitFor(), s, e); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public void start(String[] programArgs, boolean handleIo) throws IOException { System.setProperty("test.url", TestHTTPResourceManager.getUri()); @@ -49,11 +96,13 @@ public void start() throws IOException { if (!argLine.isEmpty()) { args.addAll(argLine); } - args.add("-Dquarkus.http.port=" + httpPort); - args.add("-Dquarkus.http.ssl-port=" + httpsPort); - // this won't be correct when using the random port but it's really only used by us for the rest client tests - // in the main module, since those tests hit the application itself - args.add("-Dtest.url=" + TestHTTPResourceManager.getUri()); + if (HTTP_PRESENT) { + args.add("-Dquarkus.http.port=" + httpPort); + args.add("-Dquarkus.http.ssl-port=" + httpsPort); + // this won't be correct when using the random port but it's really only used by us for the rest client tests + // in the main module, since those tests hit the application itself + args.add("-Dtest.url=" + TestHTTPResourceManager.getUri()); + } Path logFile = PropertyTestUtil.getLogFilePath(); args.add("-Dquarkus.log.file.path=" + logFile.toAbsolutePath().toString()); args.add("-Dquarkus.log.file.enable=true"); @@ -65,23 +114,17 @@ public void start() throws IOException { } args.add("-jar"); args.add(jarPath.toAbsolutePath().toString()); + args.addAll(Arrays.asList(programArgs)); System.out.println("Executing \"" + String.join(" ", args) + "\""); Files.deleteIfExists(logFile); Files.createDirectories(logFile.getParent()); - Function startedFunction = createStartedFunction(); - - quarkusProcess = LauncherUtil.launchProcess(args); - if (startedFunction != null) { - IntegrationTestStartedNotifier.Result result = waitForStartedFunction(startedFunction, quarkusProcess, - waitTimeSeconds, logFile); - isSsl = result.isSsl(); + if (handleIo) { + quarkusProcess = LauncherUtil.launchProcess(args); } else { - ListeningAddress result = waitForCapturedListeningData(quarkusProcess, logFile, waitTimeSeconds); - updateConfigForPort(result.getPort()); - isSsl = result.isSsl(); + quarkusProcess = Runtime.getRuntime().exec(args.toArray(new String[0])); } } diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java index 0f95cf6a3778c9..68dcd2df242add 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java @@ -14,6 +14,7 @@ import java.nio.file.Path; import java.security.CodeSource; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -70,7 +71,46 @@ private Supplier createStartedSupplier() { return null; } + @Override + public LaunchResult runToCompletion(String[] args) { + try { + start(args, false); + ProcessReader error = new ProcessReader(quarkusProcess.getErrorStream()); + ProcessReader stdout = new ProcessReader(quarkusProcess.getInputStream()); + Thread t1 = new Thread(error, "Error stream reader"); + t1.start(); + Thread t2 = new Thread(stdout, "Stdout stream reader"); + t2.start(); + t1.join(); + t2.join(); + byte[] s = stdout.get(); + byte[] e = error.get(); + return new LaunchResult(quarkusProcess.waitFor(), s, e); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + public void start() throws IOException { + start(new String[0], true); + + Path logFile = PropertyTestUtil.getLogFilePath(); + Supplier startedSupplier = createStartedSupplier(); // keep the legacy SPI handling + Function startedFunction = createStartedFunction(); + if (startedSupplier != null) { + waitForStartedSupplier(startedSupplier, quarkusProcess, waitTimeSeconds); + } else if (startedFunction != null) { + IntegrationTestStartedNotifier.Result result = waitForStartedFunction(startedFunction, quarkusProcess, + waitTimeSeconds, logFile); + isSsl = result.isSsl(); + } else { + ListeningAddress result = waitForCapturedListeningData(quarkusProcess, logFile, waitTimeSeconds); + updateConfigForPort(result.getPort()); + isSsl = result.isSsl(); + } + } + + public void start(String[] programArgs, boolean handleIo) throws IOException { System.setProperty("test.url", TestHTTPResourceManager.getUri()); if (nativeImagePath == null) { @@ -81,11 +121,13 @@ public void start() throws IOException { if (!argLine.isEmpty()) { args.addAll(argLine); } - args.add("-Dquarkus.http.port=" + httpPort); - args.add("-Dquarkus.http.ssl-port=" + httpsPort); - // this won't be correct when using the random port but it's really only used by us for the rest client tests - // in the main module, since those tests hit the application itself - args.add("-Dtest.url=" + TestHTTPResourceManager.getUri()); + if (DefaultJarLauncher.HTTP_PRESENT) { + args.add("-Dquarkus.http.port=" + httpPort); + args.add("-Dquarkus.http.ssl-port=" + httpsPort); + // this won't be correct when using the random port but it's really only used by us for the rest client tests + // in the main module, since those tests hit the application itself + args.add("-Dtest.url=" + TestHTTPResourceManager.getUri()); + } Path logFile = PropertyTestUtil.getLogFilePath(); args.add("-Dquarkus.log.file.path=" + logFile.toAbsolutePath().toString()); args.add("-Dquarkus.log.file.enable=true"); @@ -95,28 +137,17 @@ public void start() throws IOException { for (Map.Entry e : systemProps.entrySet()) { args.add("-D" + e.getKey() + "=" + e.getValue()); } - + args.addAll(Arrays.asList(programArgs)); System.out.println("Executing \"" + String.join(" ", args) + "\""); Files.deleteIfExists(logFile); Files.createDirectories(logFile.getParent()); - - Supplier startedSupplier = createStartedSupplier(); // keep the legacy SPI handling - Function startedFunction = createStartedFunction(); - - quarkusProcess = launchProcess(args); - - if (startedSupplier != null) { - waitForStartedSupplier(startedSupplier, quarkusProcess, waitTimeSeconds); - } else if (startedFunction != null) { - IntegrationTestStartedNotifier.Result result = waitForStartedFunction(startedFunction, quarkusProcess, - waitTimeSeconds, logFile); - isSsl = result.isSsl(); + if (handleIo) { + quarkusProcess = LauncherUtil.launchProcess(args); } else { - ListeningAddress result = waitForCapturedListeningData(quarkusProcess, logFile, waitTimeSeconds); - updateConfigForPort(result.getPort()); - isSsl = result.isSsl(); + quarkusProcess = Runtime.getRuntime().exec(args.toArray(new String[0])); } + } private void waitForStartedSupplier(Supplier startedSupplier, Process quarkusProcess, long waitTime) { diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/ProcessReader.java b/test-framework/common/src/main/java/io/quarkus/test/common/ProcessReader.java new file mode 100644 index 00000000000000..504d25f12e5aa0 --- /dev/null +++ b/test-framework/common/src/main/java/io/quarkus/test/common/ProcessReader.java @@ -0,0 +1,38 @@ +package io.quarkus.test.common; + +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.util.concurrent.CompletableFuture; + +class ProcessReader implements Runnable { + + private final InputStream inputStream; + private final ByteArrayOutputStream output = new ByteArrayOutputStream(); + private final CompletableFuture result = new CompletableFuture<>(); + + ProcessReader(InputStream inputStream) { + this.inputStream = inputStream; + } + + @Override + public void run() { + byte[] b = new byte[100]; + int i; + try { + while ((i = inputStream.read(b)) > 0) { + output.write(b, 0, i); + } + result.complete(output.toByteArray()); + } catch (Throwable e) { + result.completeExceptionally(e); + } + } + + byte[] get() { + try { + return result.get(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} \ No newline at end of file diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/RestorableSystemProperties.java b/test-framework/common/src/main/java/io/quarkus/test/common/RestorableSystemProperties.java new file mode 100644 index 00000000000000..34ee3996a49dff --- /dev/null +++ b/test-framework/common/src/main/java/io/quarkus/test/common/RestorableSystemProperties.java @@ -0,0 +1,40 @@ +package io.quarkus.test.common; + +import java.io.Closeable; +import java.util.HashMap; +import java.util.Map; + +public class RestorableSystemProperties implements Closeable { + final Map sysPropRestore; + + RestorableSystemProperties(Map sysPropRestore) { + this.sysPropRestore = sysPropRestore; + } + + public static RestorableSystemProperties setProperties(Map props, String... additionalKeysToSave) { + Map sysPropRestore = new HashMap<>(); + for (var i : additionalKeysToSave) { + sysPropRestore.put(i, System.getProperty(i)); + } + for (Map.Entry i : props.entrySet()) { + sysPropRestore.put(i.getKey(), System.getProperty(i.getKey())); + } + for (Map.Entry i : props.entrySet()) { + System.setProperty(i.getKey(), i.getValue()); + } + return new RestorableSystemProperties(sysPropRestore); + } + + @Override + public void close() { + + for (Map.Entry entry : sysPropRestore.entrySet()) { + String val = entry.getValue(); + if (val == null) { + System.clearProperty(entry.getKey()); + } else { + System.setProperty(entry.getKey(), val); + } + } + } +} diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java new file mode 100644 index 00000000000000..20d39eaa8f52e8 --- /dev/null +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java @@ -0,0 +1,198 @@ +package io.quarkus.test.junit; + +import static io.quarkus.test.common.PathTestHelper.getAppClassLocationForTestLocation; +import static io.quarkus.test.common.PathTestHelper.getTestClassesLocation; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayDeque; +import java.util.Collection; +import java.util.Deque; +import java.util.HashMap; +import java.util.Map; +import java.util.stream.Collectors; + +import javax.enterprise.inject.Alternative; + +import org.jboss.jandex.Index; +import org.junit.jupiter.api.extension.ExtensionContext; + +import io.quarkus.bootstrap.BootstrapConstants; +import io.quarkus.bootstrap.app.AugmentAction; +import io.quarkus.bootstrap.app.CuratedApplication; +import io.quarkus.bootstrap.app.QuarkusBootstrap; +import io.quarkus.bootstrap.model.PathsCollection; +import io.quarkus.bootstrap.model.gradle.QuarkusModel; +import io.quarkus.bootstrap.runner.Timing; +import io.quarkus.bootstrap.util.PathsUtils; +import io.quarkus.bootstrap.utils.BuildToolHelper; +import io.quarkus.deployment.dev.testing.CurrentTestApplication; +import io.quarkus.runtime.configuration.ProfileManager; +import io.quarkus.test.common.PathTestHelper; +import io.quarkus.test.common.RestorableSystemProperties; +import io.quarkus.test.common.TestClassIndexer; + +public class AbstractJvmQuarkusTestExtension { + + protected static final String TEST_LOCATION = "test-location"; + protected static final String TEST_CLASS = "test-class"; + + protected ClassLoader originalCl; + + protected static Class quarkusTestProfile; + + //needed for @Nested + protected static final Deque> currentTestClassStack = new ArrayDeque<>(); + + protected PrepareResult createAugmentor(ExtensionContext context, Class profile, + Collection shutdownTasks) throws Exception { + + Class requiredTestClass = context.getRequiredTestClass(); + Path testClassLocation = getTestClassesLocation(requiredTestClass); + final Path appClassLocation = getAppClassLocationForTestLocation(testClassLocation.toString()); + + PathsCollection.Builder rootBuilder = PathsCollection.builder(); + + if (!appClassLocation.equals(testClassLocation)) { + rootBuilder.add(testClassLocation); + // if test classes is a dir, we should also check whether test resources dir exists as a separate dir (gradle) + // TODO: this whole app/test path resolution logic is pretty dumb, it needs be re-worked using proper workspace discovery + final Path testResourcesLocation = PathTestHelper.getResourcesForClassesDirOrNull(testClassLocation, "test"); + if (testResourcesLocation != null) { + rootBuilder.add(testResourcesLocation); + } + } + + originalCl = Thread.currentThread().getContextClassLoader(); + Map sysPropRestore = new HashMap<>(); + sysPropRestore.put(ProfileManager.QUARKUS_TEST_PROFILE_PROP, + System.getProperty(ProfileManager.QUARKUS_TEST_PROFILE_PROP)); + + // clear the test.url system property as the value leaks into the run when using different profiles + System.clearProperty("test.url"); + Map additional = new HashMap<>(); + + QuarkusTestProfile profileInstance = null; + if (profile != null) { + profileInstance = profile.getConstructor().newInstance(); + additional.putAll(profileInstance.getConfigOverrides()); + if (!profileInstance.getEnabledAlternatives().isEmpty()) { + additional.put("quarkus.arc.selected-alternatives", profileInstance.getEnabledAlternatives().stream() + .peek((c) -> { + if (!c.isAnnotationPresent(Alternative.class)) { + throw new RuntimeException( + "Enabled alternative " + c + " is not annotated with @Alternative"); + } + }) + .map(Class::getName).collect(Collectors.joining(","))); + } + if (profileInstance.disableApplicationLifecycleObservers()) { + additional.put("quarkus.arc.test.disable-application-lifecycle-observers", "true"); + } + if (profileInstance.getConfigProfile() != null) { + additional.put(ProfileManager.QUARKUS_TEST_PROFILE_PROP, profileInstance.getConfigProfile()); + } + //we just use system properties for now + //its a lot simpler + shutdownTasks.add(RestorableSystemProperties.setProperties(additional)::close); + } + + final Path projectRoot = Paths.get("").normalize().toAbsolutePath(); + Path outputDir; + try { + // this should work for both maven and gradle + outputDir = projectRoot.resolve(projectRoot.relativize(testClassLocation).getName(0)); + } catch (Exception e) { + // this shouldn't happen since testClassLocation is usually found under the project dir + outputDir = projectRoot; + } + + rootBuilder.add(appClassLocation); + final Path appResourcesLocation = PathTestHelper.getResourcesForClassesDirOrNull(appClassLocation, "main"); + if (appResourcesLocation != null) { + rootBuilder.add(appResourcesLocation); + } + + // If gradle project running directly with IDE + if (System.getProperty(BootstrapConstants.SERIALIZED_TEST_APP_MODEL) == null) { + QuarkusModel model = BuildToolHelper.enableGradleAppModelForTest(projectRoot); + if (model != null) { + final PathsCollection classDirectories = PathsUtils + .toPathsCollection(model.getWorkspace().getMainModule().getSourceSet() + .getSourceDirectories()); + for (Path classes : classDirectories) { + if (Files.exists(classes) && !rootBuilder.contains(classes)) { + rootBuilder.add(classes); + } + } + } + } else if (System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR) != null) { + final String[] sourceDirectories = System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR).split(","); + for (String sourceDirectory : sourceDirectories) { + final Path directory = Paths.get(sourceDirectory); + if (Files.exists(directory) && !rootBuilder.contains(directory)) { + rootBuilder.add(directory); + } + } + } + CuratedApplication curatedApplication; + if (CurrentTestApplication.curatedApplication != null) { + curatedApplication = CurrentTestApplication.curatedApplication; + } else { + final QuarkusBootstrap.Builder runnerBuilder = QuarkusBootstrap.builder() + .setIsolateDeployment(true) + .setMode(QuarkusBootstrap.Mode.TEST); + runnerBuilder.setTargetDirectory(outputDir); + runnerBuilder.setProjectRoot(projectRoot); + runnerBuilder.setApplicationRoot(rootBuilder.build()); + + curatedApplication = runnerBuilder + .setTest(true) + .build() + .bootstrap(); + shutdownTasks.add(curatedApplication::close); + } + + if (curatedApplication.getAppModel().getUserDependencies().isEmpty()) { + throw new RuntimeException( + "The tests were run against a directory that does not contain a Quarkus project. Please ensure that the test is configured to use the proper working directory."); + } + + Index testClassesIndex = TestClassIndexer.indexTestClasses(requiredTestClass); + // we need to write the Index to make it reusable from other parts of the testing infrastructure that run in different ClassLoaders + TestClassIndexer.writeIndex(testClassesIndex, requiredTestClass); + + Timing.staticInitStarted(curatedApplication.getBaseRuntimeClassLoader(), + curatedApplication.getQuarkusBootstrap().isAuxiliaryApplication()); + final Map props = new HashMap<>(); + props.put(TEST_LOCATION, testClassLocation); + props.put(TEST_CLASS, requiredTestClass); + quarkusTestProfile = profile; + return new PrepareResult(curatedApplication + .createAugmentor(QuarkusTestExtension.TestBuildChainFunction.class.getName(), props), profileInstance, + curatedApplication); + } + + protected Class getQuarkusTestProfile(ExtensionContext extensionContext) { + TestProfile annotation = extensionContext.getRequiredTestClass().getAnnotation(TestProfile.class); + Class selectedProfile = null; + if (annotation != null) { + selectedProfile = annotation.value(); + } + return selectedProfile; + } + + protected static class PrepareResult { + protected final AugmentAction augmentAction; + protected final QuarkusTestProfile profileInstance; + protected final CuratedApplication curatedApplication; + + public PrepareResult(AugmentAction augmentAction, QuarkusTestProfile profileInstance, + CuratedApplication curatedApplication) { + this.augmentAction = augmentAction; + this.profileInstance = profileInstance; + this.curatedApplication = curatedApplication; + } + } +} diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java index 824d643121e02d..bd01ad32cd1d90 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java @@ -12,6 +12,8 @@ import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.platform.commons.util.StringUtils; +import io.quarkus.test.junit.main.QuarkusMainIntegrationTest; + public class DisabledOnIntegrationTestCondition implements ExecutionCondition { private static final ConditionEvaluationResult ENABLED = ConditionEvaluationResult @@ -43,7 +45,8 @@ private ConditionEvaluationResult check(ExtensionContext Optional disabled = findAnnotation(element, annotationClass); if (disabled.isPresent()) { // Cannot use ExtensionState here because this condition needs to be evaluated before QuarkusTestExtension - boolean it = findAnnotation(context.getTestClass(), QuarkusIntegrationTest.class).isPresent(); + boolean it = findAnnotation(context.getTestClass(), QuarkusIntegrationTest.class).isPresent() + || findAnnotation(context.getTestClass(), QuarkusMainIntegrationTest.class).isPresent(); if (it) { String reason = disabled.map(valueExtractor) .filter(StringUtils::isNotBlank) diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java index 49faa8cffa5fe3..33c9cb3d4a18d4 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java @@ -293,16 +293,19 @@ public void accept(String s, String s2) { } } - return new DefaultDevServicesLaunchResult(propertyMap, networkId); + return new DefaultDevServicesLaunchResult(propertyMap, networkId, curatedApplication); } static class DefaultDevServicesLaunchResult implements ArtifactLauncher.InitContext.DevServicesLaunchResult { private final Map properties; private final String networkId; + private final CuratedApplication curatedApplication; - DefaultDevServicesLaunchResult(Map properties, String networkId) { + DefaultDevServicesLaunchResult(Map properties, String networkId, + CuratedApplication curatedApplication) { this.properties = properties; this.networkId = networkId; + this.curatedApplication = curatedApplication; } public Map properties() { @@ -312,6 +315,11 @@ public Map properties() { public String networkId() { return networkId; } + + @Override + public void close() { + curatedApplication.close(); + } } static Properties readQuarkusArtifactProperties(ExtensionContext context) { diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeTestExtension.java index 3c9ffa9e5881c6..6906a0141f63e0 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeTestExtension.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeTestExtension.java @@ -198,6 +198,11 @@ public Map properties() { public String networkId() { return null; } + + @Override + public void close() { + + } }, System.getProperty("native.image.path"), requiredTestClass)); diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java new file mode 100644 index 00000000000000..0b0460685efb3f --- /dev/null +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java @@ -0,0 +1,234 @@ +package io.quarkus.test.junit; + +import static io.quarkus.test.junit.IntegrationTestUtil.determineBuildOutputDirectory; +import static io.quarkus.test.junit.IntegrationTestUtil.determineTestProfileAndProperties; +import static io.quarkus.test.junit.IntegrationTestUtil.getSysPropsToRestore; +import static io.quarkus.test.junit.IntegrationTestUtil.handleDevServices; +import static io.quarkus.test.junit.IntegrationTestUtil.readQuarkusArtifactProperties; + +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.ServiceLoader; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ParameterContext; +import org.junit.jupiter.api.extension.ParameterResolutionException; +import org.junit.jupiter.api.extension.ParameterResolver; + +import io.quarkus.test.common.ArtifactLauncher; +import io.quarkus.test.common.TestResourceManager; +import io.quarkus.test.junit.launcher.ArtifactLauncherProvider; +import io.quarkus.test.junit.main.Launch; +import io.quarkus.test.junit.main.LaunchResult; +import io.quarkus.test.junit.main.QuarkusMainLauncher; +import io.quarkus.test.junit.util.CloseAdaptor; + +public class QuarkusMainIntegrationTestExtension implements BeforeEachCallback, AfterEachCallback, ParameterResolver { + + public static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace + .create("io.quarkus.test.main.integration"); + + private static Map devServicesProps; + + ArtifactLauncher.InitContext.DevServicesLaunchResult devServicesLaunchResult; + Properties quarkusArtifactProperties; + + LaunchResult result; + + @Override + public void beforeEach(ExtensionContext context) throws Exception { + var launch = context.getRequiredTestMethod().getAnnotation(Launch.class); + if (launch != null) { + String[] arguments = launch.value(); + LaunchResult r = doLaunch(context, arguments); + Assertions.assertEquals(launch.exitCode(), r.exitCode(), "Exit code did not match"); + this.result = r; + } + } + + private LaunchResult doLaunch(ExtensionContext context, String[] arguments) throws Exception { + if (quarkusArtifactProperties == null) { + prepare(context); + } + var result = doProcessStart(context, arguments); + List out = Arrays.asList(new String(result.getOutput(), StandardCharsets.UTF_8).split("\n")); + List err = Arrays.asList(new String(result.getStderror(), StandardCharsets.UTF_8).split("\n")); + return new LaunchResult() { + @Override + public List getOutputStream() { + return out; + } + + @Override + public List getErrorStream() { + return err; + } + + @Override + public int exitCode() { + return result.getStatusCode(); + } + }; + } + + @Override + public void afterEach(ExtensionContext context) throws Exception { + result = null; + } + + private void prepare(ExtensionContext extensionContext) throws Exception { + quarkusArtifactProperties = readQuarkusArtifactProperties(extensionContext); + String artifactType = quarkusArtifactProperties.getProperty("type"); + if (artifactType == null) { + throw new IllegalStateException("Unable to determine the type of artifact created by the Quarkus build"); + } + boolean isDockerLaunch = "jar-container".equals(artifactType) || "native-container".equals(artifactType); + + ArtifactLauncher.InitContext.DevServicesLaunchResult devServicesLaunchResult = handleDevServices(extensionContext, + isDockerLaunch); + devServicesProps = devServicesLaunchResult.properties(); + + ExtensionContext root = extensionContext.getRoot(); + root.getStore(NAMESPACE).put("devServicesLaunchResult", new CloseAdaptor(devServicesLaunchResult)); + } + + private ArtifactLauncher.LaunchResult doProcessStart(ExtensionContext context, String[] args) { + try { + Class profile = IntegrationTestUtil.findProfile(context.getRequiredTestClass()); + TestResourceManager testResourceManager = null; + Map old = new HashMap<>(); + String artifactType = quarkusArtifactProperties.getProperty("type"); + try { + Class requiredTestClass = context.getRequiredTestClass(); + + Map sysPropRestore = getSysPropsToRestore(); + TestProfileAndProperties testProfileAndProperties = determineTestProfileAndProperties(profile, sysPropRestore); + + testResourceManager = new TestResourceManager(requiredTestClass, profile, + Collections.emptyList(), testProfileAndProperties.testProfile != null + && testProfileAndProperties.testProfile.disableGlobalTestResources()); + testResourceManager.init(); + Map additionalProperties = new HashMap<>(testProfileAndProperties.properties); + additionalProperties.putAll(QuarkusMainIntegrationTestExtension.devServicesProps); + Map resourceManagerProps = testResourceManager.start(); + for (Map.Entry i : resourceManagerProps.entrySet()) { + old.put(i.getKey(), System.getProperty(i.getKey())); + if (i.getValue() == null) { + System.clearProperty(i.getKey()); + } else { + System.setProperty(i.getKey(), i.getValue()); + } + } + additionalProperties.putAll(resourceManagerProps); + + ArtifactLauncher launcher = null; + ServiceLoader loader = ServiceLoader.load(ArtifactLauncherProvider.class); + for (ArtifactLauncherProvider launcherProvider : loader) { + if (launcherProvider.supportsArtifactType(artifactType)) { + launcher = launcherProvider.create( + new DefaultArtifactLauncherCreateContext(quarkusArtifactProperties, context, requiredTestClass, + devServicesLaunchResult)); + break; + } + } + if (launcher == null) { + throw new IllegalStateException( + "Artifact type + '" + artifactType + "' is not supported by @QuarkusMainIntegrationTest"); + } + + launcher.includeAsSysProps(additionalProperties); + return launcher.runToCompletion(args); + + } finally { + + for (Map.Entry i : old.entrySet()) { + old.put(i.getKey(), System.getProperty(i.getKey())); + if (i.getValue() == null) { + System.clearProperty(i.getKey()); + } else { + System.setProperty(i.getKey(), i.getValue()); + } + } + if (testResourceManager != null) { + testResourceManager.close(); + } + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) + throws ParameterResolutionException { + Class type = parameterContext.getParameter().getType(); + return type == LaunchResult.class || type == QuarkusMainLauncher.class; + } + + @Override + public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) + throws ParameterResolutionException { + Class type = parameterContext.getParameter().getType(); + if (type == LaunchResult.class) { + return result; + } else if (type == QuarkusMainLauncher.class) { + return new QuarkusMainLauncher() { + @Override + public LaunchResult launch(String... args) { + try { + return doLaunch(extensionContext, args); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + }; + } else { + throw new RuntimeException("Parameter type not supported"); + } + } + + private static class DefaultArtifactLauncherCreateContext implements ArtifactLauncherProvider.CreateContext { + private final Properties quarkusArtifactProperties; + private final ExtensionContext context; + private final Class requiredTestClass; + private final ArtifactLauncher.InitContext.DevServicesLaunchResult devServicesLaunchResult; + + DefaultArtifactLauncherCreateContext(Properties quarkusArtifactProperties, ExtensionContext context, + Class requiredTestClass, ArtifactLauncher.InitContext.DevServicesLaunchResult devServicesLaunchResult) { + this.quarkusArtifactProperties = quarkusArtifactProperties; + this.context = context; + this.requiredTestClass = requiredTestClass; + this.devServicesLaunchResult = devServicesLaunchResult; + } + + @Override + public Properties quarkusArtifactProperties() { + return quarkusArtifactProperties; + } + + @Override + public Path buildOutputDirectory() { + return determineBuildOutputDirectory(context); + } + + @Override + public Class testClass() { + return requiredTestClass; + } + + @Override + public ArtifactLauncher.InitContext.DevServicesLaunchResult devServicesLaunchResult() { + return devServicesLaunchResult; + } + } + +} diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java new file mode 100644 index 00000000000000..8e4a50be2f79a3 --- /dev/null +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java @@ -0,0 +1,189 @@ +package io.quarkus.test.junit; + +import java.io.Closeable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.concurrent.LinkedBlockingDeque; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.AfterAllCallback; +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeAllCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ParameterContext; +import org.junit.jupiter.api.extension.ParameterResolutionException; +import org.junit.jupiter.api.extension.ParameterResolver; + +import io.quarkus.bootstrap.app.StartupAction; +import io.quarkus.deployment.console.ConsoleHelper; +import io.quarkus.deployment.dev.testing.LogCapturingOutputFilter; +import io.quarkus.dev.console.QuarkusConsole; +import io.quarkus.dev.testing.TracingHandler; +import io.quarkus.test.junit.main.Launch; +import io.quarkus.test.junit.main.LaunchResult; +import io.quarkus.test.junit.main.QuarkusMainIntegrationTest; +import io.quarkus.test.junit.main.QuarkusMainLauncher; + +public class QuarkusMainTestExtension extends AbstractJvmQuarkusTestExtension + implements BeforeEachCallback, AfterEachCallback, ParameterResolver, BeforeAllCallback, AfterAllCallback { + + public static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace + .create("io.quarkus.test.main.jvm"); + + private static Map devServicesProps; + + PrepareResult prepareResult; + + /** + * The result from an {@link Launch} test + */ + LaunchResult result; + + @Override + public void beforeEach(ExtensionContext context) throws Exception { + if (isIntegrationTest(context.getRequiredTestClass())) { + return; + } + + ensurePrepared(context); + var launch = context.getRequiredTestMethod().getAnnotation(Launch.class); + if (launch != null) { + String[] arguments = launch.value(); + LaunchResult r = doLaunch(context, arguments); + Assertions.assertEquals(launch.exitCode(), r.exitCode(), + "Exit code did not match, output: " + r.getOutput() + " " + r.getErrorOutput()); + this.result = r; + } + } + + private void ensurePrepared(ExtensionContext context) throws Exception { + Class profile = getQuarkusTestProfile(context); + if (prepareResult == null) { + final LinkedBlockingDeque shutdownTasks = new LinkedBlockingDeque<>(); + PrepareResult result = createAugmentor(context, profile, shutdownTasks); + prepareResult = result; + } + } + + private LaunchResult doLaunch(ExtensionContext context, String[] arguments) throws Exception { + ensurePrepared(context); + ConsoleHelper.installRedirects(); + LogCapturingOutputFilter filter = new LogCapturingOutputFilter(prepareResult.curatedApplication, false, false, + () -> true); + QuarkusConsole.addOutputFilter(filter); + try { + var result = doJavaStart(context, arguments); + //merge all the output into one, strip ansi, then split into lines + List out = Arrays + .asList(String.join("", filter.captureOutput()).replaceAll("\\u001B\\[(.*?)[a-zA-Z]", "").split("\n")); + List err = Arrays + .asList(String.join("", filter.captureErrorOutput()).replaceAll("\\u001B\\[(.*?)[a-zA-Z]", "").split("\n")); + return new LaunchResult() { + @Override + public List getOutputStream() { + return out; + } + + @Override + public List getErrorStream() { + return err; + } + + @Override + public int exitCode() { + return result; + } + }; + } finally { + QuarkusConsole.removeOutputFilter(filter); + Thread.currentThread().setContextClassLoader(originalCl); + } + } + + @Override + public void afterEach(ExtensionContext context) throws Exception { + result = null; + } + + private int doJavaStart(ExtensionContext context, String[] arguments) throws Exception { + TracingHandler.quarkusStarting(); + Closeable testResourceManager = null; + try { + StartupAction startupAction = prepareResult.augmentAction.createInitialRuntimeApplication(); + Thread.currentThread().setContextClassLoader(startupAction.getClassLoader()); + return startupAction.runMainClassBlocking(arguments); + } catch (Throwable e) { + + try { + if (testResourceManager != null) { + testResourceManager.close(); + } + } catch (Exception ex) { + e.addSuppressed(ex); + } + throw e; + } finally { + if (originalCl != null) { + Thread.currentThread().setContextClassLoader(originalCl); + } + } + } + + @Override + public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) + throws ParameterResolutionException { + if (isIntegrationTest(extensionContext.getRequiredTestClass())) { + return false; + } + Class type = parameterContext.getParameter().getType(); + return type == LaunchResult.class || type == QuarkusMainLauncher.class; + } + + @Override + public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) + throws ParameterResolutionException { + Class type = parameterContext.getParameter().getType(); + if (type == LaunchResult.class) { + return result; + } else if (type == QuarkusMainLauncher.class) { + return new QuarkusMainLauncher() { + @Override + public LaunchResult launch(String... args) { + try { + return doLaunch(extensionContext, args); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + }; + } else { + throw new RuntimeException("Parameter type not supported"); + } + } + + private boolean isIntegrationTest(Class clazz) { + for (Class i : currentTestClassStack) { + if (i.isAnnotationPresent(QuarkusMainIntegrationTest.class)) { + return true; + } + } + if (clazz.isAnnotationPresent(QuarkusMainIntegrationTest.class)) { + return true; + } + return false; + } + + @Override + public void afterAll(ExtensionContext context) throws Exception { + currentTestClassStack.pop(); + } + + @Override + public void beforeAll(ExtensionContext context) throws Exception { + ConsoleHelper.installRedirects(); + currentTestClassStack.push(context.getRequiredTestClass()); + + } +} diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java index fe04bcfcf93e96..de9eeac14d8079 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java @@ -1,7 +1,5 @@ package io.quarkus.test.junit; -import static io.quarkus.test.common.PathTestHelper.getAppClassLocationForTestLocation; -import static io.quarkus.test.common.PathTestHelper.getTestClassesLocation; import static io.quarkus.test.junit.IntegrationTestUtil.getAdditionalTestResources; import java.io.Closeable; @@ -12,16 +10,11 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.AbstractMap; -import java.util.ArrayDeque; import java.util.ArrayList; -import java.util.Deque; -import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -42,9 +35,6 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.regex.Pattern; -import java.util.stream.Collectors; - -import javax.enterprise.inject.Alternative; import org.eclipse.microprofile.config.spi.ConfigProviderResolver; import org.jboss.jandex.AnnotationInstance; @@ -71,19 +61,11 @@ import org.junit.jupiter.api.extension.TestInstantiationException; import org.opentest4j.TestAbortedException; -import io.quarkus.bootstrap.BootstrapConstants; import io.quarkus.bootstrap.app.AugmentAction; -import io.quarkus.bootstrap.app.CuratedApplication; -import io.quarkus.bootstrap.app.QuarkusBootstrap; import io.quarkus.bootstrap.app.RunningQuarkusApplication; import io.quarkus.bootstrap.app.StartupAction; import io.quarkus.bootstrap.classloading.ClassPathElement; import io.quarkus.bootstrap.classloading.QuarkusClassLoader; -import io.quarkus.bootstrap.model.PathsCollection; -import io.quarkus.bootstrap.model.gradle.QuarkusModel; -import io.quarkus.bootstrap.runner.Timing; -import io.quarkus.bootstrap.util.PathsUtils; -import io.quarkus.bootstrap.utils.BuildToolHelper; import io.quarkus.builder.BuildChainBuilder; import io.quarkus.builder.BuildContext; import io.quarkus.builder.BuildStep; @@ -91,7 +73,6 @@ import io.quarkus.deployment.builditem.TestAnnotationBuildItem; import io.quarkus.deployment.builditem.TestClassBeanBuildItem; import io.quarkus.deployment.builditem.TestClassPredicateBuildItem; -import io.quarkus.deployment.dev.testing.CurrentTestApplication; import io.quarkus.dev.testing.TracingHandler; import io.quarkus.runtime.LaunchMode; import io.quarkus.runtime.configuration.DurationConverter; @@ -118,14 +99,12 @@ import io.quarkus.test.junit.internal.DeepClone; import io.quarkus.test.junit.internal.SerializationWithXStreamFallbackDeepClone; -public class QuarkusTestExtension +public class QuarkusTestExtension extends AbstractJvmQuarkusTestExtension implements BeforeEachCallback, AfterEachCallback, BeforeAllCallback, InvocationInterceptor, AfterAllCallback, ParameterResolver, ExecutionCondition { private static final Logger log = Logger.getLogger(QuarkusTestExtension.class); - protected static final String TEST_LOCATION = "test-location"; - protected static final String TEST_CLASS = "test-class"; public static final String QUARKUS_TEST_HANG_DETECTION_TIMEOUT = "quarkus.test.hang-detection-timeout"; public static final String IO_QUARKUS_TESTING_TYPE = "io.quarkus.testing.type"; @@ -135,7 +114,6 @@ public class QuarkusTestExtension private static Object actualTestInstance; // needed for @Nested private static Object outerInstance; - private static ClassLoader originalCl; private static RunningQuarkusApplication runningQuarkusApplication; private static Pattern clonePattern; private static Throwable firstException; //if this is set then it will be thrown from the very first test that is run, the rest are aborted @@ -146,7 +124,6 @@ public class QuarkusTestExtension private static List afterEachCallbacks; private static List afterAllCallbacks; private static Class quarkusTestMethodContextClass; - private static Class quarkusTestProfile; private static boolean hasPerTestResources; private static Class currentJUnitTestClass; private static List, String>> testHttpEndpointProviders; @@ -154,8 +131,6 @@ public class QuarkusTestExtension private static List testMethodInvokers; private static DeepClone deepClone; - //needed for @Nested - private static final Deque> currentTestClassStack = new ArrayDeque<>(); private static volatile ScheduledExecutorService hangDetectionExecutor; private static volatile Duration hangTimeout; private static volatile ScheduledFuture hangTaskKey; @@ -231,137 +206,15 @@ public Thread newThread(Runnable r) { hangTaskKey = hangDetectionExecutor.schedule(hangDetectionTask, hangTimeout.toMillis(), TimeUnit.MILLISECONDS); quarkusTestProfile = profile; - currentJUnitTestClass = context.getRequiredTestClass(); + Class requiredTestClass = context.getRequiredTestClass(); + currentJUnitTestClass = requiredTestClass; Closeable testResourceManager = null; try { final LinkedBlockingDeque shutdownTasks = new LinkedBlockingDeque<>(); + PrepareResult result = createAugmentor(context, profile, shutdownTasks); + AugmentAction augmentAction = result.augmentAction; + QuarkusTestProfile profileInstance = result.profileInstance; - Class requiredTestClass = context.getRequiredTestClass(); - Path testClassLocation = getTestClassesLocation(requiredTestClass); - final Path appClassLocation = getAppClassLocationForTestLocation(testClassLocation.toString()); - - PathsCollection.Builder rootBuilder = PathsCollection.builder(); - - if (!appClassLocation.equals(testClassLocation)) { - rootBuilder.add(testClassLocation); - // if test classes is a dir, we should also check whether test resources dir exists as a separate dir (gradle) - // TODO: this whole app/test path resolution logic is pretty dumb, it needs be re-worked using proper workspace discovery - final Path testResourcesLocation = PathTestHelper.getResourcesForClassesDirOrNull(testClassLocation, "test"); - if (testResourcesLocation != null) { - rootBuilder.add(testResourcesLocation); - } - } - - originalCl = Thread.currentThread().getContextClassLoader(); - Map sysPropRestore = new HashMap<>(); - sysPropRestore.put(ProfileManager.QUARKUS_TEST_PROFILE_PROP, - System.getProperty(ProfileManager.QUARKUS_TEST_PROFILE_PROP)); - - // clear the test.url system property as the value leaks into the run when using different profiles - System.clearProperty("test.url"); - - QuarkusTestProfile profileInstance = null; - if (profile != null) { - profileInstance = profile.getConstructor().newInstance(); - Map additional = new HashMap<>(profileInstance.getConfigOverrides()); - if (!profileInstance.getEnabledAlternatives().isEmpty()) { - additional.put("quarkus.arc.selected-alternatives", profileInstance.getEnabledAlternatives().stream() - .peek((c) -> { - if (!c.isAnnotationPresent(Alternative.class)) { - throw new RuntimeException( - "Enabled alternative " + c + " is not annotated with @Alternative"); - } - }) - .map(Class::getName).collect(Collectors.joining(","))); - } - if (profileInstance.disableApplicationLifecycleObservers()) { - additional.put("quarkus.arc.test.disable-application-lifecycle-observers", "true"); - } - if (profileInstance.getConfigProfile() != null) { - System.setProperty(ProfileManager.QUARKUS_TEST_PROFILE_PROP, profileInstance.getConfigProfile()); - } - //we just use system properties for now - //its a lot simpler - for (Map.Entry i : additional.entrySet()) { - sysPropRestore.put(i.getKey(), System.getProperty(i.getKey())); - } - for (Map.Entry i : additional.entrySet()) { - System.setProperty(i.getKey(), i.getValue()); - } - } - - final Path projectRoot = Paths.get("").normalize().toAbsolutePath(); - Path outputDir; - try { - // this should work for both maven and gradle - outputDir = projectRoot.resolve(projectRoot.relativize(testClassLocation).getName(0)); - } catch (Exception e) { - // this shouldn't happen since testClassLocation is usually found under the project dir - outputDir = projectRoot; - } - - rootBuilder.add(appClassLocation); - final Path appResourcesLocation = PathTestHelper.getResourcesForClassesDirOrNull(appClassLocation, "main"); - if (appResourcesLocation != null) { - rootBuilder.add(appResourcesLocation); - } - - // If gradle project running directly with IDE - if (System.getProperty(BootstrapConstants.SERIALIZED_TEST_APP_MODEL) == null) { - QuarkusModel model = BuildToolHelper.enableGradleAppModelForTest(projectRoot); - if (model != null) { - final PathsCollection classDirectories = PathsUtils - .toPathsCollection(model.getWorkspace().getMainModule().getSourceSet() - .getSourceDirectories()); - for (Path classes : classDirectories) { - if (Files.exists(classes) && !rootBuilder.contains(classes)) { - rootBuilder.add(classes); - } - } - } - } else if (System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR) != null) { - final String[] sourceDirectories = System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR).split(","); - for (String sourceDirectory : sourceDirectories) { - final Path directory = Paths.get(sourceDirectory); - if (Files.exists(directory) && !rootBuilder.contains(directory)) { - rootBuilder.add(directory); - } - } - } - CuratedApplication curatedApplication; - if (CurrentTestApplication.curatedApplication != null) { - curatedApplication = CurrentTestApplication.curatedApplication; - } else { - final QuarkusBootstrap.Builder runnerBuilder = QuarkusBootstrap.builder() - .setIsolateDeployment(true) - .setMode(QuarkusBootstrap.Mode.TEST); - runnerBuilder.setTargetDirectory(outputDir); - runnerBuilder.setProjectRoot(projectRoot); - runnerBuilder.setApplicationRoot(rootBuilder.build()); - - curatedApplication = runnerBuilder - .setTest(true) - .build() - .bootstrap(); - shutdownTasks.add(curatedApplication::close); - } - - if (curatedApplication.getAppModel().getUserDependencies().isEmpty()) { - throw new RuntimeException( - "The tests were run against a directory that does not contain a Quarkus project. Please ensure that the test is configured to use the proper working directory."); - } - - Index testClassesIndex = TestClassIndexer.indexTestClasses(requiredTestClass); - // we need to write the Index to make it reusable from other parts of the testing infrastructure that run in different ClassLoaders - TestClassIndexer.writeIndex(testClassesIndex, requiredTestClass); - - Timing.staticInitStarted(curatedApplication.getBaseRuntimeClassLoader(), - curatedApplication.getQuarkusBootstrap().isAuxiliaryApplication()); - final Map props = new HashMap<>(); - props.put(TEST_LOCATION, testClassLocation); - props.put(TEST_CLASS, requiredTestClass); - AugmentAction augmentAction = curatedApplication - .createAugmentor(TestBuildChainFunction.class.getName(), props); testHttpEndpointProviders = TestHttpEndpointProvider.load(); StartupAction startupAction = augmentAction.createInitialRuntimeApplication(); Thread.currentThread().setContextClassLoader(startupAction.getClassLoader()); @@ -420,14 +273,6 @@ public void close() throws IOException { } } finally { try { - for (Map.Entry entry : sysPropRestore.entrySet()) { - String val = entry.getValue(); - if (val == null) { - System.clearProperty(entry.getKey()); - } else { - System.setProperty(entry.getKey(), val); - } - } tm.close(); } finally { GroovyCacheCleaner.clearGroovyCache(); @@ -715,15 +560,6 @@ private ExtensionState ensureStarted(ExtensionContext extensionContext) { return state; } - private Class getQuarkusTestProfile(ExtensionContext extensionContext) { - TestProfile annotation = extensionContext.getRequiredTestClass().getAnnotation(TestProfile.class); - Class selectedProfile = null; - if (annotation != null) { - selectedProfile = annotation.value(); - } - return selectedProfile; - } - private static ClassLoader setCCL(ClassLoader cl) { final Thread thread = Thread.currentThread(); final ClassLoader original = thread.getContextClassLoader(); @@ -862,7 +698,6 @@ public T interceptTestClassConstructor(Invocation invocation, private void initTestState(ExtensionContext extensionContext, ExtensionState state) { try { - Class previousActualTestClass = actualTestClass; actualTestClass = Class.forName(extensionContext.getRequiredTestClass().getName(), true, Thread.currentThread().getContextClassLoader()); outerInstance = null; @@ -1330,7 +1165,7 @@ class FailedCleanup implements ExtensionContext.Store.CloseableResource { @Override public void close() { - resetHangTimeout(); + shutdownHangDetection(); firstException = null; failedBoot = false; ConfigProviderResolver.setInstance(null); diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/Launch.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/Launch.java new file mode 100644 index 00000000000000..ec373bf40b970f --- /dev/null +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/Launch.java @@ -0,0 +1,24 @@ +package io.quarkus.test.junit.main; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotation for {@link QuarkusMainTest} and {@link QuarkusMainIntegrationTest} used to + * + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface Launch { + /** + * The program arguments to launch with + */ + String[] value(); + + /** + * Expected return code + */ + int exitCode() default 0; +} diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/LaunchResult.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/LaunchResult.java new file mode 100644 index 00000000000000..71c62ba23186ea --- /dev/null +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/LaunchResult.java @@ -0,0 +1,25 @@ +package io.quarkus.test.junit.main; + +import java.util.List; + +public interface LaunchResult { + + default String getOutput() { + return String.join("\n", getOutputStream()); + } + + default String getErrorOutput() { + return String.join("\n", getErrorStream()); + } + + default void echoSystemOut() { + System.out.println(getOutput()); + System.out.println(); + } + + List getOutputStream(); + + List getErrorStream(); + + int exitCode(); +} \ No newline at end of file diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainIntegrationTest.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainIntegrationTest.java new file mode 100644 index 00000000000000..cd6746e191e207 --- /dev/null +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainIntegrationTest.java @@ -0,0 +1,32 @@ +package io.quarkus.test.junit.main; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.junit.jupiter.api.extension.ExtendWith; + +import io.quarkus.test.junit.QuarkusMainIntegrationTestExtension; + +/** + * Annotation that indicates that this test should be run on the result of the Quarkus build. + * That means that if a jar was created, that jar is launched using {@code java -jar ...} + * (and thus runs in a separate JVM than the test). + * If instead a native image was created, the that image is launched. + * Finally, if a container image was created during the build, then a new container is created and run. + * + * The standard usage pattern is expected to be a base test class that runs the + * tests using the JVM version of Quarkus, with a subclass that extends the base + * test and is annotated with this annotation to perform the same checks against + * the native image. + * + * Injection of beans into a test class using {@code @Inject} is not supported + * in {@code QuarkusMainIntegrationTest}. + */ +@Target(ElementType.TYPE) +@ExtendWith({ QuarkusMainIntegrationTestExtension.class }) +@Retention(RetentionPolicy.RUNTIME) +public @interface QuarkusMainIntegrationTest { + +} diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainLauncher.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainLauncher.java new file mode 100644 index 00000000000000..5a2167e1492f82 --- /dev/null +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainLauncher.java @@ -0,0 +1,7 @@ +package io.quarkus.test.junit.main; + +public interface QuarkusMainLauncher { + + LaunchResult launch(String... args); + +} diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainTest.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainTest.java new file mode 100644 index 00000000000000..62129185deb862 --- /dev/null +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainTest.java @@ -0,0 +1,29 @@ +package io.quarkus.test.junit.main; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.junit.jupiter.api.extension.ExtendWith; + +import io.quarkus.test.junit.QuarkusMainTestExtension; + +/** + * Annotation that indicates that this test should run the Quarkus main method + * inside the current JVM. A new in-memory quarkus application will be generated, + * and will be run to completion. + * + * Injection of beans into a test class using {@code @Inject} is not supported + * in {@code QuarkusMainTest}. + * + * Note that this can be used in conjunction with other {@link io.quarkus.test.junit.QuarkusTest} + * based tests. {@code QuarkusMainTest} is used to check a complete execution, while {@code QuarkusTest} can be + * used to inject components and perform more fine-grained checks. + */ +@Target(ElementType.TYPE) +@ExtendWith({ QuarkusMainTestExtension.class }) +@Retention(RetentionPolicy.RUNTIME) +public @interface QuarkusMainTest { + +} diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/util/CloseAdaptor.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/util/CloseAdaptor.java new file mode 100644 index 00000000000000..5875b535ae6aae --- /dev/null +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/util/CloseAdaptor.java @@ -0,0 +1,17 @@ +package io.quarkus.test.junit.util; + +import org.junit.jupiter.api.extension.ExtensionContext; + +public class CloseAdaptor implements ExtensionContext.Store.CloseableResource { + + final AutoCloseable closeable; + + public CloseAdaptor(AutoCloseable closeable) { + this.closeable = closeable; + } + + @Override + public void close() throws Throwable { + closeable.close(); + } +} From 3d2efdaa195392516174df05c78e013d8965808f Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Thu, 2 Sep 2021 11:13:14 +1000 Subject: [PATCH 120/138] Fix race in continuous testing tests --- .../ContinuousTestingSharedStateListener.java | 54 ++-- .../ContinuousTestingSharedStateManager.java | 266 +++++++++++++----- .../test/ContinuousTestingTestUtils.java | 9 +- 3 files changed, 240 insertions(+), 89 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/ContinuousTestingSharedStateListener.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/ContinuousTestingSharedStateListener.java index 6604230f961b21..85da540feb584b 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/ContinuousTestingSharedStateListener.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/ContinuousTestingSharedStateListener.java @@ -16,17 +16,25 @@ public void listenerRegistered(TestController testController) { @Override public void testsEnabled() { if (lastState == null) { - ContinuousTestingSharedStateManager - .setLastState(new ContinuousTestingSharedStateManager.State( - ContinuousTestingSharedStateManager.getLastState().lastRun, true, false, - 0, 0, 0, 0, - 0, 0, 0, ContinuousTestingSharedStateManager.getLastState().isBrokenOnly, - ContinuousTestingSharedStateManager.getLastState().isTestOutput, - ContinuousTestingSharedStateManager.getLastState().isInstrumentationBasedReload, - ContinuousTestingSharedStateManager.getLastState().isLiveReload)); + ContinuousTestingSharedStateManager.setRunning(true); } else { ContinuousTestingSharedStateManager - .setLastState(lastState); + .setLastState((s) -> { + if (s.getLastRun() > lastState.lastRun) { + //small chance of race, next run already compled + return s.setRunning(true).build(); + } else { + return s.setRunning(true) + .setCurrentFailed(lastState.currentFailed) + .setCurrentSkipped(lastState.currentSkipped) + .setCurrentFailed(lastState.currentFailed) + .setFailed(lastState.failed) + .setSkipped(lastState.skipped) + .setPassed(lastState.passed) + .setRun(lastState.run) + .build(); + } + }); } } @@ -42,19 +50,21 @@ public void testRunStarted(Consumer listenerConsumer) { @Override public void runComplete(TestRunResults testRunResults) { - lastState = new ContinuousTestingSharedStateManager.State(testRunResults.getId(), true, false, - testRunResults.getPassedCount() + - testRunResults.getFailedCount() + - testRunResults.getSkippedCount(), - testRunResults.getPassedCount(), - testRunResults.getFailedCount(), testRunResults.getSkippedCount(), - testRunResults.getCurrentPassedCount(), testRunResults.getCurrentFailedCount(), - testRunResults.getCurrentSkippedCount(), - ContinuousTestingSharedStateManager.getLastState().isBrokenOnly, - ContinuousTestingSharedStateManager.getLastState().isTestOutput, - ContinuousTestingSharedStateManager.getLastState().isInstrumentationBasedReload, - ContinuousTestingSharedStateManager.getLastState().isLiveReload); - ContinuousTestingSharedStateManager.setLastState(lastState); + ContinuousTestingSharedStateManager.setLastState(s -> { + return lastState = s.setLastRun(testRunResults.getId()) + .setInProgress(false) + .setRun(testRunResults.getPassedCount() + + testRunResults.getFailedCount() + + testRunResults.getSkippedCount()) + .setPassed(testRunResults.getPassedCount()) + .setFailed(testRunResults.getFailedCount()) + .setSkipped(testRunResults.getSkippedCount()) + .setCurrentPassed(testRunResults.getCurrentPassedCount()) + .setCurrentFailed(testRunResults.getCurrentFailedCount()) + .setCurrentSkipped(testRunResults.getCurrentSkippedCount()) + .build(); + + }); } @Override diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/testing/ContinuousTestingSharedStateManager.java b/core/devmode-spi/src/main/java/io/quarkus/dev/testing/ContinuousTestingSharedStateManager.java index cc981b36e9009b..5a534ad4c6257a 100644 --- a/core/devmode-spi/src/main/java/io/quarkus/dev/testing/ContinuousTestingSharedStateManager.java +++ b/core/devmode-spi/src/main/java/io/quarkus/dev/testing/ContinuousTestingSharedStateManager.java @@ -2,11 +2,13 @@ import java.util.concurrent.CopyOnWriteArraySet; import java.util.function.Consumer; +import java.util.function.Function; public class ContinuousTestingSharedStateManager { private static final CopyOnWriteArraySet> stateListeners = new CopyOnWriteArraySet<>(); - public static final State INITIAL_STATE = new State(-1, false, false, 0, 0, 0, 0, 0, 0, 0, false, false, false, true); + public static final State INITIAL_STATE = new StateBuilder() + .setLastRun(-1).setIsLiveReload(true).build(); private static volatile State lastState = INITIAL_STATE; public static void addStateListener(Consumer stateListener) { @@ -21,11 +23,15 @@ public static void removeStateListener(Consumer stateListener) { } public static void reset() { - setLastState(INITIAL_STATE); + setLastState((s) -> INITIAL_STATE); } - public static void setLastState(State state) { - lastState = state; + public static void setLastState(Function modifier) { + State state; + synchronized (ContinuousTestingSharedStateManager.class) { + StateBuilder builder = lastState.builder(); + state = lastState = modifier.apply(builder); + } for (var sl : stateListeners) { sl.accept(state); } @@ -36,63 +42,27 @@ public static State getLastState() { } public static void setInProgress(boolean inProgress) { - State state = lastState; - if (state != null) { - setLastState( - new State(state.lastRun, state.running, inProgress, state.run, state.passed, state.failed, state.skipped, - state.currentPassed, state.currentFailed, state.currentSkipped, state.isBrokenOnly, - state.isTestOutput, state.isInstrumentationBasedReload, state.isLiveReload)); - } + setLastState((s) -> s.setInProgress(inProgress).build()); } public static void setRunning(boolean running) { - State state = lastState; - if (state != null) { - setLastState(new State(state.lastRun, running, running && state.inProgress, state.run, state.passed, state.failed, - state.skipped, - state.currentPassed, state.currentFailed, state.currentSkipped, state.isBrokenOnly, state.isTestOutput, - state.isInstrumentationBasedReload, state.isLiveReload)); - } + setLastState((s) -> s.setRunning(running).build()); } public static void setBrokenOnly(boolean brokenOnly) { - State state = lastState; - if (state != null) { - setLastState(new State(state.lastRun, state.running, state.inProgress, state.run, state.passed, state.failed, - state.skipped, - state.currentPassed, state.currentFailed, state.currentSkipped, brokenOnly, state.isTestOutput, - state.isInstrumentationBasedReload, state.isLiveReload)); - } + setLastState((s) -> s.setIsBrokenOnly(brokenOnly).build()); } public static void setTestOutput(boolean testOutput) { - State state = lastState; - if (state != null) { - setLastState(new State(state.lastRun, state.running, state.inProgress, state.run, state.passed, state.failed, - state.skipped, - state.currentPassed, state.currentFailed, state.currentSkipped, state.isBrokenOnly, testOutput, - state.isInstrumentationBasedReload, state.isLiveReload)); - } + setLastState((s) -> s.setIsTestOutput(testOutput).build()); } public static void setInstrumentationBasedReload(boolean instrumentationBasedReload) { - State state = lastState; - if (state != null) { - setLastState(new State(state.lastRun, state.running, state.inProgress, state.run, state.passed, state.failed, - state.skipped, - state.currentPassed, state.currentFailed, state.currentSkipped, state.isBrokenOnly, state.isTestOutput, - instrumentationBasedReload, state.isLiveReload)); - } + setLastState((s) -> s.setIsInstrumentationBasedReload(instrumentationBasedReload).build()); } public static void setLiveReloadEnabled(boolean liveReload) { - State state = lastState; - if (state != null) { - setLastState(new State(state.lastRun, state.running, state.inProgress, state.run, state.passed, state.failed, - state.skipped, - state.currentPassed, state.currentFailed, state.currentSkipped, state.isBrokenOnly, state.isTestOutput, - state.isInstrumentationBasedReload, liveReload)); - } + setLastState((s) -> s.setIsLiveReload(liveReload).build()); } public static class State { @@ -111,23 +81,25 @@ public static class State { public final boolean isInstrumentationBasedReload; public final boolean isLiveReload; - public State(long lastRun, boolean running, boolean inProgress, long run, long passed, long failed, long skipped, - long currentPassed, long currentFailed, long currentSkipped, boolean isBrokenOnly, boolean isTestOutput, - boolean isInstrumentationBasedReload, boolean isLiveReload) { - this.lastRun = lastRun; - this.running = running; - this.inProgress = inProgress; - this.run = run; - this.passed = passed; - this.failed = failed; - this.skipped = skipped; - this.currentPassed = currentPassed; - this.currentFailed = currentFailed; - this.currentSkipped = currentSkipped; - this.isBrokenOnly = isBrokenOnly; - this.isTestOutput = isTestOutput; - this.isInstrumentationBasedReload = isInstrumentationBasedReload; - this.isLiveReload = isLiveReload; + public State(StateBuilder builder) { + this.lastRun = builder.lastRun; + this.running = builder.running; + this.inProgress = builder.inProgress; + this.run = builder.run; + this.passed = builder.passed; + this.failed = builder.failed; + this.skipped = builder.skipped; + this.currentPassed = builder.currentPassed; + this.currentFailed = builder.currentFailed; + this.currentSkipped = builder.currentSkipped; + this.isBrokenOnly = builder.isBrokenOnly; + this.isTestOutput = builder.isTestOutput; + this.isInstrumentationBasedReload = builder.isInstrumentationBasedReload; + this.isLiveReload = builder.isLiveReload; + } + + StateBuilder builder() { + return new StateBuilder(this); } @Override @@ -147,4 +119,172 @@ public String toString() { '}'; } } + + public static class StateBuilder { + + public StateBuilder() { + } + + public StateBuilder(State existing) { + this.lastRun = existing.lastRun; + this.running = existing.running; + this.inProgress = existing.inProgress; + this.run = existing.run; + this.passed = existing.passed; + this.failed = existing.failed; + this.skipped = existing.skipped; + this.currentPassed = existing.currentPassed; + this.currentFailed = existing.currentFailed; + this.currentSkipped = existing.currentSkipped; + this.isBrokenOnly = existing.isBrokenOnly; + this.isTestOutput = existing.isTestOutput; + this.isInstrumentationBasedReload = existing.isInstrumentationBasedReload; + this.isLiveReload = existing.isLiveReload; + } + + long lastRun; + boolean running; + boolean inProgress; + long run; + long passed; + long failed; + long skipped; + long currentPassed; + long currentFailed; + long currentSkipped; + boolean isBrokenOnly; + boolean isTestOutput; + boolean isInstrumentationBasedReload; + boolean isLiveReload; + + public StateBuilder setLastRun(long lastRun) { + this.lastRun = lastRun; + return this; + } + + public StateBuilder setRunning(boolean running) { + this.running = running; + return this; + } + + public StateBuilder setInProgress(boolean inProgress) { + this.inProgress = inProgress; + return this; + } + + public StateBuilder setRun(long run) { + this.run = run; + return this; + } + + public StateBuilder setPassed(long passed) { + this.passed = passed; + return this; + } + + public StateBuilder setFailed(long failed) { + this.failed = failed; + return this; + } + + public StateBuilder setSkipped(long skipped) { + this.skipped = skipped; + return this; + } + + public StateBuilder setCurrentPassed(long currentPassed) { + this.currentPassed = currentPassed; + return this; + } + + public StateBuilder setCurrentFailed(long currentFailed) { + this.currentFailed = currentFailed; + return this; + } + + public StateBuilder setCurrentSkipped(long currentSkipped) { + this.currentSkipped = currentSkipped; + return this; + } + + public StateBuilder setIsBrokenOnly(boolean isBrokenOnly) { + this.isBrokenOnly = isBrokenOnly; + return this; + } + + public StateBuilder setIsTestOutput(boolean isTestOutput) { + this.isTestOutput = isTestOutput; + return this; + } + + public StateBuilder setIsInstrumentationBasedReload(boolean isInstrumentationBasedReload) { + this.isInstrumentationBasedReload = isInstrumentationBasedReload; + return this; + } + + public StateBuilder setIsLiveReload(boolean isLiveReload) { + this.isLiveReload = isLiveReload; + return this; + } + + public long getLastRun() { + return lastRun; + } + + public boolean isRunning() { + return running; + } + + public boolean isInProgress() { + return inProgress; + } + + public long getRun() { + return run; + } + + public long getPassed() { + return passed; + } + + public long getFailed() { + return failed; + } + + public long getSkipped() { + return skipped; + } + + public long getCurrentPassed() { + return currentPassed; + } + + public long getCurrentFailed() { + return currentFailed; + } + + public long getCurrentSkipped() { + return currentSkipped; + } + + public boolean isBrokenOnly() { + return isBrokenOnly; + } + + public boolean isTestOutput() { + return isTestOutput; + } + + public boolean isInstrumentationBasedReload() { + return isInstrumentationBasedReload; + } + + public boolean isLiveReload() { + return isLiveReload; + } + + public ContinuousTestingSharedStateManager.State build() { + return new ContinuousTestingSharedStateManager.State(this); + } + } } diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java index 3fa5c1c3389e88..36197e7d129974 100644 --- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java +++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java @@ -23,14 +23,15 @@ public TestStatus waitForNextCompletion() { public Boolean call() throws Exception { ContinuousTestingSharedStateManager.State ts = ContinuousTestingSharedStateManager.getLastState(); if (ts.lastRun > runToWaitFor) { - throw new RuntimeException( - "Waiting for run " + runToWaitFor + " but run " + ts.lastRun + " has already occurred"); + //sometimes we can run spuriously, because of the way file systems work + //we just roll with it, and take the updated results + runToWaitFor = ts.lastRun; } boolean runComplete = ts.lastRun == runToWaitFor; if (runComplete && ts.inProgress) { //there is a small chance of a race, where changes are picked up twice, due to how filesystems work //this works around it by waiting for the next run - runToWaitFor = ts.lastRun; + runToWaitFor = ts.lastRun + 1; return false; } else if (runComplete) { runToWaitFor++; @@ -40,7 +41,7 @@ public Boolean call() throws Exception { }); } catch (Exception e) { ContinuousTestingSharedStateManager.State ts = ContinuousTestingSharedStateManager.getLastState(); - throw new ConditionTimeoutException("Failed to wait for test run " + runToWaitFor + " " + ts); + throw new ConditionTimeoutException("Failed to wait for test run " + runToWaitFor + " " + ts, e); } var s = ContinuousTestingSharedStateManager.getLastState(); return new TestStatus(s.lastRun, s.running ? s.lastRun + 1 : -1, s.run, s.currentPassed, s.currentFailed, From 8ae4168958839786002133d35a5468c8cc854013 Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Thu, 2 Sep 2021 11:42:06 +1000 Subject: [PATCH 121/138] Change dev mode working directory This will now be the same as surefire, so tests will see the same user.dir for both surefire tests and continuous tests. This is technically a breaking change, but should not really affect the majority of applications. The old behaviour can be restored using ${project.build.directory} in the maven plugin configuration. --- devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java | 4 ++-- .../maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java index c015ef36958b40..fde01050851b84 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java @@ -227,7 +227,7 @@ public class DevMojo extends AbstractMojo { @Parameter(defaultValue = "${project.build.sourceDirectory}") private File sourceDir; - @Parameter(defaultValue = "${project.build.directory}") + @Parameter private File workingDir; @Parameter(defaultValue = "${jvm.args}") @@ -765,7 +765,7 @@ void run() throws Exception { final ProcessBuilder processBuilder = new ProcessBuilder(launcher.args()) .redirectErrorStream(true) .inheritIO() - .directory(workingDir == null ? buildDir : workingDir); + .directory(workingDir == null ? project.getBasedir() : workingDir); if (!environmentVariables.isEmpty()) { processBuilder.environment().putAll(environmentVariables); } diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java index 22e5190d88f323..012b5d4a15cda9 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java @@ -141,7 +141,7 @@ public void testCommandModeAppSystemPropArguments() throws MavenInvocationExcept run(false, "-Dquarkus.args='1 2'"); // Wait until this file exists - final File done = new File(testDir, "target/done.txt"); + final File done = new File(testDir, "done.txt"); await() .pollDelay(1, TimeUnit.SECONDS) .atMost(20, TimeUnit.MINUTES).until(() -> done.exists()); @@ -159,7 +159,7 @@ public void testCommandModeAppPomConfigArguments() throws MavenInvocationExcepti run(false); // Wait until this file exists - final File done = new File(testDir, "target/done.txt"); + final File done = new File(testDir, "done.txt"); await() .pollDelay(1, TimeUnit.SECONDS) .atMost(20, TimeUnit.MINUTES).until(() -> done.exists()); @@ -817,7 +817,7 @@ public void testThatAddingConfigFileWorksCorrectly() throws MavenInvocationExcep @Test public void testThatExternalConfigOverridesConfigInJar() throws MavenInvocationException, IOException { testDir = initProject("projects/classic", "projects/project-classic-external-config"); - File configurationFile = new File(testDir, "target/config/application.properties"); + File configurationFile = new File(testDir, "config/application.properties"); assertThat(configurationFile).doesNotExist(); String uuid = UUID.randomUUID().toString(); From b9359bf26a866ed186d54ba07c7e29fa2cb38188 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Tue, 7 Sep 2021 11:41:38 +0300 Subject: [PATCH 122/138] Make @TestSecurity work correctly with unannotated JAX-RS endpoints security feature The use of `quarkus.security.jaxrs.deny-unannotated-endpoints=true` essentially results in the addition of a `DenyAllInterceptor` to the invocation chain of a JAX-RS endpoint. Because this interceptor did not take into account the `AuthorizationController` (like the `RolesAllowedInterceptor` already does), it would result in endpoints being secured even though security was supposed to be disabled for the specific test. Fixes: #19896 --- docs/src/main/asciidoc/security-authorization.adoc | 2 +- .../runtime/interceptor/DenyAllInterceptor.java | 11 ++++++++++- .../spi/AdditionalSecuredClassesBuildItem.java | 4 +--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/docs/src/main/asciidoc/security-authorization.adoc b/docs/src/main/asciidoc/security-authorization.adoc index 0284e176650057..eae6eaa8444ce6 100644 --- a/docs/src/main/asciidoc/security-authorization.adoc +++ b/docs/src/main/asciidoc/security-authorization.adoc @@ -152,7 +152,7 @@ There are three configuration settings that alter the RBAC Deny behavior: `quarkus.security.jaxrs.deny-unannotated-endpoints=true|false`:: If set to true, the access will be denied for all JAX-RS endpoints by default, so if a JAX-RS endpoint does not have any security annotations -then it will default to `@DenyAll` behaviour. This is useful to ensure you cannot accidently expose an endpoint that is supposed to be secured. Defaults to `false`. +then it will default to `@DenyAll` behaviour. This is useful to ensure you cannot accidentally expose an endpoint that is supposed to be secured. Defaults to `false`. `quarkus.security.jaxrs.default-roles-allowed=role1,role2`:: Defines the default role requirements for unannotated endpoints. The role '**' is a special role that means any authenticated user. This cannot be combined with diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/DenyAllInterceptor.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/DenyAllInterceptor.java index 9b408b7d6c87d0..66f92e3ec14492 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/DenyAllInterceptor.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/DenyAllInterceptor.java @@ -7,6 +7,8 @@ import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; +import io.quarkus.security.spi.runtime.AuthorizationController; + /** * * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com @@ -19,8 +21,15 @@ public class DenyAllInterceptor { @Inject SecurityHandler handler; + @Inject + AuthorizationController controller; + @AroundInvoke public Object intercept(InvocationContext ic) throws Exception { - return handler.handle(ic); + if (controller.isAuthorizationEnabled()) { + return handler.handle(ic); + } else { + return ic.proceed(); + } } } diff --git a/extensions/security/spi/src/main/java/io/quarkus/security/spi/AdditionalSecuredClassesBuildItem.java b/extensions/security/spi/src/main/java/io/quarkus/security/spi/AdditionalSecuredClassesBuildItem.java index 5a1e138548253f..342012156657da 100644 --- a/extensions/security/spi/src/main/java/io/quarkus/security/spi/AdditionalSecuredClassesBuildItem.java +++ b/extensions/security/spi/src/main/java/io/quarkus/security/spi/AdditionalSecuredClassesBuildItem.java @@ -13,10 +13,8 @@ * Contains classes that need to have @DenyAll on all methods that don't have security annotations */ public final class AdditionalSecuredClassesBuildItem extends MultiBuildItem { + public final Collection additionalSecuredClasses; - /** - * The roles alloe - */ public final Optional> rolesAllowed; public AdditionalSecuredClassesBuildItem(Collection additionalSecuredClasses) { From 86ec2161174a5324b4fbc5963cac1a60a491e6cf Mon Sep 17 00:00:00 2001 From: Roberto Cortez Date: Tue, 7 Sep 2021 12:08:58 +0100 Subject: [PATCH 123/138] Document Spring Boot `@ConfigProperties` limitations and recommendations --- docs/src/main/asciidoc/spring-boot-properties.adoc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/spring-boot-properties.adoc b/docs/src/main/asciidoc/spring-boot-properties.adoc index 81c8c1c9dcfcd1..3bb72101b1c614 100644 --- a/docs/src/main/asciidoc/spring-boot-properties.adoc +++ b/docs/src/main/asciidoc/spring-boot-properties.adoc @@ -7,8 +7,11 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc include::./attributes.adoc[] -If you prefer to use Spring Boot `@ConfigurationProperties` annotated class to access application properties instead of a -Quarkus native `@ConfigProperties` or a MicroProfile `@ConfigProperty` approach, you can do that with this extension. +If you prefer to use Spring Boot `@ConfigurationProperties` annotated class to access application properties instead of +a Quarkus native `@ConfigProperties` or a MicroProfile `@ConfigProperty` approach, you can do that with this extension. + +IMPORTANT: Spring Boot `@ConfigurationProperties` has a few limitations. For instance, `Map` injection is not +supported. Consider using link:config-mappings.adoc[Mapping configuration to objects]. == Prerequisites From ab8fa5ea7c6a832556bfa7a2de2bd3ab25ca65d4 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Tue, 7 Sep 2021 12:43:47 +0300 Subject: [PATCH 124/138] Trim container-image configuration values Fixes: #19956 --- .../container/image/deployment/ContainerImageConfig.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java index 457555aad35f1c..986326cfe50c79 100644 --- a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java +++ b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java @@ -6,6 +6,8 @@ import io.quarkus.runtime.annotations.ConfigItem; import io.quarkus.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.ConvertWith; +import io.quarkus.runtime.configuration.TrimmedStringConverter; @ConfigRoot public class ContainerImageConfig { @@ -14,12 +16,14 @@ public class ContainerImageConfig { * The group the container image will be part of */ @ConfigItem(defaultValue = "${user.name}") + @ConvertWith(TrimmedStringConverter.class) public Optional group; /** * The name of the container image. If not set defaults to the application name */ @ConfigItem(defaultValue = "${quarkus.application.name:unset}") + @ConvertWith(TrimmedStringConverter.class) public Optional name; /** @@ -102,6 +106,9 @@ public Optional getEffectiveGroup() { if (group.isPresent()) { String originalGroup = group.get(); if (originalGroup.equals(System.getProperty("user.name"))) { + if (originalGroup.isEmpty()) { + return Optional.empty(); + } return Optional.of(originalGroup.toLowerCase().replace(' ', '-')); } } From d022f20551e7a4fbb409dfb10c4f35778ba87183 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Tue, 7 Sep 2021 14:33:47 +0200 Subject: [PATCH 125/138] Set Kotlin JVM target to 11 for Maven --- .../quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml index 034755124e4b7f..e4b6c73d62bc7a 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml @@ -40,7 +40,7 @@ true - 1.8 + 11 all-open @@ -64,4 +64,4 @@ - \ No newline at end of file + From 2c227722bb898e239f0cc818f66cb50674c3ff34 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Tue, 7 Sep 2021 14:34:05 +0200 Subject: [PATCH 126/138] Do not set Kotlin JVM target to 1.8 for JDK 11+ --- .../quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle index 687990707f1973..2a7e4b6591428e 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle @@ -15,18 +15,10 @@ allOpen { } compileKotlin { - {#if java.version == "11"} kotlinOptions.jvmTarget = JavaVersion.VERSION_11 - {#else} - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8 - {/if} kotlinOptions.javaParameters = true } compileTestKotlin { - {#if java.version == "11"} kotlinOptions.jvmTarget = JavaVersion.VERSION_11 - {#else} - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8 - {/if} } From 32a921f8dec44e07fed72a0190eaa0daff924e7a Mon Sep 17 00:00:00 2001 From: Roberto Cortez Date: Tue, 7 Sep 2021 11:51:50 +0100 Subject: [PATCH 127/138] Improved test for @ConfigMapping constructor injection with override --- .../io/quarkus/arc/test/config/ConfigMappingTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java index 7c19fb0eba2f2e..019633add73fb9 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java @@ -39,6 +39,7 @@ public class ConfigMappingTest { static final QuarkusUnitTest TEST = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addAsResource(new StringAsset("config.my.prop=1234\n" + + "config.override.my.prop=5678\n" + "group.host=localhost\n" + "group.port=8080\n" + "types.int=9\n" + @@ -354,15 +355,22 @@ void hierarchy() { @Dependent public static class ConstructorInjection { private String myProp; + private String overrideProp; @Inject - public ConstructorInjection(@ConfigMapping(prefix = "config") MyConfigMapping myConfigMapping) { + public ConstructorInjection(@ConfigMapping(prefix = "config") MyConfigMapping myConfigMapping, + @ConfigMapping(prefix = "config.override") MyConfigMapping override) { this.myProp = myConfigMapping.myProp(); + this.overrideProp = override.myProp(); } public String getMyProp() { return myProp; } + + public String getOverrideProp() { + return overrideProp; + } } @Inject @@ -371,5 +379,6 @@ public String getMyProp() { @Test void constructorInjection() { assertEquals("1234", constructorInjection.getMyProp()); + assertEquals("5678", constructorInjection.getOverrideProp()); } } From 827aeed925b4807c36b89cd021e4b7f53c845667 Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Tue, 7 Sep 2021 20:57:13 +0200 Subject: [PATCH 128/138] Upgrade to SmallRye OpenAPI 2.1.12 Signed-off-by:Phillip Kruger --- bom/application/pom.xml | 2 +- .../smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 03bd07ed7a113b..4b0ed2ce2a10ab 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -45,7 +45,7 @@ 2.4.4 3.1.1 3.0.1 - 2.1.10 + 2.1.12 1.3.2 2.0.1 5.2.1 diff --git a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java index b8c40f5650d6df..12e0526b51802b 100644 --- a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java +++ b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java @@ -672,7 +672,7 @@ private OpenAPI generateAnnotationModel(IndexView indexView, Capabilities capabi HttpRootPathBuildItem httpRootPathBuildItem, Optional resteasyJaxrsConfig) { Config config = ConfigProvider.getConfig(); - OpenApiConfig openApiConfig = new OpenApiConfigImpl(config); + OpenApiConfig openApiConfig = OpenApiConfigImpl.fromConfig(config); List extensions = new ArrayList<>(); @@ -685,6 +685,7 @@ private OpenAPI generateAnnotationModel(IndexView indexView, Capabilities capabi } } else if (capabilities.isPresent(Capability.RESTEASY_REACTIVE)) { extensions.add(new RESTEasyExtension(indexView)); + openApiConfig.doAllowNakedPathParameter(); Optional maybePath = config.getOptionalValue("quarkus.resteasy-reactive.path", String.class); if (maybePath.isPresent()) { defaultPath = maybePath.get(); From a93629f2713dbd0f8fa924c8e98d3a87a431b011 Mon Sep 17 00:00:00 2001 From: Sergey Beryozkin Date: Wed, 21 Jul 2021 18:52:01 +0100 Subject: [PATCH 129/138] Support for provider-neutral OIDC Dev UI --- .../images/dev-ui-oidc-devconsole-card.png | Bin 0 -> 15469 bytes .../security-openid-connect-dev-services.adoc | 47 +++++- ... => OidcAuthorizationCodePostHandler.java} | 33 ++-- .../devservices/OidcDevConsoleProcessor.java | 146 ++++++++++++++++++ .../devservices/OidcDevServicesBuildItem.java | 4 + ...esUtils.java => OidcDevServicesUtils.java} | 19 +-- ...ndler.java => OidcTestServiceHandler.java} | 31 ++-- .../KeycloakDevConsolePostHandler.java | 21 +-- .../keycloak/KeycloakDevConsoleProcessor.java | 33 ++-- .../KeycloakDevServicesProcessor.java | 5 +- .../resources/dev-templates/embedded.html | 5 +- .../resources/dev-templates/provider.html | 61 ++++---- .../devconsole/DevConsoleOidcSmokeTest.java | 4 +- 13 files changed, 317 insertions(+), 92 deletions(-) create mode 100644 docs/src/main/asciidoc/images/dev-ui-oidc-devconsole-card.png rename extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/{keycloak/KeycloakAuthorizationCodePostHandler.java => OidcAuthorizationCodePostHandler.java} (67%) create mode 100644 extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevConsoleProcessor.java rename extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/{keycloak/KeycloakDevServicesUtils.java => OidcDevServicesUtils.java} (83%) rename extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/{keycloak/KeycloakImplicitGrantPostHandler.java => OidcTestServiceHandler.java} (67%) diff --git a/docs/src/main/asciidoc/images/dev-ui-oidc-devconsole-card.png b/docs/src/main/asciidoc/images/dev-ui-oidc-devconsole-card.png new file mode 100644 index 0000000000000000000000000000000000000000..564bb911f440bdb98ca8b3c3d0c6691ea35c2e5b GIT binary patch literal 15469 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 literal 0 HcmV?d00001 diff --git a/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc b/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc index 1fdd448c0eaa63..be120a9bd8eadd 100644 --- a/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc +++ b/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc @@ -3,18 +3,21 @@ This guide is maintained in the main Quarkus repository and pull requests should be submitted there: https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc //// -= Dev Services for OpenId Connect (OIDC) += Dev Services and UI for OpenId Connect (OIDC) include::./attributes.adoc[] -This guide covers the Dev Services for OpenId Connect (OIDC) Keycloak provider and explains how to support other OpenId Connect providers. +This guide covers the Dev Services and UI for OpenId Connect (OIDC) Keycloak provider and explains how to support Dev Services and UI for other OpenId Connect providers. +It also describes Dev UI for all OpenId Connect providers which have already been started before Quarkus is launched in a dev mode. == Introduction Quarkus introduces an experimental `Dev Services For Keycloak` feature which is enabled by default when the `quarkus-oidc` extension is started in dev mode with `mvn quarkus:dev` and when the integration tests are running in test mode, but only when no `quarkus.oidc.auth-server-url` property is configured. It starts a Keycloak container for both the dev and/or test modes and initializes them by registering the existing Keycloak realm or creating a new realm with the client and users for you to start developing your Quarkus application secured by Keycloak immediately. It will restart the container when the `application.properties` or the realm file changes have been detected. -Additionally, link:dev-ui[Dev UI] available at http://localhost:8080/q/dev[/q/dev] supports this feature with a Keycloak specific page which helps to acquire the tokens from Keycloak and test your Quarkus application. +Additionally, link:dev-ui[Dev UI] available at http://localhost:8080/q/dev[/q/dev] complements this feature with a Dev UI page which helps to acquire the tokens from Keycloak and test your Quarkus application. + +If `quarkus.oidc.auth-server-url` is already set then a generic OpenId Connect Dev Console which can be used with all OpenId Connect providers will be activated, please see <> for more information. == Dev Services for Keycloak @@ -58,6 +61,7 @@ Click on the `Provider: Keycloak` link and you will see a Keycloak page which wi By default the Keycloak page can be used to support the development of a link:security-openid-connect[Quarkus OIDC service application]. +[[keycloak-authorization-code-grant]] ==== Authorization Code Grant If you set `quarkus.keycloak.devservices.grant.type=code` in `applicatin.properties` (this is a default value) then an `authorization_code` grant will be used to acquire both access and ID tokens. Using this grant is recommended to emulate a typical flow where a `Single Page Application` acquires the tokens and uses them to access Quarkus services. @@ -172,13 +176,44 @@ Note that even if you initialize Keycloak from a realm file, it is still needed If you prefer not to have a `Dev Services for Keycloak` container started or do not work with Keycloak then you can also disable this feature with `quarkus.keycloak.devservices.enabled=false` - it will only be necessary if you expect to start `quarkus:dev` without `quarkus.oidc.auth-server-url`. -The main Dev UI page will include an empty `OpenId Connect Card` when `Dev Services for Keycloak` is disabled: +The main Dev UI page will include an empty `OpenId Connect Card` when `Dev Services for Keycloak` is disabled and the `quarkus.oidc.auth-server-url` property +has not been initialized: image::dev-ui-oidc-card.png[alt=Dev UI OpenId Connect Card,role="center"] -== Dev Services Support for other OpenId Connect Providers +If `quarkus.oidc.auth-server-url` is already set then a generic OpenId Connect Dev Console which can be used with all OpenId Connect providers may be activated, please see <> for more information. + +[[dev-ui-all-oidc-providers]] +== Dev UI for all OpenId Connect Providers + +If `quarkus.oidc.auth-server-url` points to an already started OpenId Connect provider (which can be Keycloak or other provider), `quarkus.oidc.auth-server-url` is set to `service` (which is a default value) and at least `quarkus.oidc.client-id` is set then `Dev UI for all OpenId Connect Providers` will be activated. + +Setting `quarkus.oidc.credentials.secret` will mostly likely be required for Keycloak and other providers for the authorization code flow initiated from Dev UI to complete, unless the client identified with `quarkus.oidc.client-id` is configured as a public client in your OpenId Connect provider's administration console. + +Run `mvn`quarkus:dev` and you will see the following message: +[source,shell] +---- +$ mvn quarkus:dev +... +2021-09-07 15:53:42,697 INFO [io.qua.oid.dep.dev.OidcDevConsoleProcessor] (build-41) OIDC Dev Console: discovering the provider metadata at http://localhost:8180/auth/realms/quarkus/.well-known/openid-configuration +... +---- + +If the provider metadata discovery has been successful then, after you open the main link:http://localhost:8080/q/dev[Dev UI page], you will see the `OpenId Connect Card` page linking to `Dev Console`: + +image::dev-ui-oidc-devconsole-card.png[alt=Generic Dev UI OpenId Connect Card,role="center"] + +Follow the link and you'll be able log in to your provider, get the tokens and test the application. The experience will be the same as described in the <> section, where `Dev Services for Keycloak` container has been started, especially if you work with Keycloak (please also pay attention to a `redirect_uri` note in that section). + +If you work with other providers then a Dev UI experience described in the <> section might differ slightly. For example, an access token may not be in a JWT format so it won't be possibe to show its internal content, though all providers should return an ID Token as JWT. + +Some providers such as `Auth0` do not support a standard RP initiated logout so a logout option will also be hidden. + +At the moment `Dev UI for all OpenId Connect Providers` only supports an authorization code grant. More grants may be supported in the future, similarly to how it is done with `Dev Services for Keycloak`. + +== Dev Services and UI Support for other OpenId Connect Providers -Your custom extension would need to extend `quarkus-oidc` only and add the dependencies required to support your provider to the extension's `deployment` module only. +Your custom extension would need to extend `quarkus-oidc` and add the dependencies required to support your provider to the extension's `deployment` module only. The build step dealing with the `Dev Services` should additionally register two runtime properties into the "io.quarkus.quarkus-oidc" namespace: `oidcProviderName` (for example, `Google`) and `oidcProviderUrlBase` (for example: `mycompany.devservices-google`) for the `OpenId Connect Card` to link to the Dev UI page representing your provider, for example: diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakAuthorizationCodePostHandler.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcAuthorizationCodePostHandler.java similarity index 67% rename from extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakAuthorizationCodePostHandler.java rename to extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcAuthorizationCodePostHandler.java index df550d73225cd2..2b9d9b7becf125 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakAuthorizationCodePostHandler.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcAuthorizationCodePostHandler.java @@ -1,10 +1,13 @@ -package io.quarkus.oidc.deployment.devservices.keycloak; +package io.quarkus.oidc.deployment.devservices; + +import java.time.Duration; import org.jboss.logging.Logger; import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler; import io.quarkus.oidc.common.runtime.OidcCommonUtils; import io.vertx.core.MultiMap; +import io.vertx.core.Vertx; import io.vertx.core.http.HttpHeaders; import io.vertx.ext.web.RoutingContext; import io.vertx.mutiny.core.buffer.Buffer; @@ -12,24 +15,32 @@ import io.vertx.mutiny.ext.web.client.HttpResponse; import io.vertx.mutiny.ext.web.client.WebClient; -public class KeycloakAuthorizationCodePostHandler extends DevConsolePostHandler { - private static final Logger LOG = Logger.getLogger(KeycloakAuthorizationCodePostHandler.class); +public class OidcAuthorizationCodePostHandler extends DevConsolePostHandler { + private static final Logger LOG = Logger.getLogger(OidcAuthorizationCodePostHandler.class); + + Vertx vertxInstance; + Duration timeout; + + public OidcAuthorizationCodePostHandler(Vertx vertxInstance, Duration timeout) { + this.vertxInstance = vertxInstance; + this.timeout = timeout; + } @Override protected void handlePostAsync(RoutingContext event, MultiMap form) throws Exception { - WebClient client = KeycloakDevServicesUtils.createWebClient(); - String keycloakUrl = form.get("keycloakUrl") + "/realms/" + form.get("realm") + "/protocol/openid-connect/token"; + WebClient client = OidcDevServicesUtils.createWebClient(vertxInstance); + String tokenUrl = form.get("tokenUrl"); try { - LOG.infof("Using authorization_code grant to get a token from '%s' in realm '%s' with client id '%s'", - keycloakUrl, form.get("realm"), form.get("client")); + LOG.infof("Using authorization_code grant to get a token from '%s' with client id '%s'", + tokenUrl, form.get("client")); - HttpRequest request = client.postAbs(keycloakUrl); + HttpRequest request = client.postAbs(tokenUrl); request.putHeader(HttpHeaders.CONTENT_TYPE.toString(), HttpHeaders.APPLICATION_X_WWW_FORM_URLENCODED.toString()); io.vertx.mutiny.core.MultiMap props = new io.vertx.mutiny.core.MultiMap(MultiMap.caseInsensitiveMultiMap()); props.add("client_id", form.get("client")); - if (form.get("clientSecret") != null) { + if (form.get("clientSecret") != null && !form.get("clientSecret").isBlank()) { props.add("client_secret", form.get("clientSecret")); } props.add("grant_type", "authorization_code"); @@ -38,12 +49,12 @@ protected void handlePostAsync(RoutingContext event, MultiMap form) throws Excep String tokens = request.sendBuffer(OidcCommonUtils.encodeForm(props)).onItem() .transform(resp -> getBodyAsString(resp)) - .await().atMost(KeycloakDevServicesProcessor.capturedDevServicesConfiguration.webClienTimeout); + .await().atMost(timeout); event.put("tokens", tokens); } catch (Throwable t) { - LOG.errorf("Token can not be acquired from Keycloak: %s", t.toString()); + LOG.errorf("Token can not be acquired from OpenId Connect provider: %s", t.toString()); } finally { client.close(); } diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevConsoleProcessor.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevConsoleProcessor.java new file mode 100644 index 00000000000000..c1975727214feb --- /dev/null +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevConsoleProcessor.java @@ -0,0 +1,146 @@ +package io.quarkus.oidc.deployment.devservices; + +import java.time.Duration; + +import org.eclipse.microprofile.config.ConfigProvider; +import org.jboss.logging.Logger; + +import io.quarkus.bootstrap.classloading.QuarkusClassLoader; +import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Consume; +import io.quarkus.deployment.builditem.RuntimeConfigSetupCompleteBuildItem; +import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem; +import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem; +import io.quarkus.oidc.common.runtime.OidcConstants; +import io.quarkus.runtime.configuration.ConfigUtils; +import io.vertx.core.Vertx; +import io.vertx.core.http.HttpHeaders; +import io.vertx.core.json.JsonObject; +import io.vertx.mutiny.core.buffer.Buffer; +import io.vertx.mutiny.ext.web.client.HttpResponse; +import io.vertx.mutiny.ext.web.client.WebClient; + +public class OidcDevConsoleProcessor { + static volatile Vertx vertxInstance; + private static final Logger LOG = Logger.getLogger(OidcDevConsoleProcessor.class); + + private static final String CONFIG_PREFIX = "quarkus.oidc."; + private static final String TENANT_ENABLED_CONFIG_KEY = CONFIG_PREFIX + "tenant-enabled"; + private static final String AUTH_SERVER_URL_CONFIG_KEY = CONFIG_PREFIX + "auth-server-url"; + private static final String APP_TYPE_CONFIG_KEY = CONFIG_PREFIX + "application-type"; + private static final String SERVICE_APP_TYPE = "service"; + private static final String CLIENT_ID_CONFIG_KEY = CONFIG_PREFIX + "client-id"; + private static final String CLIENT_SECRET_CONFIG_KEY = CONFIG_PREFIX + "credentials.secret"; + + @BuildStep(onlyIf = IsDevelopment.class) + @Consume(RuntimeConfigSetupCompleteBuildItem.class) + void prepareOidcDevConsole(BuildProducer console, + BuildProducer devConsoleRoute) { + if (isOidcTenantEnabled() && isAuthServerUrlSet() && isClientIdSet() && isServiceAuthType()) { + + if (vertxInstance == null) { + vertxInstance = Vertx.vertx(); + + Runnable closeTask = new Runnable() { + @Override + public void run() { + if (vertxInstance != null) { + try { + vertxInstance.close(); + } catch (Throwable t) { + LOG.error("Failed to close Vertx instance", t); + } + } + vertxInstance = null; + } + }; + QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader(); + ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask); + Thread closeHookThread = new Thread(closeTask, "OIDC DevConsole Vertx close thread"); + Runtime.getRuntime().addShutdownHook(closeHookThread); + ((QuarkusClassLoader) cl.parent()).addCloseTask(new Runnable() { + @Override + public void run() { + Runtime.getRuntime().removeShutdownHook(closeHookThread); + } + }); + } + + String authServerUrl = getConfigProperty(AUTH_SERVER_URL_CONFIG_KEY); + JsonObject metadata = discoverMetadata(authServerUrl); + if (metadata == null) { + return; + } + if (authServerUrl.contains("/realms/")) { + console.produce(new DevConsoleTemplateInfoBuildItem("keycloakAdminUrl", + authServerUrl.substring(0, authServerUrl.indexOf("/realms/")))); + } + console.produce(new DevConsoleTemplateInfoBuildItem("oidcApplicationType", SERVICE_APP_TYPE)); + console.produce(new DevConsoleTemplateInfoBuildItem("clientId", getConfigProperty(CLIENT_ID_CONFIG_KEY))); + console.produce(new DevConsoleTemplateInfoBuildItem("clientSecret", getClientSecret())); + + console.produce(new DevConsoleTemplateInfoBuildItem("tokenUrl", metadata.getString("token_endpoint"))); + console.produce( + new DevConsoleTemplateInfoBuildItem("authorizationUrl", metadata.getString("authorization_endpoint"))); + if (metadata.containsKey("end_session_endpoint")) { + console.produce(new DevConsoleTemplateInfoBuildItem("logoutUrl", metadata.getString("end_session_endpoint"))); + } + console.produce(new DevConsoleTemplateInfoBuildItem("oidcGrantType", "code")); + + devConsoleRoute.produce(new DevConsoleRouteBuildItem("testServiceWithToken", "POST", + new OidcTestServiceHandler(vertxInstance, Duration.ofSeconds(3)))); + devConsoleRoute.produce(new DevConsoleRouteBuildItem("exchangeCodeForTokens", "POST", + new OidcAuthorizationCodePostHandler(vertxInstance, Duration.ofSeconds(3)))); + } + } + + private JsonObject discoverMetadata(String authServerUrl) { + WebClient client = OidcDevServicesUtils.createWebClient(vertxInstance); + try { + String metadataUrl = authServerUrl + OidcConstants.WELL_KNOWN_CONFIGURATION; + LOG.infof("OIDC Dev Console: discovering the provider metadata at %s", metadataUrl); + + HttpResponse resp = client.getAbs(metadataUrl) + .putHeader(HttpHeaders.ACCEPT.toString(), "application/json").send().await().indefinitely(); + if (resp.statusCode() == 200) { + return resp.bodyAsJsonObject(); + } else { + LOG.errorf("OIDC metadata discovery failed: %s", resp.bodyAsString()); + return null; + } + } catch (Throwable t) { + LOG.errorf("OIDC metadata discovery failed: %s", t.toString()); + return null; + } finally { + client.close(); + } + } + + private String getConfigProperty(String name) { + return ConfigProvider.getConfig().getValue(name, String.class); + } + + private static boolean isOidcTenantEnabled() { + return ConfigProvider.getConfig().getOptionalValue(TENANT_ENABLED_CONFIG_KEY, Boolean.class).orElse(true); + } + + private static boolean isClientIdSet() { + return ConfigUtils.isPropertyPresent(CLIENT_ID_CONFIG_KEY); + } + + private static String getClientSecret() { + return ConfigProvider.getConfig().getOptionalValue(CLIENT_SECRET_CONFIG_KEY, String.class).orElse(""); + } + + private static boolean isAuthServerUrlSet() { + return ConfigUtils.isPropertyPresent(AUTH_SERVER_URL_CONFIG_KEY); + } + + private boolean isServiceAuthType() { + return SERVICE_APP_TYPE.equals( + ConfigProvider.getConfig().getOptionalValue(APP_TYPE_CONFIG_KEY, String.class).orElse(SERVICE_APP_TYPE)); + } + +} diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesBuildItem.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesBuildItem.java index 78a7c59e677f3b..6fafbb817a38cb 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesBuildItem.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesBuildItem.java @@ -2,6 +2,10 @@ import io.quarkus.builder.item.SimpleBuildItem; +/** + * Marker build item which indicates that Dev Services for OIDC are provided by another extension. + * Dev Services for Keycloak will be disabled if this item is detected. + */ public class OidcDevServicesBuildItem extends SimpleBuildItem { } diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesUtils.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesUtils.java similarity index 83% rename from extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesUtils.java rename to extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesUtils.java index 5fb008965ea2b1..5666973d58bf3f 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesUtils.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesUtils.java @@ -1,9 +1,10 @@ -package io.quarkus.oidc.deployment.devservices.keycloak; +package io.quarkus.oidc.deployment.devservices; import java.time.Duration; import io.quarkus.oidc.common.runtime.OidcCommonUtils; import io.vertx.core.MultiMap; +import io.vertx.core.Vertx; import io.vertx.core.http.HttpHeaders; import io.vertx.core.json.JsonObject; import io.vertx.mutiny.core.buffer.Buffer; @@ -11,23 +12,23 @@ import io.vertx.mutiny.ext.web.client.HttpResponse; import io.vertx.mutiny.ext.web.client.WebClient; -public final class KeycloakDevServicesUtils { - private KeycloakDevServicesUtils() { +public final class OidcDevServicesUtils { + private OidcDevServicesUtils() { } - public static WebClient createWebClient() { - return WebClient.create(new io.vertx.mutiny.core.Vertx(KeycloakDevServicesProcessor.vertxInstance)); + public static WebClient createWebClient(Vertx vertx) { + return WebClient.create(new io.vertx.mutiny.core.Vertx(vertx)); } public static String getPasswordAccessToken(WebClient client, - String keycloakUrl, + String tokenUrl, String clientId, String clientSecret, String userName, String userPassword, Duration timeout) throws Exception { - HttpRequest request = client.postAbs(keycloakUrl); + HttpRequest request = client.postAbs(tokenUrl); request.putHeader(HttpHeaders.CONTENT_TYPE.toString(), HttpHeaders.APPLICATION_X_WWW_FORM_URLENCODED.toString()); io.vertx.mutiny.core.MultiMap props = new io.vertx.mutiny.core.MultiMap(MultiMap.caseInsensitiveMultiMap()); @@ -45,11 +46,11 @@ public static String getPasswordAccessToken(WebClient client, } public static String getClientCredAccessToken(WebClient client, - String keycloakUrl, + String tokenUrl, String clientId, String clientSecret, Duration timeout) throws Exception { - HttpRequest request = client.postAbs(keycloakUrl); + HttpRequest request = client.postAbs(tokenUrl); request.putHeader(HttpHeaders.CONTENT_TYPE.toString(), HttpHeaders.APPLICATION_X_WWW_FORM_URLENCODED.toString()); io.vertx.mutiny.core.MultiMap props = new io.vertx.mutiny.core.MultiMap(MultiMap.caseInsensitiveMultiMap()); diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakImplicitGrantPostHandler.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcTestServiceHandler.java similarity index 67% rename from extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakImplicitGrantPostHandler.java rename to extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcTestServiceHandler.java index 6e57f35b85b4dd..6f578d6b9c90ef 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakImplicitGrantPostHandler.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcTestServiceHandler.java @@ -1,28 +1,33 @@ -package io.quarkus.oidc.deployment.devservices.keycloak; +package io.quarkus.oidc.deployment.devservices; + +import java.time.Duration; import org.jboss.logging.Logger; import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler; import io.vertx.core.MultiMap; +import io.vertx.core.Vertx; import io.vertx.core.http.HttpHeaders; import io.vertx.ext.web.RoutingContext; import io.vertx.mutiny.ext.web.client.WebClient; -public class KeycloakImplicitGrantPostHandler extends DevConsolePostHandler { - private static final Logger LOG = Logger.getLogger(KeycloakImplicitGrantPostHandler.class); +public class OidcTestServiceHandler extends DevConsolePostHandler { + private static final Logger LOG = Logger.getLogger(OidcTestServiceHandler.class); + + Vertx vertxInstance; + Duration timeout; + + public OidcTestServiceHandler(Vertx vertxInstance, Duration timeout) { + this.vertxInstance = vertxInstance; + this.timeout = timeout; + } @Override protected void handlePostAsync(RoutingContext event, MultiMap form) throws Exception { - WebClient client = KeycloakDevServicesUtils.createWebClient(); + WebClient client = OidcDevServicesUtils.createWebClient(vertxInstance); try { - String token = form.get("token"); - - LOG.infof("Test token: %s", token); - LOG.infof("Sending token to '%s'", form.get("serviceUrl")); - testServiceInternal(event, client, form.get("serviceUrl"), token); - } catch (Throwable t) { - LOG.errorf("Token can not be acquired from Keycloak: %s", t.toString()); + testServiceInternal(event, client, form.get("serviceUrl"), form.get("token")); } finally { client.close(); } @@ -30,9 +35,11 @@ protected void handlePostAsync(RoutingContext event, MultiMap form) throws Excep private void testServiceInternal(RoutingContext event, WebClient client, String serviceUrl, String token) { try { + LOG.infof("Test token: %s", token); + LOG.infof("Sending token to '%s'", serviceUrl); int statusCode = client.getAbs(serviceUrl) .putHeader(HttpHeaders.AUTHORIZATION.toString(), "Bearer " + token).send().await() - .atMost(KeycloakDevServicesProcessor.capturedDevServicesConfiguration.webClienTimeout) + .atMost(timeout) .statusCode(); LOG.infof("Result: %d", statusCode); event.put("result", String.valueOf(statusCode)); diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsolePostHandler.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsolePostHandler.java index 8faa62619bf32b..3ec790d7fecb95 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsolePostHandler.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsolePostHandler.java @@ -5,6 +5,7 @@ import org.jboss.logging.Logger; import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler; +import io.quarkus.oidc.deployment.devservices.OidcDevServicesUtils; import io.vertx.core.MultiMap; import io.vertx.core.http.HttpHeaders; import io.vertx.ext.web.RoutingContext; @@ -20,33 +21,31 @@ public KeycloakDevConsolePostHandler(Map users) { @Override protected void handlePostAsync(RoutingContext event, MultiMap form) throws Exception { - WebClient client = KeycloakDevServicesUtils.createWebClient(); - String keycloakUrl = form.get("keycloakUrl") + "/realms/" + form.get("realm") + "/protocol/openid-connect/token"; + WebClient client = OidcDevServicesUtils.createWebClient(KeycloakDevServicesProcessor.vertxInstance); + String tokenUrl = form.get("tokenUrl"); try { String token = null; if ("password".equals(form.get("grant"))) { - LOG.infof("Using a password grant to get a token from '%s' for user '%s' in realm '%s' with client id '%s'", - keycloakUrl, form.get("user"), form.get("realm"), form.get("client")); + LOG.infof("Using a password grant to get a token from '%s' for user '%s' with client id '%s'", + tokenUrl, form.get("user"), form.get("client")); String userName = form.get("user"); - token = KeycloakDevServicesUtils.getPasswordAccessToken(client, keycloakUrl, + token = OidcDevServicesUtils.getPasswordAccessToken(client, tokenUrl, form.get("client"), form.get("clientSecret"), userName, users.get(userName), KeycloakDevServicesProcessor.capturedDevServicesConfiguration.webClienTimeout); } else { - LOG.infof("Using a client_credentials grant to get a token token from '%s' in realm '%s' with client id '%s'", - keycloakUrl, form.get("realm"), form.get("client")); + LOG.infof("Using a client_credentials grant to get a token token from '%s' with client id '%s'", + tokenUrl, form.get("client")); - token = KeycloakDevServicesUtils.getClientCredAccessToken(client, keycloakUrl, + token = OidcDevServicesUtils.getClientCredAccessToken(client, tokenUrl, form.get("client"), form.get("clientSecret"), KeycloakDevServicesProcessor.capturedDevServicesConfiguration.webClienTimeout); } - LOG.infof("Test token: %s", token); - LOG.infof("Sending token to '%s'", form.get("serviceUrl")); testServiceInternal(event, client, form.get("serviceUrl"), token); } catch (Throwable t) { LOG.errorf("Token can not be acquired from Keycloak: %s", t.toString()); @@ -57,6 +56,8 @@ protected void handlePostAsync(RoutingContext event, MultiMap form) throws Excep private void testServiceInternal(RoutingContext event, WebClient client, String serviceUrl, String token) { try { + LOG.infof("Test token: %s", token); + LOG.infof("Sending token to '%s'", serviceUrl); int statusCode = client.getAbs(serviceUrl) .putHeader(HttpHeaders.AUTHORIZATION.toString(), "Bearer " + token).send().await().indefinitely() .statusCode(); diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java index dab59e46358a21..6404c3ba67be71 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java @@ -10,6 +10,8 @@ import io.quarkus.deployment.builditem.RuntimeConfigSetupCompleteBuildItem; import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem; import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem; +import io.quarkus.oidc.deployment.devservices.OidcAuthorizationCodePostHandler; +import io.quarkus.oidc.deployment.devservices.OidcTestServiceHandler; public class KeycloakDevConsoleProcessor { @@ -19,22 +21,25 @@ public class KeycloakDevConsoleProcessor { @Consume(RuntimeConfigSetupCompleteBuildItem.class) public void setConfigProperties(BuildProducer console, Optional configProps) { - if (configProps.isPresent()) { - console.produce( - new DevConsoleTemplateInfoBuildItem("devServicesEnabled", config.devservices.enabled)); - console.produce( - new DevConsoleTemplateInfoBuildItem("keycloakUrl", configProps.get().getProperties().get("keycloak.url"))); + if (configProps.isPresent() && configProps.get().getProperties().containsKey("keycloak.url")) { + String keycloakUrl = (String) configProps.get().getProperties().get("keycloak.url"); + String realmUrl = keycloakUrl + "/realms/" + configProps.get().getProperties().get("keycloak.realm"); + + console.produce(new DevConsoleTemplateInfoBuildItem("keycloakUrl", keycloakUrl)); + console.produce(new DevConsoleTemplateInfoBuildItem("keycloakAdminUrl", keycloakUrl)); console.produce(new DevConsoleTemplateInfoBuildItem("oidcApplicationType", configProps.get().getProperties().get("quarkus.oidc.application-type"))); - console.produce(new DevConsoleTemplateInfoBuildItem("keycloakClient", + console.produce(new DevConsoleTemplateInfoBuildItem("clientId", configProps.get().getProperties().get("quarkus.oidc.client-id"))); - console.produce(new DevConsoleTemplateInfoBuildItem("keycloakClientSecret", + console.produce(new DevConsoleTemplateInfoBuildItem("clientSecret", configProps.get().getProperties().get("quarkus.oidc.credentials.secret"))); console.produce( new DevConsoleTemplateInfoBuildItem("keycloakUsers", configProps.get().getProperties().get("oidc.users"))); - console.produce(new DevConsoleTemplateInfoBuildItem("keycloakRealm", - configProps.get().getProperties().get("keycloak.realm"))); + console.produce(new DevConsoleTemplateInfoBuildItem("tokenUrl", realmUrl + "/protocol/openid-connect/token")); + console.produce( + new DevConsoleTemplateInfoBuildItem("authorizationUrl", realmUrl + "/protocol/openid-connect/auth")); + console.produce(new DevConsoleTemplateInfoBuildItem("logoutUrl", realmUrl + "/protocol/openid-connect/logout")); console.produce(new DevConsoleTemplateInfoBuildItem("oidcGrantType", config.devservices.grant.type.getGrantType())); } } @@ -42,15 +47,19 @@ public void setConfigProperties(BuildProducer c @BuildStep(onlyIf = IsDevelopment.class) void invokeEndpoint(BuildProducer devConsoleRoute, Optional configProps) { - if (configProps.isPresent()) { + if (configProps.isPresent() && configProps.get().getProperties().containsKey("keycloak.url")) { @SuppressWarnings("unchecked") Map users = (Map) configProps.get().getProperties().get("oidc.users"); devConsoleRoute.produce( new DevConsoleRouteBuildItem("testService", "POST", new KeycloakDevConsolePostHandler(users))); devConsoleRoute.produce( - new DevConsoleRouteBuildItem("testServiceWithToken", "POST", new KeycloakImplicitGrantPostHandler())); + new DevConsoleRouteBuildItem("testServiceWithToken", "POST", + new OidcTestServiceHandler(KeycloakDevServicesProcessor.vertxInstance, + KeycloakDevServicesProcessor.capturedDevServicesConfiguration.webClienTimeout))); devConsoleRoute.produce( - new DevConsoleRouteBuildItem("exchangeCodeForTokens", "POST", new KeycloakAuthorizationCodePostHandler())); + new DevConsoleRouteBuildItem("exchangeCodeForTokens", "POST", + new OidcAuthorizationCodePostHandler(KeycloakDevServicesProcessor.vertxInstance, + KeycloakDevServicesProcessor.capturedDevServicesConfiguration.webClienTimeout))); } } } diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java index 5bfc3126ebb1c9..809724abe7a2c5 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java @@ -50,6 +50,7 @@ import io.quarkus.devservices.common.ContainerLocator; import io.quarkus.oidc.deployment.OidcBuildStep.IsEnabled; import io.quarkus.oidc.deployment.devservices.OidcDevServicesBuildItem; +import io.quarkus.oidc.deployment.devservices.OidcDevServicesUtils; import io.quarkus.runtime.LaunchMode; import io.quarkus.runtime.configuration.ConfigUtils; import io.vertx.core.Vertx; @@ -453,9 +454,9 @@ private void createRealm(String keycloakUrl, Map users, String o realm.getUsers().add(createUser(entry.getKey(), entry.getValue(), getUserRoles(entry.getKey()))); } - WebClient client = KeycloakDevServicesUtils.createWebClient(); + WebClient client = OidcDevServicesUtils.createWebClient(vertxInstance); try { - String token = KeycloakDevServicesUtils.getPasswordAccessToken(client, + String token = OidcDevServicesUtils.getPasswordAccessToken(client, keycloakUrl + "/realms/master/protocol/openid-connect/token", "admin-cli", null, "admin", "admin", capturedDevServicesConfiguration.webClienTimeout); diff --git a/extensions/oidc/deployment/src/main/resources/dev-templates/embedded.html b/extensions/oidc/deployment/src/main/resources/dev-templates/embedded.html index 69c0914f3782ef..bc2b692b4d3475 100644 --- a/extensions/oidc/deployment/src/main/resources/dev-templates/embedded.html +++ b/extensions/oidc/deployment/src/main/resources/dev-templates/embedded.html @@ -6,5 +6,8 @@ Provider: Keycloak -{#else} +{#else if info:authorizationUrl??} + + + Dev Console {/if} diff --git a/extensions/oidc/deployment/src/main/resources/dev-templates/provider.html b/extensions/oidc/deployment/src/main/resources/dev-templates/provider.html index 3ab9b02730c080..ff78e4b8353619 100644 --- a/extensions/oidc/deployment/src/main/resources/dev-templates/provider.html +++ b/extensions/oidc/deployment/src/main/resources/dev-templates/provider.html @@ -1,5 +1,11 @@ {#include main fluid=true} -{#title}Keycloak{/title} +{#title} +{#if info:keycloakUrl??} +Keycloak +{#else} +OpenId Connect Dev Console +{/if} +{/title} {#script} var port = {config:property('quarkus.http.port')}; @@ -28,8 +34,8 @@ loggedIn === true; $('.implicitLoggedOut').hide(); $('.implicitLoggedIn').show(); - var hash = window.location.hash; - var code = hash.match(/code=([^&]+)/)[1]; + var search = window.location.search; + var code = search.match(/code=([^&]+)/)[1]; exchangeCodeForTokens(code); }else{ loggedIn === false; @@ -71,18 +77,18 @@ return false; } - function signInToKeycloakAndGetTokens() { + function signInToOidcProviderAndGetTokens() { {#if info:oidcGrantType is 'implicit'} - window.location.href = '{info:keycloakUrl}' + "/realms/" + '{info:keycloakRealm}' + "/protocol/openid-connect/auth" - + "?client_id=" + '{info:keycloakClient}' + window.location.href = '{info:authorizationUrl}' + + "?client_id=" + '{info:clientId}' + "&redirect_uri=" + "http%3A%2F%2Flocalhost%3A" + port + "%2Fq%2Fdev%2Fio.quarkus.quarkus-oidc%2Fprovider" - + "&scope=openid&response_type=token id_token&response_mode=fragment&prompt=login" + + "&scope=openid&response_type=token id_token&response_mode=query&prompt=login" + "&nonce=" + makeid(); {#else} - window.location.href = '{info:keycloakUrl}' + "/realms/" + '{info:keycloakRealm}' + "/protocol/openid-connect/auth" - + "?client_id=" + '{info:keycloakClient}' + window.location.href = '{info:authorizationUrl}' + + "?client_id=" + '{info:clientId}' + "&redirect_uri=" + "http%3A%2F%2Flocalhost%3A" + port + "%2Fq%2Fdev%2Fio.quarkus.quarkus-oidc%2Fprovider" - + "&scope=openid&response_type=code&response_mode=fragment&prompt=login" + + "&scope=openid&response_type=code&response_mode=query&prompt=login" + "&nonce=" + makeid(); {/if} } @@ -140,17 +146,16 @@ } function logout() { - window.location.assign('{info:keycloakUrl}' + "/realms/" + '{info:keycloakRealm}' + "/protocol/openid-connect/logout" + window.location.assign('{info:logoutUrl??}' + "?post_logout_redirect_uri=" + "http%3A%2F%2Flocalhost%3A" + port + "%2Fq%2Fdev%2Fio.quarkus.quarkus-oidc%2Fprovider"); } function exchangeCodeForTokens(code){ $.post("exchangeCodeForTokens", { - keycloakUrl: '{info:keycloakUrl}', - realm: '{info:keycloakRealm}', - client: '{info:keycloakClient}', - clientSecret: '{info:keycloakClientSecret}', + tokenUrl: '{info:tokenUrl}', + client: '{info:clientId}', + clientSecret: '{info:clientSecret}', authorizationCode: code, redirectUri: "http://localhost:" + port + "/q/dev/io.quarkus.quarkus-oidc/provider" }, @@ -179,6 +184,8 @@ } if (userName) { $('#loggedInUser').append("Logged in as " + userName + " "); + } else { + $('#loggedInUser').append("Logged in "); } } return "
    " + 
@@ -212,11 +219,10 @@
     function testServiceWithPassword(userName, servicePath){
         $.post("testService",
             {
-              keycloakUrl: '{info:keycloakUrl}',
+              tokenUrl: '{info:tokenUrl}',
               serviceUrl: "http://localhost:" + port + servicePath,
-              realm: '{info:keycloakRealm}',
-              client: '{info:keycloakClient}',
-              clientSecret: '{info:keycloakClientSecret}',
+              client: '{info:clientId}',
+              clientSecret: '{info:clientSecret}',
               user: userName,
               grant: '{info:oidcGrantType}'
             },
@@ -230,11 +236,10 @@
     function testServiceWithClientCredentials(servicePath) {
         $.post("testService",
             {
-              keycloakUrl: '{info:keycloakUrl}',
+              tokenUrl: '{info:tokenUrl}',
               serviceUrl: "http://localhost:" + port + servicePath,
-              realm: '{info:keycloakRealm}',
-              client: '{info:keycloakClient}',
-              clientSecret: '{info:keycloakClientSecret}',
+              client: '{info:clientId}',
+              clientSecret: '{info:clientSecret}',
               grant: '{info:oidcGrantType}'
             },
             function(data, status){
@@ -264,9 +269,9 @@
 {#body}
 
    
 
-{#if info:keycloakUrl??}
+{#if info:keycloakAdminUrl??}
 
    
-    
+    
         Keycloak Admin
     
 
    
@@ -278,7 +283,7 @@
         
         
    
             
    
-                
+                
                      Log into Single Page Application
                 
             
    
@@ -290,9 +295,11 @@
                 
    
                 
    
                     
+                    {#if info:logoutUrl??}
                     
                         
                     
+                    {/if}
                 
    
             
             
    
@@ -431,7 +438,7 @@ 
    Decoded
    
     {#else if info:oidcGrantType is 'client_credentials'}
         
    
             
    
-                Get access token for {info:keycloakClient} and test your service
+                Get access token for {info:clientId} and test your service
             
    
             
    
                 
    
diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleOidcSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleOidcSmokeTest.java
index 8c36ccdebd06b8..1d8c5114941501 100644
--- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleOidcSmokeTest.java
+++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleOidcSmokeTest.java
@@ -20,9 +20,9 @@ public class DevConsoleOidcSmokeTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
 
     @Test
-    public void testCaches() {
+    public void testOidcProviderTemplate() {
         RestAssured.get("q/dev/io.quarkus.quarkus-oidc/provider")
                 .then()
-                .statusCode(200).body(Matchers.containsString("Keycloak"));
+                .statusCode(200).body(Matchers.containsString("OpenId Connect Dev Console"));
     }
 }

From 14fbf6a39d24871cac6707f04ce30ffced8fee78 Mon Sep 17 00:00:00 2001
From: Vincent van Dam 
Date: Tue, 7 Sep 2021 21:09:55 +0200
Subject: [PATCH 130/138] Add memory settings according to redpanda docker
 quickstart

---
 .../kafka/client/deployment/DevServicesKafkaProcessor.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java
index 25d1eb9a06cc7f..49d3d043fec664 100644
--- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java
+++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java
@@ -361,6 +361,7 @@ protected void containerIsStarting(InspectContainerResponse containerInfo, boole
             // Start and configure the advertised address
             String command = "#!/bin/bash\n";
             command += "/usr/bin/rpk redpanda start --check=false --node-id 0 --smp 1 ";
+            command += "--memory 1G --overprovisioned --reserve-memory 0M ";
             command += "--kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 ";
             command += String.format("--advertise-kafka-addr PLAINTEXT://%s:29092,OUTSIDE://%s:%d", getHostToUse(),
                     getHostToUse(), getPortToUse());

From 8cb17617a8259ec2f7cd46fe479b9466897a1a2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Sep 2021 21:18:11 +0000
Subject: [PATCH 131/138] Bump awssdk.version from 2.17.34 to 2.17.35

Bumps `awssdk.version` from 2.17.34 to 2.17.35.

Updates `software.amazon.awssdk:bom` from 2.17.34 to 2.17.35
- [Release notes](https://github.com/aws/aws-sdk-java-v2/releases)
- [Changelog](https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java-v2/compare/2.17.34...2.17.35)

Updates `apache-client` from 2.17.34 to 2.17.35

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: software.amazon.awssdk:apache-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 bom/application/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 03bd07ed7a113b..d60a2ae8115d61 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -145,7 +145,7 @@
         3.10.0
         1.6
         2.9.1
-        2.17.34
+        2.17.35
         2.40.0
         1.4.2
         1.5.30

From 7580a2615ea2eebd4eb63e0f5d1432c5c6ad7842 Mon Sep 17 00:00:00 2001
From: Stuart Douglas 
Date: Fri, 3 Sep 2021 16:39:44 +1000
Subject: [PATCH 132/138] Make Dev Services logging nicer

This changes the mass of Dev Services logging to a single status line
per starting container. This allows the user to see that progress is
happening, without flooding the console.

If the operation fails all captured output is dumped.

Fixes #16203
---
 .../deployment/console/AeshConsole.java       |  28 +++--
 .../deployment/console/ConsoleHelper.java     |  26 +----
 .../console/ConsoleInstalledBuildItem.java    |  13 +++
 .../deployment/console/ConsoleProcessor.java  |   8 +-
 .../console/StartupLogCompressor.java         |  79 +++++++++++++
 .../dev/testing/JunitTestRunner.java          |   2 +-
 .../quarkus/dev/console/QuarkusConsole.java   |  23 ++++
 .../DevServicesApicurioRegistryProcessor.java |  26 ++++-
 .../DevServicesDatasourceProcessor.java       | 109 ++++++++++--------
 .../deployment/DevServicesKafkaProcessor.java |  34 ++++--
 .../deployment/DevServicesMongoProcessor.java |  23 +++-
 .../KeycloakDevServicesProcessor.java         |  93 ++++++++-------
 .../deployment/DevServicesRedisProcessor.java |  38 ++++--
 .../deployment/AmqpDevServicesProcessor.java  |  52 ++++++---
 .../deployment/DevServicesVaultProcessor.java |  23 +++-
 .../test/junit/QuarkusMainTestExtension.java  |   5 +-
 16 files changed, 410 insertions(+), 172 deletions(-)
 create mode 100644 core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleInstalledBuildItem.java
 create mode 100644 core/deployment/src/main/java/io/quarkus/deployment/console/StartupLogCompressor.java

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java b/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java
index e876e9a9b5b65c..d438f50734ba0b 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java
@@ -55,6 +55,7 @@ protected Boolean initialValue() {
     static final TreeMap statusMap = new TreeMap<>();
     private final ReadWriteLock positionLock = new ReentrantReadWriteLock();
     private volatile boolean closed;
+    private final StatusLine prompt;
 
     public AeshConsole(Connection connection) {
         INSTANCE = this;
@@ -67,6 +68,7 @@ public void run() {
                 connection.close();
             }
         }, "Console Shutdown Hook"));
+        prompt = registerStatusLine(0);
     }
 
     private void updatePromptOnChange(StringBuilder buffer, int newLines) {
@@ -109,7 +111,7 @@ public StatusLine registerStatusLine(int priority) {
 
     @Override
     public void setPromptMessage(String promptMessage) {
-        setMessage(0, promptMessage);
+        prompt.setMessage(promptMessage);
     }
 
     private AeshConsole setMessage(int position, String message) {
@@ -386,6 +388,11 @@ public void write(boolean errorStream, byte[] buf, int off, int len) {
         write(errorStream, new String(buf, off, len, connection.outputEncoding()));
     }
 
+    @Override
+    public boolean isAnsiSupported() {
+        return true;
+    }
+
     @Override
     public void doReadLine() {
         setPromptMessage("");
@@ -395,10 +402,13 @@ public void doReadLine() {
     }
 
     void rebalance() {
-        int count = 1;
-        for (var val : statusMap.values()) {
-            val.position = count;
-            setMessage(count++, val.message);
+        synchronized (this) {
+            int count = 1;
+            messages = new String[statusMap.size()];
+            for (var val : statusMap.values()) {
+                val.position = count;
+                setMessage(count++, val.message);
+            }
         }
     }
 
@@ -407,6 +417,7 @@ class StatusLineImpl implements StatusLine {
         final int priority;
         int position;
         String message;
+        boolean closed;
 
         StatusLineImpl(int priority) {
             this.priority = priority;
@@ -414,10 +425,12 @@ class StatusLineImpl implements StatusLine {
 
         @Override
         public void setMessage(String message) {
-            this.message = message;
             try {
                 positionLock.readLock().lock();
-                AeshConsole.this.setMessage(position, message);
+                this.message = message;
+                if (!closed) {
+                    AeshConsole.this.setMessage(position, message);
+                }
             } finally {
                 positionLock.readLock().unlock();
             }
@@ -426,6 +439,7 @@ public void setMessage(String message) {
         @Override
         public void close() {
             positionLock.writeLock().lock();
+            closed = true;
             try {
                 AeshConsole.this.setMessage(position, null);
                 statusMap.remove(priority);
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java
index e568b2d7f91fff..b9710dc97a47ab 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleHelper.java
@@ -1,7 +1,6 @@
 package io.quarkus.deployment.console;
 
 import java.io.IOException;
-import java.io.PrintStream;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -12,30 +11,11 @@
 import io.quarkus.deployment.dev.testing.TestConfig;
 import io.quarkus.dev.console.BasicConsole;
 import io.quarkus.dev.console.QuarkusConsole;
-import io.quarkus.dev.console.RedirectPrintStream;
 import io.quarkus.runtime.console.ConsoleRuntimeConfig;
 import io.quarkus.runtime.util.ColorSupport;
 
 public class ConsoleHelper {
 
-    static boolean redirectsInstalled = false;
-
-    final static PrintStream out = System.out;
-    final static PrintStream err = System.err;
-
-    public synchronized static void installRedirects() {
-        if (redirectsInstalled) {
-            return;
-        }
-        redirectsInstalled = true;
-
-        //force console init
-        //otherwise you can get a stack overflow as it sees the redirected output
-        QuarkusConsole.INSTANCE.isInputSupported();
-        System.setOut(new RedirectPrintStream(false));
-        System.setErr(new RedirectPrintStream(true));
-    }
-
     public static synchronized void installConsole(TestConfig config, ConsoleConfig consoleConfig,
             ConsoleRuntimeConfig consoleRuntimeConfig, io.quarkus.runtime.logging.ConsoleConfig logConfig, boolean test) {
         if (QuarkusConsole.installed) {
@@ -50,7 +30,7 @@ public static synchronized void installConsole(TestConfig config, ConsoleConfig
         if (!inputSupport) {
             //note that in this case we don't hold onto anything from this class loader
             //which is important for the test suite
-            QuarkusConsole.INSTANCE = new BasicConsole(colorEnabled, false, out, System.console());
+            QuarkusConsole.INSTANCE = new BasicConsole(colorEnabled, false, QuarkusConsole.ORIGINAL_OUT, System.console());
             return;
         }
         try {
@@ -109,8 +89,8 @@ public Integer get() {
                 }
             });
         } catch (IOException e) {
-            QuarkusConsole.INSTANCE = new BasicConsole(colorEnabled, false, out, System.console());
+            QuarkusConsole.INSTANCE = new BasicConsole(colorEnabled, false, QuarkusConsole.ORIGINAL_OUT, System.console());
         }
-        installRedirects();
+        QuarkusConsole.installRedirects();
     }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleInstalledBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleInstalledBuildItem.java
new file mode 100644
index 00000000000000..b3fdeb7f59bfd1
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleInstalledBuildItem.java
@@ -0,0 +1,13 @@
+package io.quarkus.deployment.console;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Build item that signifies that the interactive console is ready.
+ *
+ * This will not always be present, as the console may not be installed
+ */
+public final class ConsoleInstalledBuildItem extends SimpleBuildItem {
+
+    public static final ConsoleInstalledBuildItem INSTANCE = new ConsoleInstalledBuildItem();
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java
index 4b98a065a324fc..3da8b313819c6c 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleProcessor.java
@@ -27,11 +27,12 @@ public class ConsoleProcessor {
      */
     @BuildStep(onlyIf = IsDevelopment.class)
     @Produce(TestSetupBuildItem.class)
-    void setupConsole(TestConfig config, BuildProducer testListenerBuildItemBuildProducer,
+    ConsoleInstalledBuildItem setupConsole(TestConfig config,
+            BuildProducer testListenerBuildItemBuildProducer,
             LaunchModeBuildItem launchModeBuildItem, ConsoleConfig consoleConfig) {
 
         if (consoleInstalled) {
-            return;
+            return ConsoleInstalledBuildItem.INSTANCE;
         }
         consoleInstalled = true;
         if (config.console.orElse(consoleConfig.enabled)) {
@@ -49,11 +50,12 @@ void setupConsole(TestConfig config, BuildProducer testLi
             //note that this bit needs to be refactored so it is no longer tied to continuous testing
             if (!TestSupport.instance().isPresent() || config.continuousTesting == TestConfig.Mode.DISABLED
                     || config.flatClassPath) {
-                return;
+                return ConsoleInstalledBuildItem.INSTANCE;
             }
             TestConsoleHandler consoleHandler = new TestConsoleHandler(launchModeBuildItem.getDevModeType().get());
             consoleHandler.install();
             testListenerBuildItemBuildProducer.produce(new TestListenerBuildItem(consoleHandler));
         }
+        return ConsoleInstalledBuildItem.INSTANCE;
     }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/StartupLogCompressor.java b/core/deployment/src/main/java/io/quarkus/deployment/console/StartupLogCompressor.java
new file mode 100644
index 00000000000000..24d163e547c025
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/console/StartupLogCompressor.java
@@ -0,0 +1,79 @@
+package io.quarkus.deployment.console;
+
+import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiPredicate;
+
+import io.quarkus.deployment.dev.testing.MessageFormat;
+import io.quarkus.deployment.logging.LoggingSetupBuildItem;
+import io.quarkus.dev.console.QuarkusConsole;
+import io.quarkus.dev.console.StatusLine;
+
+/**
+ * special filter that can be used to compress log messages to a status line
+ * 
    
+ * This is useful for Dev Services to show progress without cluttering up the logs
+ */
+public class StartupLogCompressor implements Closeable, BiPredicate {
+
+    final Thread thread;
+    final String name;
+    final StatusLine sl;
+    final List toDump = new ArrayList<>();
+    final AtomicInteger COUNTER = new AtomicInteger();
+
+    public StartupLogCompressor(String name,
+            @SuppressWarnings("unused") Optional consoleInstalledBuildItem,
+            @SuppressWarnings("unused") LoggingSetupBuildItem loggingSetupBuildItem) {
+        if (QuarkusConsole.INSTANCE.isAnsiSupported()) {
+            QuarkusConsole.installRedirects();
+            this.name = name;
+            this.thread = Thread.currentThread();
+            QuarkusConsole.addOutputFilter(this);
+            sl = QuarkusConsole.INSTANCE.registerStatusLine(1000 + COUNTER.incrementAndGet());
+            sl.setMessage(MessageFormat.BLUE + name + MessageFormat.RESET);
+        } else {
+            thread = null;
+            this.name = null;
+            sl = null;
+        }
+    }
+
+    @Override
+    public void close() {
+        if (thread == null) {
+            return;
+        }
+        QuarkusConsole.removeOutputFilter(this);
+        sl.close();
+    }
+
+    public void closeAndDumpCaptured() {
+        if (thread == null) {
+            return;
+        }
+        QuarkusConsole.removeOutputFilter(this);
+        sl.close();
+        for (var i : toDump) {
+            QuarkusConsole.INSTANCE.write(true, i);
+        }
+    }
+
+    @Override
+    public boolean test(String s, Boolean errorStream) {
+        if (thread == null) {
+            //not installed
+            return true;
+        }
+        if (Thread.currentThread() == thread) {
+            toDump.add(s);
+            sl.setMessage(MessageFormat.BLUE + name + MessageFormat.RESET + " " + s.replace("\n", ""));
+            return false;
+        }
+        return true;
+    }
+
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java
index 7e7b66e13853de..3987951da4a218 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java
@@ -198,7 +198,7 @@ public FilterResult apply(TestDescriptor testDescriptor) {
                     listener.runStarted(toRun);
                 }
                 log.debug("Starting test run with " + testPlan.countTestIdentifiers((s) -> true) + " tests");
-                QuarkusConsole.INSTANCE.addOutputFilter(logHandler);
+                QuarkusConsole.addOutputFilter(logHandler);
 
                 final Deque> touchedClasses = new LinkedBlockingDeque<>();
                 Map startTimes = new HashMap<>();
diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.java b/core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.java
index f2655d4329ed64..8e12135244a3a3 100644
--- a/core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.java
+++ b/core/devmode-spi/src/main/java/io/quarkus/dev/console/QuarkusConsole.java
@@ -1,5 +1,6 @@
 package io.quarkus.dev.console;
 
+import java.io.PrintStream;
 import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -45,6 +46,24 @@ public abstract class QuarkusConsole {
 
     private volatile boolean started = false;
 
+    static boolean redirectsInstalled = false;
+
+    public final static PrintStream ORIGINAL_OUT = System.out;
+    public final static PrintStream ORIGINAL_ERR = System.err;
+
+    public synchronized static void installRedirects() {
+        if (redirectsInstalled) {
+            return;
+        }
+        redirectsInstalled = true;
+
+        //force console init
+        //otherwise you can get a stack overflow as it sees the redirected output
+        QuarkusConsole.INSTANCE.isInputSupported();
+        System.setOut(new RedirectPrintStream(false));
+        System.setErr(new RedirectPrintStream(true));
+    }
+
     public static boolean hasColorSupport() {
         if (Boolean.getBoolean(FORCE_COLOR_SUPPORT)) {
             return true; //assume the IDE run window has color support
@@ -120,4 +139,8 @@ protected boolean shouldWrite(boolean errorStream, String s) {
     public boolean isInputSupported() {
         return true;
     }
+
+    public boolean isAnsiSupported() {
+        return false;
+    }
 }
diff --git a/extensions/apicurio-registry-avro/deployment/src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java b/extensions/apicurio-registry-avro/deployment/src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java
index 1147572ecc9bf9..b644e4a860a0a7 100644
--- a/extensions/apicurio-registry-avro/deployment/src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java
+++ b/extensions/apicurio-registry-avro/deployment/src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java
@@ -20,7 +20,10 @@
 import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
 import io.quarkus.deployment.builditem.DevServicesSharedNetworkBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.console.ConsoleInstalledBuildItem;
+import io.quarkus.deployment.console.StartupLogCompressor;
 import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
+import io.quarkus.deployment.logging.LoggingSetupBuildItem;
 import io.quarkus.devservices.common.ContainerLocator;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.configuration.ConfigUtils;
@@ -57,7 +60,9 @@ public class DevServicesApicurioRegistryProcessor {
     public void startApicurioRegistryDevService(LaunchModeBuildItem launchMode,
             ApicurioRegistryDevServicesBuildTimeConfig apicurioRegistryDevServices,
             Optional devServicesSharedNetworkBuildItem,
-            BuildProducer devServicesConfiguration) {
+            BuildProducer devServicesConfiguration,
+            Optional consoleInstalledBuildItem,
+            LoggingSetupBuildItem loggingSetupBuildItem) {
 
         ApicurioRegistryDevServiceCfg configuration = getConfiguration(apicurioRegistryDevServices);
 
@@ -69,11 +74,20 @@ public void startApicurioRegistryDevService(LaunchModeBuildItem launchMode,
             shutdownApicurioRegistry();
             cfg = null;
         }
-
-        ApicurioRegistry apicurioRegistry = startApicurioRegistry(configuration, launchMode,
-                devServicesSharedNetworkBuildItem.isPresent());
-        if (apicurioRegistry == null) {
-            return;
+        ApicurioRegistry apicurioRegistry;
+        StartupLogCompressor compressor = new StartupLogCompressor(
+                (launchMode.isTest() ? "(test) " : "") + "Apicurio Registry Dev Services Starting:",
+                consoleInstalledBuildItem, loggingSetupBuildItem);
+        try {
+            apicurioRegistry = startApicurioRegistry(configuration, launchMode,
+                    devServicesSharedNetworkBuildItem.isPresent());
+            if (apicurioRegistry == null) {
+                return;
+            }
+            compressor.close();
+        } catch (Throwable t) {
+            compressor.closeAndDumpCaptured();
+            throw new RuntimeException(t);
         }
 
         cfg = configuration;
diff --git a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java
index 0881c79369314e..537dbbec2327c1 100644
--- a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java
+++ b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java
@@ -27,7 +27,10 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.console.ConsoleInstalledBuildItem;
+import io.quarkus.deployment.console.StartupLogCompressor;
 import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
+import io.quarkus.deployment.logging.LoggingSetupBuildItem;
 import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
 import io.quarkus.runtime.LaunchMode;
 
@@ -50,7 +53,9 @@ DevServicesDatasourceResultBuildItem launchDatabases(CurateOutcomeBuildItem cura
             DataSourcesBuildTimeConfig dataSourceBuildTimeConfig,
             LaunchModeBuildItem launchMode,
             List configurationHandlerBuildItems,
-            BuildProducer devServicesResultBuildItemBuildProducer) {
+            BuildProducer devServicesResultBuildItemBuildProducer,
+            Optional consoleInstalledBuildItem,
+            LoggingSetupBuildItem loggingSetupBuildItem) {
         //figure out if we need to shut down and restart existing databases
         //if not and the DB's have already started we just return
         if (databases != null) {
@@ -111,60 +116,70 @@ DevServicesDatasourceResultBuildItem launchDatabases(CurateOutcomeBuildItem cura
         Map devDBProviderMap = devDBProviders.stream()
                 .collect(Collectors.toMap(DevServicesDatasourceProviderBuildItem::getDatabase,
                         DevServicesDatasourceProviderBuildItem::getDevServicesProvider));
-
-        defaultResult = startDevDb(null, curateOutcomeBuildItem, installedDrivers,
-                !dataSourceBuildTimeConfig.namedDataSources.isEmpty(),
-                devDBProviderMap,
-                dataSourceBuildTimeConfig.defaultDataSource,
-                configHandlersByDbType, propertiesMap, closeableList, launchMode.getLaunchMode());
-        List dbConfig = new ArrayList<>();
-        if (defaultResult != null) {
-            for (Map.Entry i : defaultResult.getConfigProperties().entrySet()) {
-                dbConfig.add(new DevServicesConfigResultBuildItem(i.getKey(), i.getValue()));
-            }
-        }
-        for (Map.Entry entry : dataSourceBuildTimeConfig.namedDataSources.entrySet()) {
-            DevServicesDatasourceResultBuildItem.DbResult result = startDevDb(entry.getKey(), curateOutcomeBuildItem,
-                    installedDrivers, true,
-                    devDBProviderMap, entry.getValue(), configHandlersByDbType, propertiesMap, closeableList,
-                    launchMode.getLaunchMode());
-            if (result != null) {
-                namedResults.put(entry.getKey(), result);
-                for (Map.Entry i : result.getConfigProperties().entrySet()) {
+        StartupLogCompressor compressor = new StartupLogCompressor(
+                (launchMode.isTest() ? "(test) " : "") + "Database Starting:",
+                consoleInstalledBuildItem,
+                loggingSetupBuildItem);
+        try {
+            defaultResult = startDevDb(null, curateOutcomeBuildItem, installedDrivers,
+                    !dataSourceBuildTimeConfig.namedDataSources.isEmpty(),
+                    devDBProviderMap,
+                    dataSourceBuildTimeConfig.defaultDataSource,
+                    configHandlersByDbType, propertiesMap, closeableList, launchMode.getLaunchMode());
+            List dbConfig = new ArrayList<>();
+            if (defaultResult != null) {
+                for (Map.Entry i : defaultResult.getConfigProperties().entrySet()) {
                     dbConfig.add(new DevServicesConfigResultBuildItem(i.getKey(), i.getValue()));
                 }
             }
-        }
-        for (DevServicesConfigResultBuildItem i : dbConfig) {
-            devServicesResultBuildItemBuildProducer
-                    .produce(i);
-        }
+            for (Map.Entry entry : dataSourceBuildTimeConfig.namedDataSources.entrySet()) {
+                DevServicesDatasourceResultBuildItem.DbResult result = startDevDb(entry.getKey(), curateOutcomeBuildItem,
+                        installedDrivers, true,
+                        devDBProviderMap, entry.getValue(), configHandlersByDbType, propertiesMap, closeableList,
+                        launchMode.getLaunchMode());
+                if (result != null) {
+                    namedResults.put(entry.getKey(), result);
+                    for (Map.Entry i : result.getConfigProperties().entrySet()) {
+                        dbConfig.add(new DevServicesConfigResultBuildItem(i.getKey(), i.getValue()));
+                    }
+                }
+            }
+            for (DevServicesConfigResultBuildItem i : dbConfig) {
+                devServicesResultBuildItemBuildProducer
+                        .produce(i);
+            }
 
-        if (first) {
-            first = false;
-            Runnable closeTask = new Runnable() {
-                @Override
-                public void run() {
-                    if (databases != null) {
-                        for (Closeable i : databases) {
-                            try {
-                                i.close();
-                            } catch (Throwable t) {
-                                log.error("Failed to stop database", t);
+            if (first) {
+                first = false;
+                Runnable closeTask = new Runnable() {
+                    @Override
+                    public void run() {
+                        if (databases != null) {
+                            for (Closeable i : databases) {
+                                try {
+                                    i.close();
+                                } catch (Throwable t) {
+                                    log.error("Failed to stop database", t);
+                                }
                             }
                         }
+                        first = true;
+                        databases = null;
+                        cachedProperties = null;
                     }
-                    first = true;
-                    databases = null;
-                    cachedProperties = null;
-                }
-            };
-            QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
-            ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask);
+                };
+                QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
+                ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask);
+            }
+            databases = closeableList;
+            cachedProperties = propertiesMap;
+            compressor.close();
+            log.info("Dev Services for datasources started.");
+            return new DevServicesDatasourceResultBuildItem(defaultResult, namedResults);
+        } catch (Throwable t) {
+            compressor.closeAndDumpCaptured();
+            throw new RuntimeException(t);
         }
-        databases = closeableList;
-        cachedProperties = propertiesMap;
-        return new DevServicesDatasourceResultBuildItem(defaultResult, namedResults);
     }
 
     private DevServicesDatasourceResultBuildItem.DbResult startDevDb(String dbName,
diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java
index 25d1eb9a06cc7f..8b72496eb8ec76 100644
--- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java
+++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java
@@ -42,7 +42,10 @@
 import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
 import io.quarkus.deployment.builditem.DevServicesSharedNetworkBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.console.ConsoleInstalledBuildItem;
+import io.quarkus.deployment.console.StartupLogCompressor;
 import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
+import io.quarkus.deployment.logging.LoggingSetupBuildItem;
 import io.quarkus.devservices.common.ContainerAddress;
 import io.quarkus.devservices.common.ContainerLocator;
 import io.quarkus.runtime.LaunchMode;
@@ -76,7 +79,9 @@ public DevServicesKafkaBrokerBuildItem startKafkaDevService(
             LaunchModeBuildItem launchMode,
             KafkaBuildTimeConfig kafkaClientBuildTimeConfig,
             Optional devServicesSharedNetworkBuildItem,
-            BuildProducer devServicePropertiesProducer) {
+            BuildProducer devServicePropertiesProducer,
+            Optional consoleInstalledBuildItem,
+            LoggingSetupBuildItem loggingSetupBuildItem) {
 
         KafkaDevServiceCfg configuration = getConfiguration(kafkaClientBuildTimeConfig);
 
@@ -88,14 +93,25 @@ public DevServicesKafkaBrokerBuildItem startKafkaDevService(
             shutdownBroker();
             cfg = null;
         }
-
-        KafkaBroker kafkaBroker = startKafka(configuration, launchMode, devServicesSharedNetworkBuildItem.isPresent());
-        DevServicesKafkaBrokerBuildItem bootstrapServers = null;
-        if (kafkaBroker != null) {
-            closeable = kafkaBroker.getCloseable();
-            devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(
-                    KAFKA_BOOTSTRAP_SERVERS, kafkaBroker.getBootstrapServers()));
-            bootstrapServers = new DevServicesKafkaBrokerBuildItem(kafkaBroker.getBootstrapServers());
+        KafkaBroker kafkaBroker;
+        DevServicesKafkaBrokerBuildItem bootstrapServers;
+        StartupLogCompressor compressor = new StartupLogCompressor(
+                (launchMode.isTest() ? "(test) " : "") + "Kafka Dev Services Starting:",
+                consoleInstalledBuildItem, loggingSetupBuildItem);
+        try {
+
+            kafkaBroker = startKafka(configuration, launchMode, devServicesSharedNetworkBuildItem.isPresent());
+            bootstrapServers = null;
+            if (kafkaBroker != null) {
+                closeable = kafkaBroker.getCloseable();
+                devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(
+                        KAFKA_BOOTSTRAP_SERVERS, kafkaBroker.getBootstrapServers()));
+                bootstrapServers = new DevServicesKafkaBrokerBuildItem(kafkaBroker.getBootstrapServers());
+            }
+            compressor.close();
+        } catch (Throwable t) {
+            compressor.closeAndDumpCaptured();
+            throw new RuntimeException(t);
         }
 
         // Configure the watch dog
diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/DevServicesMongoProcessor.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/DevServicesMongoProcessor.java
index 1564f2fbbf38f6..1f49d9c9bca880 100644
--- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/DevServicesMongoProcessor.java
+++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/DevServicesMongoProcessor.java
@@ -27,7 +27,11 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
 import io.quarkus.deployment.builditem.DevServicesSharedNetworkBuildItem;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.console.ConsoleInstalledBuildItem;
+import io.quarkus.deployment.console.StartupLogCompressor;
 import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
+import io.quarkus.deployment.logging.LoggingSetupBuildItem;
 import io.quarkus.devservices.common.ConfigureUtil;
 import io.quarkus.mongodb.runtime.MongodbConfig;
 import io.quarkus.runtime.configuration.ConfigUtils;
@@ -46,7 +50,10 @@ public class DevServicesMongoProcessor {
     public void startMongo(List mongoConnections,
             MongoClientBuildTimeConfig mongoClientBuildTimeConfig,
             Optional devServicesSharedNetworkBuildItem,
-            BuildProducer devServices) {
+            BuildProducer devServices,
+            Optional consoleInstalledBuildItem,
+            LaunchModeBuildItem launchMode,
+            LoggingSetupBuildItem loggingSetupBuildItem) {
 
         List connectionNames = new ArrayList<>(mongoConnections.size());
         for (MongoConnectionNameBuildItem mongoConnection : mongoConnections) {
@@ -86,8 +93,18 @@ public void startMongo(List mongoConnections,
 
         // TODO: we need to go through each connection
         String connectionName = connectionNames.get(0);
-        StartResult startResult = startMongo(connectionName, currentCapturedProperties.get(connectionName),
-                devServicesSharedNetworkBuildItem.isPresent());
+        StartResult startResult;
+        StartupLogCompressor compressor = new StartupLogCompressor(
+                (launchMode.isTest() ? "(test) " : "") + "Mongo Dev Services Starting:", consoleInstalledBuildItem,
+                loggingSetupBuildItem);
+        try {
+            startResult = startMongo(connectionName, currentCapturedProperties.get(connectionName),
+                    devServicesSharedNetworkBuildItem.isPresent());
+            compressor.close();
+        } catch (Throwable t) {
+            compressor.closeAndDumpCaptured();
+            throw new RuntimeException(t);
+        }
         if (startResult != null) {
             currentCloseables.add(startResult.getCloseable());
             String connectionStringPropertyName = getConfigPrefix(connectionName) + "connection-string";
diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java
index 5bfc3126ebb1c9..dd0d95877624b7 100644
--- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java
+++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java
@@ -45,7 +45,11 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
 import io.quarkus.deployment.builditem.DevServicesSharedNetworkBuildItem;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.console.ConsoleInstalledBuildItem;
+import io.quarkus.deployment.console.StartupLogCompressor;
 import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
+import io.quarkus.deployment.logging.LoggingSetupBuildItem;
 import io.quarkus.devservices.common.ContainerAddress;
 import io.quarkus.devservices.common.ContainerLocator;
 import io.quarkus.oidc.deployment.OidcBuildStep.IsEnabled;
@@ -106,7 +110,10 @@ public KeycloakDevServicesConfigBuildItem startKeycloakContainer(
             Optional devServicesSharedNetworkBuildItem,
             BuildProducer devServices,
             Optional oidcProviderBuildItem,
-            KeycloakBuildTimeConfig config) {
+            KeycloakBuildTimeConfig config,
+            LaunchModeBuildItem launchMode,
+            Optional consoleInstalledBuildItem,
+            LoggingSetupBuildItem loggingSetupBuildItem) {
 
         if (oidcProviderBuildItem.isPresent()) {
             // Dev Services for the alternative OIDC provider are enabled
@@ -143,52 +150,60 @@ public KeycloakDevServicesConfigBuildItem startKeycloakContainer(
             existingDevServiceConfig = null;
         }
         capturedDevServicesConfiguration = currentDevServicesConfiguration;
+        StartResult startResult;
+        StartupLogCompressor compressor = new StartupLogCompressor(
+                (launchMode.isTest() ? "(test) " : "") + "KeyCloak Dev Services Starting:",
+                consoleInstalledBuildItem, loggingSetupBuildItem);
+        try {
+            startResult = startContainer(devServicesSharedNetworkBuildItem.isPresent());
+            if (startResult == null) {
+                return null;
+            }
 
-        StartResult startResult = startContainer(devServicesSharedNetworkBuildItem.isPresent());
-        if (startResult == null) {
-            return null;
-        }
-
-        closeables = startResult.closeable != null ? Collections.singletonList(startResult.closeable) : null;
-
-        if (first) {
-            first = false;
-            Runnable closeTask = new Runnable() {
-                @Override
-                public void run() {
-                    if (closeables != null) {
-                        for (Closeable closeable : closeables) {
+            closeables = startResult.closeable != null ? Collections.singletonList(startResult.closeable) : null;
+
+            if (first) {
+                first = false;
+                Runnable closeTask = new Runnable() {
+                    @Override
+                    public void run() {
+                        if (closeables != null) {
+                            for (Closeable closeable : closeables) {
+                                try {
+                                    closeable.close();
+                                } catch (Throwable t) {
+                                    LOG.error("Failed to stop Keycloak container", t);
+                                }
+                            }
+                        }
+                        if (vertxInstance != null) {
                             try {
-                                closeable.close();
+                                vertxInstance.close();
                             } catch (Throwable t) {
-                                LOG.error("Failed to stop Keycloak container", t);
+                                LOG.error("Failed to close Vertx instance", t);
                             }
                         }
+                        first = true;
+                        closeables = null;
+                        capturedDevServicesConfiguration = null;
+                        vertxInstance = null;
+                        capturedRealmFileLastModifiedDate = null;
                     }
-                    if (vertxInstance != null) {
-                        try {
-                            vertxInstance.close();
-                        } catch (Throwable t) {
-                            LOG.error("Failed to close Vertx instance", t);
-                        }
-                    }
-                    first = true;
-                    closeables = null;
-                    capturedDevServicesConfiguration = null;
-                    vertxInstance = null;
-                    capturedRealmFileLastModifiedDate = null;
-                }
-            };
-            QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
-            ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask);
-        }
+                };
+                QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
+                ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask);
+            }
 
-        capturedKeycloakUrl = startResult.url + "/auth";
-        if (vertxInstance == null) {
-            vertxInstance = Vertx.vertx();
+            capturedKeycloakUrl = startResult.url + "/auth";
+            if (vertxInstance == null) {
+                vertxInstance = Vertx.vertx();
+            }
+            capturedRealmFileLastModifiedDate = getRealmFileLastModifiedDate(capturedDevServicesConfiguration.realmPath);
+            compressor.close();
+        } catch (Throwable t) {
+            compressor.closeAndDumpCaptured();
+            throw new RuntimeException(t);
         }
-        capturedRealmFileLastModifiedDate = getRealmFileLastModifiedDate(capturedDevServicesConfiguration.realmPath);
-
         LOG.info("Dev Services for Keycloak started.");
 
         return prepareConfiguration(capturedDevServicesConfiguration.createRealm && startResult.createDefaultRealm,
diff --git a/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/DevServicesRedisProcessor.java b/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/DevServicesRedisProcessor.java
index f0edb1dc239344..e1d0cda173e61c 100644
--- a/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/DevServicesRedisProcessor.java
+++ b/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/DevServicesRedisProcessor.java
@@ -28,7 +28,10 @@
 import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
 import io.quarkus.deployment.builditem.DevServicesSharedNetworkBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.console.ConsoleInstalledBuildItem;
+import io.quarkus.deployment.console.StartupLogCompressor;
 import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
+import io.quarkus.deployment.logging.LoggingSetupBuildItem;
 import io.quarkus.devservices.common.ContainerLocator;
 import io.quarkus.redis.client.deployment.RedisBuildTimeConfig.DevServiceConfiguration;
 import io.quarkus.redis.client.runtime.RedisClientUtil;
@@ -60,7 +63,9 @@ public class DevServicesRedisProcessor {
     @BuildStep(onlyIfNot = IsNormal.class, onlyIf = { GlobalDevServicesConfig.Enabled.class })
     public void startRedisContainers(LaunchModeBuildItem launchMode,
             Optional devServicesSharedNetworkBuildItem,
-            BuildProducer devConfigProducer, RedisBuildTimeConfig config) {
+            BuildProducer devConfigProducer, RedisBuildTimeConfig config,
+            Optional consoleInstalledBuildItem,
+            LoggingSetupBuildItem loggingSetupBuildItem) {
 
         Map currentDevServicesConfiguration = new HashMap<>(config.additionalDevServices);
         currentDevServicesConfiguration.put(RedisClientUtil.DEFAULT_CLIENT, config.defaultDevService);
@@ -85,17 +90,28 @@ public void startRedisContainers(LaunchModeBuildItem launchMode,
 
         capturedDevServicesConfiguration = currentDevServicesConfiguration;
         List currentCloseables = new ArrayList<>();
-        for (Entry entry : currentDevServicesConfiguration.entrySet()) {
-            String connectionName = entry.getKey();
-            StartResult startResult = startContainer(connectionName, entry.getValue().devservices, launchMode.getLaunchMode(),
-                    devServicesSharedNetworkBuildItem.isPresent());
-            if (startResult == null) {
-                continue;
+
+        StartupLogCompressor compressor = new StartupLogCompressor(
+                (launchMode.isTest() ? "(test) " : "") + "Redis Dev Services Starting:", consoleInstalledBuildItem,
+                loggingSetupBuildItem);
+        try {
+            for (Entry entry : currentDevServicesConfiguration.entrySet()) {
+                String connectionName = entry.getKey();
+                StartResult startResult = startContainer(connectionName, entry.getValue().devservices,
+                        launchMode.getLaunchMode(),
+                        devServicesSharedNetworkBuildItem.isPresent());
+                if (startResult == null) {
+                    continue;
+                }
+                currentCloseables.add(startResult.closeable);
+                String configKey = getConfigPrefix(connectionName) + RedisConfig.HOSTS_CONFIG_NAME;
+                devConfigProducer.produce(new DevServicesConfigResultBuildItem(configKey, startResult.url));
+                log.infof("The %s redis server is ready to accept connections on %s", connectionName, startResult.url);
             }
-            currentCloseables.add(startResult.closeable);
-            String configKey = getConfigPrefix(connectionName) + RedisConfig.HOSTS_CONFIG_NAME;
-            devConfigProducer.produce(new DevServicesConfigResultBuildItem(configKey, startResult.url));
-            log.infof("The %s redis server is ready to accept connections on %s", connectionName, startResult.url);
+            compressor.close();
+        } catch (Throwable t) {
+            compressor.closeAndDumpCaptured();
+            throw new RuntimeException(t);
         }
 
         closeables = currentCloseables;
diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java b/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java
index ca48170751f0f8..35483f64c40947 100644
--- a/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java
+++ b/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java
@@ -2,6 +2,7 @@
 
 import java.io.Closeable;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Supplier;
 
 import org.eclipse.microprofile.config.Config;
@@ -19,7 +20,10 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.console.ConsoleInstalledBuildItem;
+import io.quarkus.deployment.console.StartupLogCompressor;
 import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
+import io.quarkus.deployment.logging.LoggingSetupBuildItem;
 import io.quarkus.devservices.common.ContainerLocator;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.configuration.ConfigUtils;
@@ -60,7 +64,9 @@ public class AmqpDevServicesProcessor {
     public DevServicesAmqpBrokerBuildItem startAmqpDevService(
             LaunchModeBuildItem launchMode,
             AmqpBuildTimeConfig amqpClientBuildTimeConfig,
-            BuildProducer devServicePropertiesProducer) {
+            BuildProducer devServicePropertiesProducer,
+            Optional consoleInstalledBuildItem,
+            LoggingSetupBuildItem loggingSetupBuildItem) {
 
         AmqpDevServiceCfg configuration = getConfiguration(amqpClientBuildTimeConfig);
 
@@ -73,25 +79,35 @@ public DevServicesAmqpBrokerBuildItem startAmqpDevService(
             cfg = null;
         }
 
-        AmqpBroker broker = startAmqpBroker(configuration, launchMode);
+        AmqpBroker broker;
         DevServicesAmqpBrokerBuildItem artemis = null;
-        if (broker != null) {
-            closeable = broker.getCloseable();
-            devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(AMQP_HOST_PROP, broker.host));
-            devServicePropertiesProducer
-                    .produce(new DevServicesConfigResultBuildItem(AMQP_PORT_PROP, Integer.toString(broker.port)));
-            devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(AMQP_USER_PROP, broker.user));
-            devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(AMQP_PASSWORD_PROP, broker.password));
-
-            artemis = new DevServicesAmqpBrokerBuildItem(broker.host, broker.port, broker.user, broker.password);
-
-            if (broker.isOwner()) {
-                log.info("Dev Services for AMQP started.");
-                log.infof("Other Quarkus applications in dev mode will find the "
-                        + "broker automatically. For Quarkus applications in production mode, you can connect to"
-                        + " this by starting your application with -Damqp.host=%s -Damqp.port=%d -Damqp.user=%s -Damqp.password=%s",
-                        broker.host, broker.port, broker.user, broker.password);
+        StartupLogCompressor compressor = new StartupLogCompressor(
+                (launchMode.isTest() ? "(test) " : "") + "AMQP Dev Services Starting:", consoleInstalledBuildItem,
+                loggingSetupBuildItem);
+        try {
+            broker = startAmqpBroker(configuration, launchMode);
+            if (broker != null) {
+                closeable = broker.getCloseable();
+                devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(AMQP_HOST_PROP, broker.host));
+                devServicePropertiesProducer
+                        .produce(new DevServicesConfigResultBuildItem(AMQP_PORT_PROP, Integer.toString(broker.port)));
+                devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(AMQP_USER_PROP, broker.user));
+                devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(AMQP_PASSWORD_PROP, broker.password));
+
+                artemis = new DevServicesAmqpBrokerBuildItem(broker.host, broker.port, broker.user, broker.password);
+
+                if (broker.isOwner()) {
+                    log.info("Dev Services for AMQP started.");
+                    log.infof("Other Quarkus applications in dev mode will find the "
+                            + "broker automatically. For Quarkus applications in production mode, you can connect to"
+                            + " this by starting your application with -Damqp.host=%s -Damqp.port=%d -Damqp.user=%s -Damqp.password=%s",
+                            broker.host, broker.port, broker.user, broker.password);
+                }
             }
+            compressor.close();
+        } catch (Throwable t) {
+            compressor.closeAndDumpCaptured();
+            throw new RuntimeException(t);
         }
 
         // Configure the watch dog
diff --git a/extensions/vault/deployment/src/main/java/io/quarkus/vault/deployment/DevServicesVaultProcessor.java b/extensions/vault/deployment/src/main/java/io/quarkus/vault/deployment/DevServicesVaultProcessor.java
index 0d897b7f310753..d65562542a50ef 100644
--- a/extensions/vault/deployment/src/main/java/io/quarkus/vault/deployment/DevServicesVaultProcessor.java
+++ b/extensions/vault/deployment/src/main/java/io/quarkus/vault/deployment/DevServicesVaultProcessor.java
@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.OptionalInt;
 
 import org.apache.commons.lang3.RandomStringUtils;
@@ -18,7 +19,11 @@
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.console.ConsoleInstalledBuildItem;
+import io.quarkus.deployment.console.StartupLogCompressor;
 import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
+import io.quarkus.deployment.logging.LoggingSetupBuildItem;
 import io.quarkus.runtime.configuration.ConfigUtils;
 import io.quarkus.vault.runtime.VaultVersions;
 import io.quarkus.vault.runtime.config.DevServicesConfig;
@@ -38,7 +43,10 @@ public class DevServicesVaultProcessor {
     private final IsDockerWorking isDockerWorking = new IsDockerWorking(true);
 
     @BuildStep(onlyIfNot = IsNormal.class, onlyIf = GlobalDevServicesConfig.Enabled.class)
-    public void startVaultContainers(BuildProducer devConfig, VaultBuildTimeConfig config) {
+    public void startVaultContainers(BuildProducer devConfig, VaultBuildTimeConfig config,
+            Optional consoleInstalledBuildItem,
+            LaunchModeBuildItem launchMode,
+            LoggingSetupBuildItem loggingSetupBuildItem) {
 
         DevServicesConfig currentDevServicesConfiguration = config.devservices;
 
@@ -62,7 +70,18 @@ public void startVaultContainers(BuildProducer
 
         capturedDevServicesConfiguration = currentDevServicesConfiguration;
 
-        StartResult startResult = startContainer(currentDevServicesConfiguration);
+        StartResult startResult;
+
+        StartupLogCompressor compressor = new StartupLogCompressor(
+                (launchMode.isTest() ? "(test) " : "") + "Vault Dev Services Starting:", consoleInstalledBuildItem,
+                loggingSetupBuildItem);
+        try {
+            startResult = startContainer(currentDevServicesConfiguration);
+            compressor.close();
+        } catch (Throwable t) {
+            compressor.closeAndDumpCaptured();
+            throw new RuntimeException(t);
+        }
         if (startResult == null) {
             return;
         }
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java
index 8e4a50be2f79a3..59d4bef6e7900b 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java
@@ -17,7 +17,6 @@
 import org.junit.jupiter.api.extension.ParameterResolver;
 
 import io.quarkus.bootstrap.app.StartupAction;
-import io.quarkus.deployment.console.ConsoleHelper;
 import io.quarkus.deployment.dev.testing.LogCapturingOutputFilter;
 import io.quarkus.dev.console.QuarkusConsole;
 import io.quarkus.dev.testing.TracingHandler;
@@ -69,7 +68,7 @@ private void ensurePrepared(ExtensionContext context) throws Exception {
 
     private LaunchResult doLaunch(ExtensionContext context, String[] arguments) throws Exception {
         ensurePrepared(context);
-        ConsoleHelper.installRedirects();
+        QuarkusConsole.installRedirects();
         LogCapturingOutputFilter filter = new LogCapturingOutputFilter(prepareResult.curatedApplication, false, false,
                 () -> true);
         QuarkusConsole.addOutputFilter(filter);
@@ -182,7 +181,7 @@ public void afterAll(ExtensionContext context) throws Exception {
 
     @Override
     public void beforeAll(ExtensionContext context) throws Exception {
-        ConsoleHelper.installRedirects();
+        QuarkusConsole.installRedirects();
         currentTestClassStack.push(context.getRequiredTestClass());
 
     }

From ad11e637bc4b4e07c06e389f2aaea191b1c16e7f Mon Sep 17 00:00:00 2001
From: Stuart Douglas 
Date: Wed, 8 Sep 2021 15:48:00 +1000
Subject: [PATCH 133/138] Release the context manager last

Still running threads can re-create an implicit one
---
 .../context/runtime/SmallRyeContextPropagationRecorder.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationRecorder.java b/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationRecorder.java
index 2c541aceada9c8..86179875d4ec47 100644
--- a/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationRecorder.java
+++ b/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationRecorder.java
@@ -50,7 +50,8 @@ public void configureRuntime(ExecutorService executorService, ShutdownContext sh
         SmallRyeContextManager contextManager = builder.build();
 
         contextManagerProvider.registerContextManager(contextManager, Thread.currentThread().getContextClassLoader());
-        shutdownContext.addShutdownTask(new Runnable() {
+        //needs to be late, as running threads can re-create an implicit one
+        shutdownContext.addLastShutdownTask(new Runnable() {
             @Override
             public void run() {
                 contextManagerProvider.releaseContextManager(contextManager);

From 5d7a7bbca052c9739499a25bf8f2d4cb81ef1189 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Sep 2021 06:15:41 +0000
Subject: [PATCH 134/138] Bump mongo-client.version from 4.3.1 to 4.3.2

Bumps `mongo-client.version` from 4.3.1 to 4.3.2.

Updates `mongodb-driver-sync` from 4.3.1 to 4.3.2
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.3.1...r4.3.2)

Updates `mongodb-driver-core` from 4.3.1 to 4.3.2
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.3.1...r4.3.2)

Updates `mongodb-driver-legacy` from 4.3.1 to 4.3.2
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.3.1...r4.3.2)

Updates `mongodb-driver-reactivestreams` from 4.3.1 to 4.3.2
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.3.1...r4.3.2)

Updates `bson` from 4.3.1 to 4.3.2
- [Release notes](https://github.com/mongodb/mongo-java-driver/releases)
- [Commits](https://github.com/mongodb/mongo-java-driver/compare/r4.3.1...r4.3.2)

---
updated-dependencies:
- dependency-name: org.mongodb:mongodb-driver-sync
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.mongodb:mongodb-driver-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.mongodb:mongodb-driver-legacy
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.mongodb:mongodb-driver-reactivestreams
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.mongodb:bson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 bom/application/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 80b32b51984ac1..7acd0a5f7ff49e 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -163,7 +163,7 @@
         1.29
         6.0.0
         4.3.4
-        4.3.1
+        4.3.2
         1.2.1
         2.17.0
         0.33.9

From 01b68daef811bae850221638ef2f2f5cbbb97dda Mon Sep 17 00:00:00 2001
From: Clement Escoffier 
Date: Wed, 8 Sep 2021 08:43:48 +0200
Subject: [PATCH 135/138] When copying files from the host to the container,
 make sure it sets the right permissions.

Fix https://github.com/quarkusio/quarkus-images/issues/167

It was not required until recent docker versions (on Mac, it seems to have been required on Linux). Setting permissions works for both older and new Docker versions.
---
 .../src/main/asciidoc/building-native-image.adoc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/src/main/asciidoc/building-native-image.adoc b/docs/src/main/asciidoc/building-native-image.adoc
index 46a85356e9d697..dd3a74853200e9 100644
--- a/docs/src/main/asciidoc/building-native-image.adoc
+++ b/docs/src/main/asciidoc/building-native-image.adoc
@@ -513,9 +513,9 @@ Sample Dockerfile for building with Maven:
 ----
 ## Stage 1 : build with maven builder image with native capabilities
 FROM quay.io/quarkus/ubi-quarkus-native-image:{graalvm-flavor} AS build
-COPY pom.xml /code/
-COPY mvnw /code/mvnw
-COPY .mvn /code/.mvn
+COPY --chown=quarkus:quarkus mvnw /code/mvnw
+COPY --chown=quarkus:quarkus .mvn /code/.mvn
+COPY --chown=quarkus:quarkus pom.xml /code/
 USER quarkus
 WORKDIR /code
 RUN ./mvnw -B org.apache.maven.plugins:maven-dependency-plugin:3.1.2:go-offline
@@ -551,11 +551,11 @@ Sample Dockerfile for building with Gradle:
 ----
 ## Stage 1 : build with maven builder image with native capabilities
 FROM quay.io/quarkus/ubi-quarkus-native-image:{graalvm-flavor} AS build
-COPY gradlew /code/gradlew
-COPY gradle /code/gradle
-COPY build.gradle /code/
-COPY settings.gradle /code/
-COPY gradle.properties /code/
+COPY --chown=quarkus:quarkus gradlew /code/gradlew
+COPY --chown=quarkus:quarkus /code/gradle
+COPY --chown=quarkus:quarkus build.gradle /code/
+COPY --chown=quarkus:quarkus settings.gradle /code/
+COPY --chown=quarkus:quarkus gradle.properties /code/
 USER quarkus
 WORKDIR /code
 COPY src /code/src

From 19566de4ef3c82173f7e6f7bd06b8e072ff68942 Mon Sep 17 00:00:00 2001
From: Stuart Douglas 
Date: Tue, 7 Sep 2021 15:49:55 +1000
Subject: [PATCH 136/138] Default to drop-and-create for DevServices

This allows for hibernate to be used without configuration.
---
 .../orm/deployment/HibernateOrmProcessor.java | 52 +++++++++++++++++++
 ...ernateOrmRuntimeConfigPersistenceUnit.java |  3 ++
 .../deployment/test/PanacheJAXBTest.java      |  5 +-
 ...eous-multiple-persistence-units.properties |  2 +-
 ...ersistence-units-for-repository.properties |  2 +-
 ...tion-multiple-persistence-units.properties |  2 +-
 6 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
index 214456677d76fc..b51cb54fb66412 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
@@ -41,6 +41,7 @@
 import javax.persistence.spi.PersistenceUnitTransactionType;
 import javax.transaction.TransactionManager;
 
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.hibernate.MultiTenancyStrategy;
 import org.hibernate.boot.archive.scan.spi.ClassDescriptor;
 import org.hibernate.boot.archive.scan.spi.PackageDescriptor;
@@ -87,12 +88,14 @@
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
 import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.DevServicesLauncherConfigResultBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
 import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.LiveReloadBuildItem;
 import io.quarkus.deployment.builditem.LogCategoryBuildItem;
+import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem;
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
@@ -177,6 +180,55 @@ void includeArchivesHostingEntityPackagesInIndex(HibernateOrmConfig hibernateOrm
         }
     }
 
+    @BuildStep
+    void devServicesAutoGenerateByDefault(DevServicesLauncherConfigResultBuildItem devServicesResult,
+            List schemaReadyBuildItems,
+            HibernateOrmConfig config,
+            BuildProducer runTimeConfigurationDefaultBuildItemBuildProducer) {
+        if (!schemaReadyBuildItems.isEmpty()) {
+            //we don't want to enable auto generation if somebody else is managing the schema
+            return;
+        }
+        String dsName;
+        if (config.defaultPersistenceUnit.datasource.isEmpty()) {
+            dsName = "quarkus.datasource.username";
+        } else {
+            dsName = "quarkus.datasource." + config.defaultPersistenceUnit.datasource.get() + ".username";
+        }
+
+        if (ConfigProvider.getConfig().getOptionalValue(dsName, String.class).isEmpty()) {
+            if (devServicesResult.getConfig().containsKey(dsName)) {
+                if (ConfigProvider.getConfig().getOptionalValue("quarkus.hibernate-orm.database.generation", String.class)
+                        .isEmpty()) {
+                    LOG.info(
+                            "Setting quarkus.hibernate-orm.database.generation=drop-and-create to initialize Dev Services managed database");
+                    runTimeConfigurationDefaultBuildItemBuildProducer.produce(new RunTimeConfigurationDefaultBuildItem(
+                            "quarkus.hibernate-orm.database.generation", "drop-and-create"));
+                }
+            }
+        }
+
+        for (Entry entry : config.persistenceUnits.entrySet()) {
+
+            if (entry.getValue().datasource.isEmpty()) {
+                dsName = "quarkus.datasource.jdbc.url";
+            } else {
+                dsName = "quarkus.datasource." + entry.getValue().datasource.get() + ".username";
+            }
+            if (ConfigProvider.getConfig().getOptionalValue(dsName, String.class).isEmpty()) {
+                if (devServicesResult.getConfig().containsKey(dsName)) {
+                    String propertyName = "quarkus.hibernate-orm." + entry.getKey() + ".database.generation";
+                    if (ConfigProvider.getConfig().getOptionalValue(propertyName, String.class).isEmpty()) {
+                        LOG.info("Setting " + propertyName + "=drop-and-create to initialize Dev Services managed database");
+                        runTimeConfigurationDefaultBuildItemBuildProducer
+                                .produce(new RunTimeConfigurationDefaultBuildItem(propertyName, "drop-and-create"));
+                    }
+                }
+            }
+        }
+
+    }
+
     @BuildStep
     AdditionalIndexedClassesBuildItem addPersistenceUnitAnnotationToIndex() {
         return new AdditionalIndexedClassesBuildItem(ClassNames.QUARKUS_PERSISTENCE_UNIT.toString());
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java
index 3ca13e90a43542..3be50c5a488342 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java
@@ -72,6 +72,9 @@ public static class HibernateOrmConfigPersistenceUnitDatabaseGeneration {
          *
          * `drop-and-create` is awesome in development mode.
          *
+         * This defaults to 'none', however if Dev Services is in use and no other extensions that manage the schema are present
+         * this will default to 'drop-and-create'.
+         *
          * Accepted values: `none`, `create`, `drop-and-create`, `drop`, `update`, `validate`.
          */
         @ConfigItem(name = ConfigItem.PARENT, defaultValue = "none")
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java
index 8672238e57defe..ea251d1fcc9136 100644
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java
@@ -17,6 +17,7 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -30,7 +31,9 @@ public class PanacheJAXBTest {
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(JAXBEntity.class, JAXBTestResource.class));
+                    .addClasses(JAXBEntity.class, JAXBTestResource.class)
+                    .addAsResource(new StringAsset("quarkus.hibernate-orm.database.generation=none"),
+                            "application.properties"));
 
     @Test
     public void testJaxbAnnotationTransfer() throws Exception {
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties
index cbcb3eec5ffa3e..d6b78c1f0c86d0 100644
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties
@@ -1,5 +1,5 @@
 quarkus.datasource.db-kind=h2
-quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+quarkus.datasource.jdbc.url=jdbc:h2:mem:first;DB_CLOSE_DELAY=-1
 
 quarkus.datasource.second.db-kind=h2
 quarkus.datasource.second.jdbc.url=jdbc:h2:mem:second;DB_CLOSE_DELAY=-1
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units-for-repository.properties b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units-for-repository.properties
index d257a345b938f0..7111224eafffe8 100644
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units-for-repository.properties
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units-for-repository.properties
@@ -1,5 +1,5 @@
 quarkus.datasource.db-kind=h2
-quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+quarkus.datasource.jdbc.url=jdbc:h2:mem:first;DB_CLOSE_DELAY=-1
 
 quarkus.datasource.repository.db-kind=h2
 quarkus.datasource.repository.jdbc.url=jdbc:h2:mem:repository;DB_CLOSE_DELAY=-1
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units.properties b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units.properties
index 777cc071973323..2a5bbd813f0532 100644
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units.properties
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units.properties
@@ -1,5 +1,5 @@
 quarkus.datasource.db-kind=h2
-quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+quarkus.datasource.jdbc.url=jdbc:h2:mem:first;DB_CLOSE_DELAY=-1
 
 quarkus.datasource.second.db-kind=h2
 quarkus.datasource.second.jdbc.url=jdbc:h2:mem:second;DB_CLOSE_DELAY=-1

From ed81cf911ff1d87aec965beba5700c7b41876f79 Mon Sep 17 00:00:00 2001
From: Jose 
Date: Wed, 8 Sep 2021 11:35:06 +0200
Subject: [PATCH 137/138] Update rest-data-panache and spring-data-rest guides
 to use reactive dep

This change is related to https://github.com/quarkusio/quarkus/pull/19801
---
 docs/src/main/asciidoc/rest-data-panache.adoc | 8 ++++----
 docs/src/main/asciidoc/spring-data-rest.adoc  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/src/main/asciidoc/rest-data-panache.adoc b/docs/src/main/asciidoc/rest-data-panache.adoc
index 3244ef14b3b9b6..7a4a211ea4999b 100644
--- a/docs/src/main/asciidoc/rest-data-panache.adoc
+++ b/docs/src/main/asciidoc/rest-data-panache.adoc
@@ -23,7 +23,7 @@ include::./status-include.adoc[]
 * Add the required dependencies to your `pom.xml`
 ** Hibernate ORM REST Data with Panache extension (`quarkus-hibernate-orm-rest-data-panache`)
 ** A JDBC driver extension (`quarkus-jdbc-postgresql`, `quarkus-jdbc-h2`, `quarkus-jdbc-mariadb`, ...)
-** One of the RESTEasy JSON serialization extensions (`quarkus-resteasy-jackson` or `quarkus-resteasy-jsonb`)
+** One of the RESTEasy JSON serialization extensions (`quarkus-resteasy-reactive-jackson` or `quarkus-resteasy-reactive-jsonb`)
 
 [source,xml]
 ----
@@ -38,7 +38,7 @@ include::./status-include.adoc[]
     
     
         io.quarkus
-        quarkus-resteasy-jackson
+        quarkus-resteasy-reactive-jackson
     
 
 ----
@@ -50,7 +50,7 @@ include::./status-include.adoc[]
 
 * Add the required dependencies to your `pom.xml`
 ** MongoDB REST Data with Panache extension (`quarkus-mongodb-rest-data-panache`)
-** One of the RESTEasy JSON serialization extensions (`quarkus-resteasy-jackson` or `quarkus-resteasy-jsonb`)
+** One of the RESTEasy JSON serialization extensions (`quarkus-resteasy-reactive-jackson` or `quarkus-resteasy-reactive-jsonb`)
 
 [source,xml]
 ----
@@ -61,7 +61,7 @@ include::./status-include.adoc[]
     
     
         io.quarkus
-        quarkus-resteasy-jackson
+        quarkus-resteasy-reactive-jackson
     
 
 ----
diff --git a/docs/src/main/asciidoc/spring-data-rest.adoc b/docs/src/main/asciidoc/spring-data-rest.adoc
index 991f1078de50ed..fc0c55d4eef60b 100644
--- a/docs/src/main/asciidoc/spring-data-rest.adoc
+++ b/docs/src/main/asciidoc/spring-data-rest.adoc
@@ -41,7 +41,7 @@ First, we need a new project. Create a new project with the following command:
 mvn io.quarkus.platform:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=spring-data-rest-quickstart \
-    -Dextensions="spring-data-rest,resteasy-jackson,quarkus-jdbc-postgresql" \
+    -Dextensions="spring-data-rest,resteasy-reactive-jackson,quarkus-jdbc-postgresql" \
     -DnoExamples
 cd spring-data-rest-quickstart
 ----
@@ -76,7 +76,7 @@ For the tests you will also need REST Assured. Add it to the `pom.xml`:
 
 ----
 
-Note: both `resteasy-jackson` and `resteasy-jsonb` are supported and can be interchanged.
+Note: both `resteasy-reactive-jackson` and `resteasy-reactive-jsonb` are supported and can be interchanged.
 
 == Define the Entity
 

From 802accf0f9e96736c3cfa302eed1e55a3ba34b97 Mon Sep 17 00:00:00 2001
From: Georgios Andrianakis 
Date: Wed, 8 Sep 2021 13:01:27 +0300
Subject: [PATCH 138/138] Fix Multiple entries Hibernate ORM DevUI entry

New entries occurred when the application performed a dev-mode reload
---
 .../devconsole/HibernateOrmDevConsoleInfoSupplier.java      | 6 ++++++
 .../devconsole/HibernateOrmDevConsoleIntegrator.java        | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleInfoSupplier.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleInfoSupplier.java
index 2f16877db3326a..895182ae9e072c 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleInfoSupplier.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleInfoSupplier.java
@@ -58,6 +58,12 @@ public static void pushPersistenceUnit(String persistenceUnitName,
         }
     }
 
+    public static void clearData() {
+        INSTANCE.persistenceUnits.clear();
+        INSTANCE.createDDLs.clear();
+        INSTANCE.dropDDLs.clear();
+    }
+
     private static String generateDDL(SchemaExport.Action action, Metadata metadata, ServiceRegistry serviceRegistry,
             String importFiles) {
         SchemaExport schemaExport = new SchemaExport();
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleIntegrator.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleIntegrator.java
index 59bb961e01c2cf..a7dae284eb97fe 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleIntegrator.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleIntegrator.java
@@ -21,6 +21,6 @@ public void integrate(Metadata metadata, SessionFactoryImplementor sessionFactor
     @Override
     public void disintegrate(SessionFactoryImplementor sessionFactoryImplementor,
             SessionFactoryServiceRegistry sessionFactoryServiceRegistry) {
-        // Nothing to do
+        HibernateOrmDevConsoleInfoSupplier.clearData();
     }
 }