Datasets:

tiginamaria

/

bug-localization

like 2

quarkusio/quarkus/29557/29542

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29542

https://github.com/quarkusio/quarkus/pull/29557

https://github.com/quarkusio/quarkus/pull/29557

fixes

CORS Rejected Error on same-origin requests when CORS is enabled

### Describe the bug Since Quarkus 2.14.2, requests return status `403` if CORS is enabled and the origin is not in the list of allowed CORS origins, even if the request is not cross-origin at all. ### Expected behavior CORS Settings should have no impact on same-origin requests. ### Actual behavior Enabling CORS seems to prevent all requests with an `Origin`-header that isn't explicitly whitelisted, even same-origin requests. `GET`-Requests may still work as browsers don't add the `Origin`-Header to same-origin `GET`-requests. ### How to Reproduce? Reproducer: [cors.zip](https://github.com/quarkusio/quarkus/files/10106358/cors.zip) See the test or just start the project and try to use the Dev UI - anything that isn't a plain GET request like the attempts to establish websockets for test and logstream will fail. ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.14.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

4228a370eeec6df2282f19536fcec180a5955d4a

3c18d3941345339cc072248f0e145e1140ad0ad8

https://github.com/quarkusio/quarkus/compare/4228a370eeec6df2282f19536fcec180a5955d4a...3c18d3941345339cc072248f0e145e1140ad0ad8

diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSHandlerTestWildcardOriginCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSHandlerTestWildcardOriginCase.java index bea0ee15783..c1852e10dd8 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSHandlerTestWildcardOriginCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSHandlerTestWildcardOriginCase.java @@ -49,6 +49,60 @@ void corsNotMatchingOrigin() { .header("Access-Control-Allow-Credentials", "false"); } + @Test + void corsSameOriginRequest() { + String origin = "http://localhost:8081"; + given().header("Origin", origin) + .get("/test").then() + .statusCode(200) + .header("Access-Control-Allow-Origin", origin); + } + + @Test + void corsInvalidSameOriginRequest1() { + String origin = "http"; + given().header("Origin", origin) + .get("/test").then() + .statusCode(403) + .header("Access-Control-Allow-Origin", nullValue()); + } + + @Test + void corsInvalidSameOriginRequest2() { + String origin = "http://local"; + given().header("Origin", origin) + .get("/test").then() + .statusCode(403) + .header("Access-Control-Allow-Origin", nullValue()); + } + + @Test + void corsInvalidSameOriginRequest3() { + String origin = "http://localhost"; + given().header("Origin", origin) + .get("/test").then() + .statusCode(403) + .header("Access-Control-Allow-Origin", nullValue()); + } + + @Test + void corsInvalidSameOriginRequest4() { + String origin = "http://localhost:9999"; + given().header("Origin", origin) + .get("/test").then() + .statusCode(403) + .header("Access-Control-Allow-Origin", nullValue()); + } + + @Test + void corsInvalidSameOriginRequest5() { + String origin = "https://localhost:8483"; + given().header("Origin", origin) + .get("/test").then() + .statusCode(403) + .header("Access-Control-Allow-Origin", nullValue()); + } + @Test @DisplayName("Returns false 'Access-Control-Allow-Credentials' header on matching origin '*'") void corsMatchingOriginWithWildcard() { diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java index 4a7fee1a14e..d9cba6755d0 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java @@ -1,5 +1,6 @@ package io.quarkus.vertx.http.runtime.cors; +import java.net.URI; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -176,7 +177,7 @@ public void handle(RoutingContext event) { } boolean allowsOrigin = isConfiguredWithWildcard(corsConfig.origins) || corsConfig.origins.get().contains(origin) - || isOriginAllowedByRegex(allowedOriginsRegex, origin); + || isOriginAllowedByRegex(allowedOriginsRegex, origin) || isSameOrigin(request, origin); if (allowsOrigin) { response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, origin); @@ -210,4 +211,18 @@ public void handle(RoutingContext event) { } } } + + private static boolean isSameOrigin(HttpServerRequest request, String origin) { + String absUriString = request.absoluteURI(); + if (absUriString.startsWith(origin)) { + // Make sure that Origin URI contains scheme, host, and port. + // If no port is set in Origin URI then the request URI must not have it set either + URI baseUri = URI.create(absUriString.substring(0, origin.length())); + if (baseUri.getScheme() != null && baseUri.getHost() != null + && (baseUri.getPort() > 0 || URI.create(absUriString).getPort() == -1)) { + return true; + } + } + return false; + } }

['extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSHandlerTestWildcardOriginCase.java', 'extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29596/29592

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29592

https://github.com/quarkusio/quarkus/pull/29596

https://github.com/quarkusio/quarkus/pull/29596

closes

[infinispan-client] cache configuration not available while bootstrapping dev mode

### Describe the bug Hi, I am trying to use infinispan cache configuration that was recently added to application yaml [1]. I am trying to use it in dev mode and this results in NPE while bootstraping. Testing with the configured cache is working well. `2022-11-30 19:47:52,653 ERROR [io.qua.run.Application] (Quarkus Main Thread) Failed to start application (with profile dev): java.lang.NullPointerException: Cannot invoke "java.net.URL.toURI()" because "configFile" is null at io.quarkus.infinispan.client.runtime.InfinispanClientProducer.builderFromProperties(InfinispanClientProducer.java:239) at io.quarkus.infinispan.client.runtime.InfinispanClientProducer.initialize(InfinispanClientProducer.java:66) at io.quarkus.infinispan.client.runtime.InfinispanClientProducer.remoteCacheManager(InfinispanClientProducer.java:367)` I debugged the issue and it looks like the classloader that is used to retrieve configuration file as a resource can't do it (`Quarkus Base Runtime ClassLoader: DEV`) but if I get the Thread's classLoader(`Quarkus Runtime ClassLoader: DEV restart no:0`) I am able to do so. [1] https://quarkus.io/guides/infinispan-client#quarkus-infinispan-client_quarkus.infinispan-client.cache.-cache-.configuration-uri ### Expected behavior Dev mode will start correctly and Infinispan server will be configured with the cache specified in application.yaml. ### Actual behavior Starting dev mode throws NPE on failing to find resource defined in the application.yaml ### How to Reproduce? I've created a simple reproducer. 1. git clone https://github.com/michalovjan/infinispan-bug-reproducer.git 2. mvn clean install quarkus:dev ### Output of `uname -a` or `ver` Darwin jmichalo-mac 22.1.0 Darwin Kernel Version 22.1.0: Sun Oct 9 20:14:30 PDT 2022; root:xnu-8792.41.9~2/RELEASE_ARM64_T8103 arm64 ### Output of `java -version` openjdk 17.0.2 2022-01-18 OpenJDK Runtime Environment Temurin-17.0.2+8 (build 17.0.2+8) OpenJDK 64-Bit Server VM Temurin-17.0.2+8 (build 17.0.2+8, mixed mode) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.14.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 (84538c9988a25aec085021c365c560670ad80f63) Maven home: /Users/jmichalo/.m2/wrapper/dists/apache-maven-3.8.6-bin/67568434/apache-maven-3.8.6 Java version: 17.0.2, vendor: Eclipse Adoptium, runtime: /Users/jmichalo/.sdkman/candidates/java/17.0.2-tem Default locale: en_CZ, platform encoding: UTF-8 OS name: "mac os x", version: "13.0.1", arch: "aarch64", family: "mac" ### Additional information _No response_

c69d8d8e661dbe8fbab35060d892b1cf60601410

5deeb182e32e6bb9c9883bc38d03e6abe1d922aa

https://github.com/quarkusio/quarkus/compare/c69d8d8e661dbe8fbab35060d892b1cf60601410...5deeb182e32e6bb9c9883bc38d03e6abe1d922aa

diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java index f59c6dbd49a..16e1bfa30f5 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java @@ -233,7 +233,7 @@ private ConfigurationBuilder builderFromProperties(Properties properties) { String cacheName = cache.getKey(); InfinispanClientRuntimeConfig.RemoteCacheConfig remoteCacheConfig = cache.getValue(); if (remoteCacheConfig.configurationUri.isPresent()) { - URL configFile = InfinispanClientProducer.class.getClassLoader() + URL configFile = Thread.currentThread().getContextClassLoader() .getResource(remoteCacheConfig.configurationUri.get()); try { builder.remoteCache(cacheName).configurationURI(configFile.toURI());

['extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29883/29836

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29836

https://github.com/quarkusio/quarkus/pull/29883

https://github.com/quarkusio/quarkus/pull/29883

fixes

ArC - improve the way a wildcard in a producer return/field type is detected

### Describe the bug It seems that we don't search through the "nested" parameterized types. Note that wildcards are not legal in a a producer return/field type. See also https://jakarta.ee/specifications/cdi/2.0/cdi-spec-2.0.html#producer_field. This is a follow-up of https://github.com/quarkusio/quarkus/pull/4756. ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? Replace the return type of `io.quarkus.arc.processor.TypesTest.Producer.produce()`; `List<? extends Number>` -> `List<Set<? extends Number>>` ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

340b85c1b8b005750d6009a1990f59a77f32bff5

b39b96b22f22cda141ee9e04088eeb34814c1119

https://github.com/quarkusio/quarkus/compare/340b85c1b8b005750d6009a1990f59a77f32bff5...b39b96b22f22cda141ee9e04088eeb34814c1119

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java index 0b914cad9ef..1aee1542711 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java @@ -432,6 +432,30 @@ static List<Type> getResolvedParameters(ClassInfo classInfo, Map<String, Type> r } } + static void detectWildcardAndThrow(Type type, AnnotationTarget producerFieldOrMethod) { + if (producerFieldOrMethod == null) { + // not a producer, no further analysis required + return; + } + if (type.kind().equals(Kind.WILDCARD_TYPE)) { + throw new DefinitionException("Producer " + + (producerFieldOrMethod.kind().equals(AnnotationTarget.Kind.FIELD) ? "field " : "method ") + + producerFieldOrMethod + + " declared on class " + + (producerFieldOrMethod.kind().equals(AnnotationTarget.Kind.FIELD) + ? producerFieldOrMethod.asField().declaringClass().name() + : producerFieldOrMethod.asMethod().declaringClass().name()) + + + " contains a parameterized type with a wildcard. This type is not a legal bean type" + + " according to CDI specification."); + } else if (type.kind().equals(Kind.PARAMETERIZED_TYPE)) { + for (Type t : type.asParameterizedType().arguments()) { + // recursive check of all parameterized types + detectWildcardAndThrow(t, producerFieldOrMethod); + } + } + } + static Set<Type> getTypeClosure(ClassInfo classInfo, AnnotationTarget producerFieldOrMethod, Map<String, Type> resolvedTypeParameters, BeanDeployment beanDeployment, BiConsumer<ClassInfo, Map<String, Type>> resolvedTypeVariablesConsumer) { @@ -445,19 +469,12 @@ static Set<Type> getTypeClosure(ClassInfo classInfo, AnnotationTarget producerFi } else { // Canonical ParameterizedType with unresolved type variables Type[] typeParams = new Type[typeParameters.size()]; - boolean skipThisType = false; for (int i = 0; i < typeParameters.size(); i++) { typeParams[i] = resolvedTypeParameters.get(typeParameters.get(i).identifier()); - // this should only be the case for producers; wildcard is not a legal bean type + // for producers, wildcard is not a legal bean type and results in a definition error // see https://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#legal_bean_types - if (typeParams[i].kind().equals(Kind.WILDCARD_TYPE) && producerFieldOrMethod != null) { - LOGGER.info("Producer " + - (producerFieldOrMethod.kind().equals(AnnotationTarget.Kind.FIELD) ? "field " : "method ") + - producerFieldOrMethod + - " contains a parameterized typed with a wildcard. This type is not a legal bean type" + - " according to CDI specification and will be ignored during bean resolution."); - skipThisType = true; - } + // NOTE: wildcard can be nested, such as List<Set<? extends Number>> + detectWildcardAndThrow(typeParams[i], producerFieldOrMethod); } if (resolvedTypeVariablesConsumer != null) { Map<String, Type> resolved = new HashMap<>(); @@ -466,9 +483,7 @@ static Set<Type> getTypeClosure(ClassInfo classInfo, AnnotationTarget producerFi } resolvedTypeVariablesConsumer.accept(classInfo, resolved); } - if (!skipThisType) { - types.add(ParameterizedType.create(classInfo.name(), typeParams, null)); - } + types.add(ParameterizedType.create(classInfo.name(), typeParams, null)); } // Interfaces for (Type interfaceType : classInfo.interfaceTypes()) { diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java index fbe3e19e240..eb35c5ff8ac 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java @@ -1,6 +1,7 @@ package io.quarkus.arc.processor; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; @@ -11,11 +12,11 @@ import java.util.Map; import java.util.Set; +import javax.enterprise.inject.spi.DefinitionException; + 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.ParameterizedType; import org.jboss.jandex.Type; import org.jboss.jandex.Type.Kind; @@ -26,7 +27,7 @@ public class TypesTest { @Test public void testGetTypeClosure() throws IOException { IndexView index = Basics.index(Foo.class, Baz.class, Producer.class, Object.class, List.class, Collection.class, - Iterable.class); + Iterable.class, Set.class); DotName bazName = DotName.createSimple(Baz.class.getName()); DotName fooName = DotName.createSimple(Foo.class.getName()); DotName producerName = DotName.createSimple(Producer.class.getName()); @@ -64,18 +65,19 @@ public void testGetTypeClosure() throws IOException { } } ClassInfo producerClass = index.getClassByName(producerName); - String producersName = "produce"; - MethodInfo producerMethod = producerClass.method(producersName); - // Object is the sole type - Set<Type> producerMethodTypes = Types.getProducerMethodTypeClosure(producerMethod, - dummyDeployment); - assertEquals(1, producerMethodTypes.size()); + final String producersName = "produce"; + assertThrows(DefinitionException.class, + () -> Types.getProducerMethodTypeClosure(producerClass.method(producersName), dummyDeployment)); + assertThrows(DefinitionException.class, + () -> Types.getProducerFieldTypeClosure(producerClass.field(producersName), dummyDeployment)); + + // now assert the same with nested wildcard + final String nestedWildCardProducersName = "produceNested"; + assertThrows(DefinitionException.class, + () -> Types.getProducerMethodTypeClosure(producerClass.method(nestedWildCardProducersName), dummyDeployment)); + assertThrows(DefinitionException.class, + () -> Types.getProducerFieldTypeClosure(producerClass.field(nestedWildCardProducersName), dummyDeployment)); - // Object is the sole type - FieldInfo producerField = producerClass.field(producersName); - Set<Type> producerFieldTypes = Types.getProducerFieldTypeClosure(producerField, - dummyDeployment); - assertEquals(1, producerFieldTypes.size()); } static class Foo<T> { @@ -94,6 +96,12 @@ public List<? extends Number> produce() { return null; } + public List<Set<? extends Number>> produceNested() { + return null; + } + List<? extends Number> produce; + + List<Set<? extends Number>> produceNested; } }

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java', 'independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29832/29783

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29783

https://github.com/quarkusio/quarkus/pull/29832

https://github.com/quarkusio/quarkus/pull/29832

resolves

@PreDestroy method not awaited

## Quarkus version 2.14.2 on Linux with OpenJSD 11.0.17+8 ## Actual behaviour I get the following exception on session timeout: ``` ERROR [io.qua.arc.imp.AbstractInstanceHandle] (executor-thread-31) Error occurred while destroying instance of bean [...SessionManager_Bean]: javax.enterprise.context.ContextNotActiveException: SessionScoped context was not active when trying to obtain a bean instance for a client proxy of CLASS bean [class=...MyAPIClient, id=5b2...] ``` ## Expected behavior Session scope and @SessionScoped beans should not be destroyed as long as all methods annotated with @PreDestroy of unremovable beans have returned. ## How to Reproduce? ```java @Named("myAPIClient") @SessionScoped public class MyAPIClient implements Serializable { ... } @Named("sessionManager") @SessionScoped public class SessionManager implements Serializable { @Inject private myAPIClient myAPIClient; @PreDestroy public void autoLogout() { myAPIClient.doSomething(); // <-- Exception thrown here } ... } ``` Any hints?

4fe6585189ef929d145d46721a76a073052c76fd

6263710342517015d32ebf904757b12f0dfa4c9d

https://github.com/quarkusio/quarkus/compare/4fe6585189ef929d145d46721a76a073052c76fd...6263710342517015d32ebf904757b12f0dfa4c9d

diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpSessionContext.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpSessionContext.java index da04a1be1d3..25a5d54942d 100644 --- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpSessionContext.java +++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpSessionContext.java @@ -16,6 +16,8 @@ import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; +import org.jboss.logging.Logger; + import io.quarkus.arc.Arc; import io.quarkus.arc.ContextInstanceHandle; import io.quarkus.arc.InjectableBean; @@ -31,6 +33,10 @@ public class HttpSessionContext implements InjectableContext, HttpSessionListene private static final String CONTEXTUAL_INSTANCES_KEY = HttpSessionContext.class.getName() + ".contextualInstances"; + private static final ThreadLocal<HttpSession> DESTRUCT_SESSION = new ThreadLocal<>(); + + private static final Logger LOG = Logger.getLogger(HttpSessionContext.class); + @Override public Class<? extends Annotation> getScope() { return SessionScoped.class; @@ -39,17 +45,16 @@ public Class<? extends Annotation> getScope() { @SuppressWarnings("unchecked") @Override public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext) { - HttpServletRequest request = servletRequest(); - if (request == null) { + HttpSession session = session(true); + if (session == null) { throw new ContextNotActiveException(); } InjectableBean<T> bean = (InjectableBean<T>) contextual; - ComputingCache<Key, ContextInstanceHandle<?>> contextualInstances = getContextualInstances(request); + ComputingCache<Key, ContextInstanceHandle<?>> contextualInstances = getContextualInstances(session); if (creationalContext != null) { return (T) contextualInstances.getValue(new Key(creationalContext, bean.getIdentifier())).get(); } else { - InstanceHandle<T> handle = (InstanceHandle<T>) contextualInstances - .getValueIfPresent(new Key(null, bean.getIdentifier())); + InstanceHandle<T> handle = (InstanceHandle<T>) contextualInstances.getValueIfPresent(Key.of(bean.getIdentifier())); return handle != null ? handle.get() : null; } } @@ -61,7 +66,7 @@ public <T> T get(Contextual<T> contextual) { @Override public boolean isActive() { - return servletRequest() != null; + return session(true) != null; } @Override @@ -70,9 +75,9 @@ public ContextState getState() { @Override public Map<InjectableBean<?>, Object> getContextualInstances() { - HttpServletRequest httpServletRequest = servletRequest(); - if (httpServletRequest != null) { - return HttpSessionContext.this.getContextualInstances(httpServletRequest).getPresentValues().stream() + HttpSession session = session(false); + if (session != null) { + return HttpSessionContext.this.getContextualInstances(session).getPresentValues().stream() .collect(Collectors.toMap(ContextInstanceHandle::getBean, ContextInstanceHandle::get)); } return Collections.emptyMap(); @@ -82,13 +87,12 @@ public Map<InjectableBean<?>, Object> getContextualInstances() { @Override public void destroy(Contextual<?> contextual) { - HttpServletRequest httpServletRequest = servletRequest(); - if (httpServletRequest == null) { + HttpSession session = session(true); + if (session == null) { throw new ContextNotActiveException(); } InjectableBean<?> bean = (InjectableBean<?>) contextual; - InstanceHandle<?> instanceHandle = getContextualInstances(httpServletRequest) - .remove(new Key(null, bean.getIdentifier())); + InstanceHandle<?> instanceHandle = getContextualInstances(session).remove(Key.of(bean.getIdentifier())); if (instanceHandle != null) { instanceHandle.destroy(); } @@ -96,34 +100,38 @@ public void destroy(Contextual<?> contextual) { @Override public void destroy() { - HttpServletRequest httpServletRequest = servletRequest(); - if (httpServletRequest == null) { + HttpSession session = session(true); + if (session == null) { throw new ContextNotActiveException(); } - HttpSession session = httpServletRequest.getSession(false); - if (session != null) { - destroy(session); - } + destroy(session); } private void destroy(HttpSession session) { synchronized (this) { - ComputingCache<Key, ContextInstanceHandle<?>> contextualInstances = getContextualInstances(session); - for (ContextInstanceHandle<?> instance : contextualInstances.getPresentValues()) { - try { - instance.destroy(); - } catch (Exception e) { - throw new IllegalStateException("Unable to destroy instance" + instance.get(), e); + ComputingCache<Key, ContextInstanceHandle<?>> instances = getContextualInstances(session); + for (ContextInstanceHandle<?> instance : instances.getPresentValues()) { + // try to remove the contextual instance from the context + ContextInstanceHandle<?> val = instances.remove(Key.of(instance.getBean().getIdentifier())); + if (val != null) { + // destroy it afterwards + try { + val.destroy(); + } catch (Exception e) { + LOG.errorf(e, "Unable to destroy bean instance: %s", val.get()); + } } } - contextualInstances.clear(); + if (!instances.isEmpty()) { + LOG.warnf( + "Some @SessionScoped beans were created during destruction of the session context: %s\\n\\t- potential @PreDestroy callbacks declared on the beans were not invoked\\n\\t- in general, @SessionScoped beans should not call other @SessionScoped beans in a @PreDestroy callback", + instances.getPresentValues().stream().map(ContextInstanceHandle::getBean) + .collect(Collectors.toList())); + } + instances.clear(); } } - private ComputingCache<Key, ContextInstanceHandle<?>> getContextualInstances(HttpServletRequest httpServletRequest) { - return getContextualInstances(httpServletRequest.getSession()); - } - @SuppressWarnings({ "unchecked", "rawtypes" }) private ComputingCache<Key, ContextInstanceHandle<?>> getContextualInstances(HttpSession session) { ComputingCache<Key, ContextInstanceHandle<?>> contextualInstances = (ComputingCache<Key, ContextInstanceHandle<?>>) session @@ -135,6 +143,9 @@ private ComputingCache<Key, ContextInstanceHandle<?>> getContextualInstances(Htt if (contextualInstances == null) { contextualInstances = new ComputingCache<>(key -> { InjectableBean bean = Arc.container().bean(key.beanIdentifier); + if (key.creationalContext == null) { + throw new IllegalStateException("Cannot create bean "); + } return new ContextInstanceHandleImpl(bean, bean.create(key.creationalContext), key.creationalContext); }); session.setAttribute(CONTEXTUAL_INSTANCES_KEY, contextualInstances); @@ -144,16 +155,22 @@ private ComputingCache<Key, ContextInstanceHandle<?>> getContextualInstances(Htt return contextualInstances; } - private HttpServletRequest servletRequest() { + private HttpSession session(boolean create) { + HttpSession session = null; try { - return (HttpServletRequest) ServletRequestContext.requireCurrent().getServletRequest(); - } catch (IllegalStateException e) { - return null; + session = ((HttpServletRequest) ServletRequestContext.requireCurrent().getServletRequest()).getSession(create); + } catch (IllegalStateException ignored) { + session = DESTRUCT_SESSION.get(); } + return session; } static class Key { + static Key of(String beanIdentifier) { + return new Key(null, beanIdentifier); + } + CreationalContext<?> creationalContext; String beanIdentifier; @@ -187,7 +204,13 @@ public boolean equals(Object obj) { @Override public void sessionDestroyed(HttpSessionEvent se) { - destroy(se.getSession()); + HttpSession session = se.getSession(); + try { + DESTRUCT_SESSION.set(session); + destroy(session); + } finally { + DESTRUCT_SESSION.remove(); + } } }

['extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpSessionContext.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29821/29712

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29712

https://github.com/quarkusio/quarkus/pull/29821

https://github.com/quarkusio/quarkus/pull/29821

fix

keycloak-admin-client-reactive maps wrong id to AuthorizationResources

### Describe the bug When executing: ```java var authorizationResource = realmResource.clients().get(clientResourceId).authorization() var defaultPermission = authorizationResource.permissions().resource().findByName("Default Permission"); var permissionId = defaultPermission.getId(); authorizationResource.permissions().resource() .findById(permissionId).remove() ``` The api called is ``` http://localhost:8082/admin/realms/testrealm/clients/{clientResourceId}/authz/resource-server/permission/resource/{clientResourceId} ``` Instead of: ``` http://localhost:8082/admin/realms/testrealm/clients/{clientResourceId}/authz/resource-server/permission/resource/{permissionId} ``` Which leads to a 404 as the id of the permission is wrong. This only happens with the `reactive` version, not with the `classic` ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.14.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

30f5ad3d516744682a28914fe36031a76d444aac

2c7a295e097a72a8b5b2d478533c6cb29c780dfb

https://github.com/quarkusio/quarkus/compare/30f5ad3d516744682a28914fe36031a76d444aac...2c7a295e097a72a8b5b2d478533c6cb29c780dfb

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 39cfc80d380..86edc4adff4 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 @@ -1161,8 +1161,31 @@ private void handleSubResourceMethod(List<JaxrsClientReactiveEnricherBuildItem> ownerContext.constructor.writeInstanceField(forMethodTargetDesc, ownerContext.constructor.getThis(), constructorTarget); - ResultHandle subInstance = ownerMethod.newInstance(subConstructorDescriptor, - ownerMethod.readInstanceField(forMethodTargetDesc, ownerMethod.getThis())); + Supplier<FieldDescriptor> methodParamAnnotationsField = ownerContext.getLazyJavaMethodParamAnnotationsField( + methodIndex); + Supplier<FieldDescriptor> methodGenericParametersField = ownerContext.getLazyJavaMethodGenericParametersField( + methodIndex); + + AssignableResultHandle client = createRestClientField(name, ownerContext.classCreator, ownerMethod); + AssignableResultHandle webTarget = ownerMethod.createVariable(WebTarget.class); + ownerMethod.assign(webTarget, ownerMethod.readInstanceField(forMethodTargetDesc, ownerMethod.getThis())); + // Setup Path param from current method + for (int i = 0; i < method.getParameters().length; i++) { + MethodParameter param = method.getParameters()[i]; + if (param.parameterType == ParameterType.PATH) { + ResultHandle paramValue = ownerMethod.getMethodParam(i); + // methodTarget = methodTarget.resolveTemplate(paramname, paramvalue); + addPathParam(ownerMethod, webTarget, param.name, paramValue, + param.type, + client, + ownerMethod.readStaticField(methodGenericParametersField.get()), + ownerMethod.readStaticField(methodParamAnnotationsField.get()), + i); + } + } + + // Continue creating the subresource instance with the web target updated + ResultHandle subInstance = ownerMethod.newInstance(subConstructorDescriptor, webTarget); List<SubResourceParameter> subParamFields = new ArrayList<>(); @@ -1179,23 +1202,24 @@ private void handleSubResourceMethod(List<JaxrsClientReactiveEnricherBuildItem> ownerParameter.paramIndex)); } - FieldDescriptor clientField = createRestClientField(name, ownerContext.classCreator, ownerMethod, - subContext.classCreator, subInstance); - - Supplier<FieldDescriptor> methodParamAnnotationsField = ownerContext.getLazyJavaMethodParamAnnotationsField( - methodIndex); - Supplier<FieldDescriptor> methodGenericParametersField = ownerContext.getLazyJavaMethodGenericParametersField( - methodIndex); - // method parameters are rewritten to sub client fields (directly, public fields): + FieldDescriptor clientField = subContext.classCreator.getFieldCreator("client", RestClientBase.class) + .setModifiers(Modifier.PUBLIC) + .getFieldDescriptor(); + ownerMethod.writeInstanceField(clientField, subInstance, client); + // method parameters (except path parameters) are rewritten to sub client fields (directly, public fields): for (int i = 0; i < method.getParameters().length; i++) { - FieldDescriptor paramField = subContext.classCreator.getFieldCreator("param" + i, - method.getParameters()[i].type) - .setModifiers(Modifier.PUBLIC) - .getFieldDescriptor(); - ownerMethod.writeInstanceField(paramField, subInstance, ownerMethod.getMethodParam(i)); - subParamFields.add(new SubResourceParameter(method.getParameters()[i], method.getParameters()[i].type, - jandexMethod.parameterType(i), paramField, methodParamAnnotationsField, methodGenericParametersField, - i)); + MethodParameter param = method.getParameters()[i]; + if (param.parameterType != ParameterType.PATH) { + FieldDescriptor paramField = subContext.classCreator.getFieldCreator("param" + i, param.type) + .setModifiers(Modifier.PUBLIC) + .getFieldDescriptor(); + ownerMethod.writeInstanceField(paramField, subInstance, ownerMethod.getMethodParam(i)); + subParamFields.add(new SubResourceParameter(method.getParameters()[i], param.type, + jandexMethod.parameterType(i), paramField, methodParamAnnotationsField, + methodGenericParametersField, + i)); + } + } int subMethodIndex = 0; @@ -1555,22 +1579,19 @@ private void appendPath(MethodCreator constructor, String pathPart, AssignableRe * Create the `client` field into the `c` class that represents a RestClientBase instance. * The RestClientBase instance is coming from either a root client or a sub client (clients generated from root clients). */ - private FieldDescriptor createRestClientField(String name, ClassCreator c, MethodCreator methodCreator, ClassCreator sub, - ResultHandle subInstance) { - FieldDescriptor clientField = sub.getFieldCreator("client", RestClientBase.class) - .setModifiers(Modifier.PUBLIC) - .getFieldDescriptor(); + private AssignableResultHandle createRestClientField(String name, ClassCreator c, MethodCreator methodCreator) { + AssignableResultHandle client = methodCreator.createVariable(RestClientBase.class); if (c.getSuperClass().contains(RestClientBase.class.getSimpleName())) { // We're in a root client, so we can set the client field with: sub.client = (RestClientBase) this - methodCreator.writeInstanceField(clientField, subInstance, methodCreator.getThis()); + methodCreator.assign(client, methodCreator.getThis()); } else { FieldDescriptor subClientField = FieldDescriptor.of(name, "client", RestClientBase.class); - // We're in a sub sub resource, so we need to get the client from the field: subSub.client = sub.client - methodCreator.writeInstanceField(clientField, subInstance, - methodCreator.readInstanceField(subClientField, methodCreator.getThis())); + // We're in a sub-sub resource, so we need to get the client from the field: subSub.client = sub.client + methodCreator.assign(client, methodCreator.readInstanceField(subClientField, methodCreator.getThis())); } - return clientField; + + return client; } private void handleMultipartField(String formParamName, String partType, String partFilename, diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceTest.java index ee757d02229..53e6cc1d39f 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceTest.java @@ -61,6 +61,14 @@ void shouldPassParamsToSubSubResource() { assertThat(result).isEqualTo("rt/mthd/sub/subSimple"); } + @Test + void shouldPassPathParamsToSubSubResource() { + // should result in sending GET /path/rt/mthd/sub/s/ss + RootClient rootClient = RestClientBuilder.newBuilder().baseUri(baseUri).build(RootClient.class); + String result = rootClient.sub("rt", "mthd").sub("s").get("ss"); + assertThat(result).isEqualTo("rt/mthd/sub/s/ss"); + } + @Test void shouldDoMultiplePosts() { RootClient rootClient = RestClientBuilder.newBuilder().baseUri(baseUri).build(RootClient.class); @@ -129,6 +137,9 @@ interface SubClient { @Path("/sub") SubSubClient sub(); + @Path("/sub/{methodParam}") + SubSubClient sub(@PathParam("methodParam") String methodParam); + @POST @ClientHeaderParam(name = "overridable", value = "SubClient") @ClientHeaderParam(name = "fromSubMethod", value = "{fillingMethod}") @@ -146,6 +157,10 @@ interface SubSubClient { @Path("/subSimple") String simpleSub(); + @GET + @Path("/{methodParam}") + String get(@PathParam("methodParam") String methodParam); + @POST @ClientHeaderParam(name = "overridable", value = "SubSubClient") @ClientHeaderParam(name = "fromSubMethod", value = "{fillingMethod}")

['extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java', 'extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceTest.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29620/29585

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29585

https://github.com/quarkusio/quarkus/pull/29620

https://github.com/quarkusio/quarkus/pull/29620

fixes

@ConsumeEvent annotated method is called twice per message when generic parent class has an abstract method for it

### Describe the bug Having a class extending a class with generics which has an abstract method for the consumer method, this will result in the method annotated with `@ConsumeEvent` on the extending class to be called twice per eventbus message. ### Expected behavior Its expected that a method annotated with `@ConsumeEvent` is invoked only once per message. 1. Remove `public abstract void consume(@NonNull T event);` from `GreetingService` 2. Start the application 3. You will notice that the consumer is invoked only once per message ### Actual behavior Having a class extending a class with generics which has an abstract method for the consumer method, this will result in the method annotated with `@Consume` on the extending class to be called twice per eventbus message. 1. Start the application 2. You will notice duplicated outputs from consumer like `consuming HelloEvent on HelloService: ee73ab41-6b9a-465a-967c-d264046e0cc0` ### How to Reproduce? Reproducer: 1. Clone https://github.com/benjaminrau/genericdoublesconsumer 2. Start the application 3. See the duplicated output for same UUID (there should be only one) Ive also prepared a test which shows that the consumer is registered twice in Vertx HandlerMap: `https://github.com/benjaminrau/genericdoublesconsumer/blob/master/src/test/java/org/acme/EventBusTest.java` ### Output of `uname -a` or `ver` Linux br-builders-nb 5.14.0-1052-oem #59-Ubuntu SMP Fri Sep 9 09:37:59 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "17" 2021-09-14 OpenJDK Runtime Environment (build 17+35-2724) OpenJDK 64-Bit Server VM (build 17+35-2724, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.14.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information The log output clearly shows that the consumer is called twice for the same message since the payload is a randomized UUID string. ``` 2022-11-30 17:39:41,659 INFO [org.acm.HelloService] (vert.x-eventloop-thread-1) consuming HelloEvent on HelloService: cdd635b3-f7ee-4a07-adea-56fbebfc5366 2022-11-30 17:39:41,659 INFO [org.acm.HelloService] (vert.x-eventloop-thread-0) consuming HelloEvent on HelloService: cdd635b3-f7ee-4a07-adea-56fbebfc5366 2022-11-30 17:39:43,659 INFO [org.acm.HelloService] (vert.x-eventloop-thread-1) consuming HelloEvent on HelloService: eedb7070-d1e8-4686-8e53-c6733926ad52 2022-11-30 17:39:43,659 INFO [org.acm.HelloService] (vert.x-eventloop-thread-0) consuming HelloEvent on HelloService: eedb7070-d1e8-4686-8e53-c6733926ad52 ```

c28c01474cb75c0cec70f289d470c507c521b895

b1664aa85a3272490807fbb6c18859f02f4a157e

https://github.com/quarkusio/quarkus/compare/c28c01474cb75c0cec70f289d470c507c521b895...b1664aa85a3272490807fbb6c18859f02f4a157e

diff --git a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java index 7eeb82fb9f9..2bd342cb402 100644 --- a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java +++ b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java @@ -122,6 +122,9 @@ void collectEventConsumers( AnnotationStore annotationStore = beanRegistrationPhase.getContext().get(BuildExtension.Key.ANNOTATION_STORE); for (BeanInfo bean : beanRegistrationPhase.getContext().beans().classBeans()) { for (MethodInfo method : bean.getTarget().get().asClass().methods()) { + if (method.isSynthetic()) { + continue; + } AnnotationInstance consumeEvent = annotationStore.getAnnotation(method, CONSUME_EVENT); if (consumeEvent != null) { // Validate method params and return type

['extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29623/10673

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/10673

https://github.com/quarkusio/quarkus/pull/29623

https://github.com/quarkusio/quarkus/pull/29623

closes

OutboundSseEvent is not correctly serialized

**Describe the bug** When creating a `OutboundSseEvent` object and returning it back in a REST Endpoint it is not correctly serialized. **Expected behavior** `Server-Side Event` is sent back and it is able to be deserialized correctly. **Actual behavior** Either an exception that the object cannot be serialized or in case of using ``` @Produces(MediaType.SERVER_SENT_EVENTS) @SseElementType(MediaType.SERVER_SENT_EVENTS) ``` Then all properties like `name`, `data`, `comment` ... are serialized as a data and not in the correct fields. **To Reproduce** Steps to reproduce the behavior: Repo is here: https://github.com/lordofthejars/quarkus-quartz-streams 1. Run https://github.com/lordofthejars/quarkus-quartz-streams/blob/master/src/test/java/org/acme/ExampleResourceTest.java **Environment (please complete the following information):** - Quarkus 1.6.0.Final

b82d50ff5a48321e844c5dea822859f943a9a606

dc5f031c0f8b5f24f7f5bdba418e6f04b8dcbf25

https://github.com/quarkusio/quarkus/compare/b82d50ff5a48321e844c5dea822859f943a9a606...dc5f031c0f8b5f24f7f5bdba418e6f04b8dcbf25

diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamResource.java index def237ac8da..307d5b77d5d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamResource.java @@ -8,7 +8,10 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import javax.ws.rs.sse.OutboundSseEvent; +import javax.ws.rs.sse.Sse; import org.jboss.resteasy.reactive.common.util.MultiCollectors; import org.reactivestreams.Publisher; @@ -152,4 +155,13 @@ public Multi<String> sse() { public Multi<String> sseThrows() { throw new IllegalStateException("STOP"); } + + @Path("sse/raw") + @GET + @Produces(MediaType.SERVER_SENT_EVENTS) + public Multi<OutboundSseEvent> sseRaw(@Context Sse sse) { + return Multi.createFrom().items(sse.newEventBuilder().id("one").data("uno").name("eins").build(), + sse.newEventBuilder().id("two").data("dos").name("zwei").build(), + sse.newEventBuilder().id("three").data("tres").name("drei").build()); + } } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java index 36df4075e76..d43b1ddb124 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java @@ -237,4 +237,32 @@ public void testSseThrows() throws InterruptedException { Assertions.assertEquals(1, errors.size()); } } + + @Test + public void testSseForMultiWithOutboundSseEvent() throws InterruptedException { + Client client = ClientBuilder.newBuilder().build(); + WebTarget target = client.target(this.uri.toString() + "stream/sse/raw"); + try (SseEventSource sse = SseEventSource.target(target).build()) { + CountDownLatch latch = new CountDownLatch(1); + List<Throwable> errors = new CopyOnWriteArrayList<>(); + List<String> results = new CopyOnWriteArrayList<>(); + List<String> ids = new CopyOnWriteArrayList<>(); + List<String> names = new CopyOnWriteArrayList<>(); + sse.register(event -> { + results.add(event.readData()); + ids.add(event.getId()); + names.add(event.getName()); + }, error -> { + errors.add(error); + }, () -> { + latch.countDown(); + }); + sse.open(); + Assertions.assertTrue(latch.await(20, TimeUnit.SECONDS)); + Assertions.assertEquals(Arrays.asList("uno", "dos", "tres"), results); + Assertions.assertEquals(Arrays.asList("one", "two", "three"), ids); + Assertions.assertEquals(Arrays.asList("eins", "zwei", "drei"), names); + Assertions.assertEquals(0, errors.size()); + } + } } diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java index 3ac1f35a6de..45389d6c2ca 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java @@ -11,6 +11,7 @@ import java.util.function.Consumer; import javax.ws.rs.core.MediaType; +import javax.ws.rs.sse.OutboundSseEvent; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.util.RestMediaType; @@ -49,7 +50,12 @@ private static class SseMultiSubscriber extends AbstractMultiSubscriber { @Override public void onNext(Object item) { - OutboundSseEventImpl event = new OutboundSseEventImpl.BuilderImpl().data(item).build(); + OutboundSseEvent event; + if (item instanceof OutboundSseEvent) { + event = (OutboundSseEvent) item; + } else { + event = new OutboundSseEventImpl.BuilderImpl().data(item).build(); + } SseUtil.send(requestContext, event, customizers).whenComplete(new BiConsumer<Object, Throwable>() { @Override public void accept(Object v, Throwable t) {

['extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java', 'extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamResource.java']

{'.java': 3}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29641/29575

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29575

https://github.com/quarkusio/quarkus/pull/29641

https://github.com/quarkusio/quarkus/pull/29641

fixes

Unexpected beans added to the index and affecting restarting the application

### Describe the bug I did not manage to come up with a reproducer using a regular Quarkus application. But the issue happens if you try out this branch https://github.com/pedroigor/keycloak/tree/tmp-reactive. That branch is about switching from Resteasy Classic to Reactive in Keycloak. The issue does not happen if using Resteasy Classic and I'm not sure what is the relation, if any. Basically, when reloading the application in dev mode or when running tests using the `QuarkusMainTestExtension`, reloading the application fails with this error: ``` org.junit.jupiter.api.extension.ParameterResolutionException: Failed to resolve parameter [io.quarkus.test.junit.main.LaunchResult arg0] in method [void org.keycloak.it.cli.StartCommandTest.testHttpEnabled(io.quarkus.test.junit.main.LaunchResult)]: java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.arc.deployment.ArcProcessor#validate threw an exception: javax.enterprise.inject.spi.DeploymentException: Found 8 deployment problems: [1] Ambiguous dependencies for type javax.transaction.TransactionManager and qualifiers [@Default] - java member: io.quarkus.agroal.runtime.DataSources():transactionManager - declared on CLASS bean [types=[io.quarkus.agroal.runtime.DataSources, java.lang.Object], qualifiers=[@Default, @Any], target=io.quarkus.agroal.runtime.DataSources] - available beans: - CLASS bean [types=[java.io.Serializable, javax.transaction.TransactionManager, com.arjuna.ats.jta.cdi.NarayanaTransactionManager, com.arjuna.ats.jta.cdi.DelegatingTransactionManager, java.lang.Object], qualifiers=[@Default, @Any], target=com.arjuna.ats.jta.cdi.NarayanaTransactionManager] - CLASS bean [types=[javax.transaction.TransactionManager, java.io.Serializable, io.quarkus.narayana.jta.runtime.CDIDelegatingTransactionManager, java.lang.Object], qualifiers=[@Default, @Any], target=io.quarkus.narayana.jta.runtime.CDIDelegatingTransactionManager] ``` The first start of the application works fine and only `CDIDelegatingTransactionManager` is available to resolve `TransactionManager` bean types. However, reloading the application causes the `com.arjuna.ats.jta.cdi.NarayanaTransactionManager` to also be recognized as a potential resolver hence failing with that error. If we remove the `com.arjuna.ats.jta.cdi.NarayanaTransactionManager` at build time from our extension, the issue does not happen: ``` buildTimeConditionBuildItemBuildProducer.produce(new BuildTimeConditionBuildItem(index.getIndex().getClassByName(DotName.createSimple("com.arjuna.ats.jta.cdi.NarayanaTransactionManager")), false));` ``` ### Expected behavior Being able to reload the application without introducing beans that otherwise should be excluded. ### Actual behavior Failing to reload the application as per the description. ### How to Reproduce? * Checkout this branch https://github.com/pedroigor/keycloak/tree/tmp-reactive-bean-issue * mvn -Pdistribution -DskipTests clean install * cd quarkus/server * mvn quarkus:dev -Dquarkus.args=start-dev * After starting Keycloak in dev mode, force a restart (type `s`) ### Output of `uname -a` or `ver` Linux fedora 6.0.9-200.fc36.x86_64 #1 SMP PREEMPT_DYNAMIC Wed Nov 16 17:50:45 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "18.0.2.1" 2022-08-18 OpenJDK Runtime Environment (build 18.0.2.1+1-1) OpenJDK 64-Bit Server VM (build 18.0.2.1+1-1, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.14.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

fddf2570f0227c4253d3d240a4ddac5b56263cfe

c2ab3421a74bf755aa2bb595645bcf8bbfd009d6

https://github.com/quarkusio/quarkus/compare/fddf2570f0227c4253d3d240a4ddac5b56263cfe...c2ab3421a74bf755aa2bb595645bcf8bbfd009d6

diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java index 00fe8ebcf53..f2fb782c542 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java @@ -277,7 +277,8 @@ public void transform(TransformationContext transformationContext) { } }); - builder.setBeanArchiveIndex(index); + builder.setComputingBeanArchiveIndex(index); + builder.setImmutableBeanArchiveIndex(beanArchiveIndex.getImmutableIndex()); builder.setApplicationIndex(combinedIndex.getIndex()); List<BeanDefiningAnnotation> beanDefiningAnnotations = additionalBeanDefiningAnnotations.stream() .map((s) -> new BeanDefiningAnnotation(s.getName(), s.getDefaultScope())).collect(Collectors.toList()); diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveIndexBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveIndexBuildItem.java index fbb2813c638..0c0550f7d7e 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveIndexBuildItem.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveIndexBuildItem.java @@ -14,26 +14,42 @@ * Compared to {@link io.quarkus.deployment.builditem.CombinedIndexBuildItem} this index can contain additional classes * that were indexed while bean discovery was in progress. * - * It also holds information about all programmatically registered beans and all generated bean classes. - * * @see GeneratedBeanBuildItem - * @see AdditionalBeanBuildItem * @see io.quarkus.deployment.builditem.CombinedIndexBuildItem */ public final class BeanArchiveIndexBuildItem extends SimpleBuildItem { private final IndexView index; + private final IndexView immutableIndex; private final Set<DotName> generatedClassNames; - public BeanArchiveIndexBuildItem(IndexView index, Set<DotName> generatedClassNames) { + public BeanArchiveIndexBuildItem(IndexView index, IndexView immutableIndex, Set<DotName> generatedClassNames) { this.index = index; + this.immutableIndex = immutableIndex; this.generatedClassNames = generatedClassNames; } + /** + * This index is built on top of the immutable index. + * + * @return the computing index that can also index classes on demand + */ public IndexView getIndex() { return index; } + /** + * + * @return an immutable index that represents the bean archive + */ + public IndexView getImmutableIndex() { + return immutableIndex; + } + + /** + * + * @return the set of classes generated via {@link GeneratedBeanBuildItem} + */ public Set<DotName> getGeneratedClassNames() { return generatedClassNames; } 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 29283e4df95..cb75954e4b3 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 @@ -84,12 +84,12 @@ public BeanArchiveIndexBuildItem build(ArcConfig config, ApplicationArchivesBuil additionalClasses.put(knownMissingClass, Optional.empty()); } - // Finally, index ArC/CDI API built-in classes - return new BeanArchiveIndexBuildItem( - BeanArchives.buildBeanArchiveIndex(Thread.currentThread().getContextClassLoader(), additionalClasses, - applicationIndex, - additionalBeanIndexer.complete()), - generatedClassNames); + IndexView immutableBeanArchiveIndex = BeanArchives.buildImmutableBeanArchiveIndex(applicationIndex, + additionalBeanIndexer.complete()); + IndexView computingBeanArchiveIndex = BeanArchives.buildComputingBeanArchiveIndex( + Thread.currentThread().getContextClassLoader(), + additionalClasses, immutableBeanArchiveIndex); + return new BeanArchiveIndexBuildItem(computingBeanArchiveIndex, immutableBeanArchiveIndex, generatedClassNames); } private IndexView buildApplicationIndex(ArcConfig config, ApplicationArchivesBuildItem applicationArchivesBuildItem, diff --git a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpringDIProcessorTest.java b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpringDIProcessorTest.java index 5791891b3fc..41e6975855d 100644 --- a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpringDIProcessorTest.java +++ b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpringDIProcessorTest.java @@ -205,7 +205,8 @@ public void getAnnotationsToAddBeanMethodWithScope() { private IndexView getIndex(final Class<?>... classes) { try { Index index = Index.of(classes); - return BeanArchives.buildBeanArchiveIndex(getClass().getClassLoader(), new ConcurrentHashMap<>(), index); + return BeanArchives.buildComputingBeanArchiveIndex(getClass().getClassLoader(), new ConcurrentHashMap<>(), + BeanArchives.buildImmutableBeanArchiveIndex(index)); } catch (IOException e) { throw new IllegalStateException("Failed to index classes", e); } diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessorTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessorTest.java index 3abb0f2f333..45db58171f5 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessorTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessorTest.java @@ -115,7 +115,8 @@ public void testBuildDelayParamFromInvalidFormat() { private IndexView getIndex(final Class<?>... classes) { try { Index index = Index.of(classes); - return BeanArchives.buildBeanArchiveIndex(getClass().getClassLoader(), new ConcurrentHashMap<>(), index); + return BeanArchives.buildComputingBeanArchiveIndex(getClass().getClassLoader(), new ConcurrentHashMap<>(), + BeanArchives.buildImmutableBeanArchiveIndex(index)); } catch (IOException e) { throw new IllegalStateException("Failed to index classes", e); } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java index 88e8e83a893..78c2a429fec 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java @@ -46,7 +46,7 @@ public class AnnotationLiteralProcessor { generateAnnotationLiteralClassName(key.annotationName()), applicationClassPredicate.test(key.annotationName()), key.annotationClass)); - this.beanArchiveIndex = beanArchiveIndex; + this.beanArchiveIndex = Objects.requireNonNull(beanArchiveIndex); } boolean hasLiteralsToGenerate() { 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 bd14d9e679f..4a6dd5c8854 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 @@ -52,14 +52,23 @@ public final class BeanArchives { /** * * @param applicationIndexes - * @return the final bean archive index + * @return the immutable bean archive index */ - public static IndexView buildBeanArchiveIndex(ClassLoader deploymentClassLoader, - Map<DotName, Optional<ClassInfo>> additionalClasses, IndexView... applicationIndexes) { + public static IndexView buildImmutableBeanArchiveIndex(IndexView... applicationIndexes) { List<IndexView> indexes = new ArrayList<>(); Collections.addAll(indexes, applicationIndexes); indexes.add(buildAdditionalIndex()); - return new IndexWrapper(CompositeIndex.create(indexes), deploymentClassLoader, additionalClasses); + return CompositeIndex.create(indexes); + } + + /** + * + * @param wrappedIndexes + * @return the computing bean archive index + */ + public static IndexView buildComputingBeanArchiveIndex(ClassLoader deploymentClassLoader, + Map<DotName, Optional<ClassInfo>> additionalClasses, IndexView immutableIndex) { + return new IndexWrapper(immutableIndex, deploymentClassLoader, additionalClasses); } private static IndexView buildAdditionalIndex() { 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 dfcca8ff7eb..4997affe0f4 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 @@ -14,6 +14,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; @@ -55,8 +56,8 @@ public class BeanDeployment { private final BuildContextImpl buildContext; - private final IndexView beanArchiveIndex; - + private final IndexView beanArchiveComputingIndex; + private final IndexView beanArchiveImmutableIndex; private final IndexView applicationIndex; private final Map<DotName, ClassInfo> qualifiers; @@ -124,7 +125,8 @@ public class BeanDeployment { } this.beanDefiningAnnotations = beanDefiningAnnotations; this.resourceAnnotations = new HashSet<>(builder.resourceAnnotations); - this.beanArchiveIndex = builder.beanArchiveIndex; + this.beanArchiveComputingIndex = builder.beanArchiveComputingIndex; + this.beanArchiveImmutableIndex = Objects.requireNonNull(builder.beanArchiveImmutableIndex); this.applicationIndex = builder.applicationIndex; this.annotationStore = new AnnotationStore(initAndSort(builder.annotationTransformers, buildContext), buildContext); if (buildContext != null) { @@ -141,11 +143,11 @@ public class BeanDeployment { this.excludeTypes = builder.excludeTypes != null ? new ArrayList<>(builder.excludeTypes) : Collections.emptyList(); qualifierNonbindingMembers = new HashMap<>(); - qualifiers = findQualifiers(this.beanArchiveIndex); + qualifiers = findQualifiers(); for (QualifierRegistrar registrar : builder.qualifierRegistrars) { for (Map.Entry<DotName, Set<String>> entry : registrar.getAdditionalQualifiers().entrySet()) { DotName dotName = entry.getKey(); - ClassInfo classInfo = getClassByName(this.beanArchiveIndex, dotName); + ClassInfo classInfo = getClassByName(getBeanArchiveIndex(), dotName); if (classInfo != null) { Set<String> nonbindingMembers = entry.getValue(); if (nonbindingMembers == null) { @@ -156,15 +158,15 @@ public class BeanDeployment { } } } - repeatingQualifierAnnotations = findContainerAnnotations(qualifiers, this.beanArchiveIndex); + repeatingQualifierAnnotations = findContainerAnnotations(qualifiers); buildContextPut(Key.QUALIFIERS.asString(), Collections.unmodifiableMap(qualifiers)); interceptorNonbindingMembers = new HashMap<>(); - interceptorBindings = findInterceptorBindings(this.beanArchiveIndex); + interceptorBindings = findInterceptorBindings(); for (InterceptorBindingRegistrar registrar : builder.interceptorBindingRegistrars) { for (InterceptorBindingRegistrar.InterceptorBinding binding : registrar.getAdditionalBindings()) { DotName dotName = binding.getName(); - ClassInfo annotationClass = getClassByName(this.beanArchiveIndex, dotName); + ClassInfo annotationClass = getClassByName(getBeanArchiveIndex(), dotName); if (annotationClass != null) { Set<String> nonbinding = new HashSet<>(); for (MethodInfo method : annotationClass.methods()) { @@ -177,7 +179,7 @@ public class BeanDeployment { interceptorBindings.put(dotName, annotationClass); } } - repeatingInterceptorBindingAnnotations = findContainerAnnotations(interceptorBindings, this.beanArchiveIndex); + repeatingInterceptorBindingAnnotations = findContainerAnnotations(interceptorBindings); buildContextPut(Key.INTERCEPTOR_BINDINGS.asString(), Collections.unmodifiableMap(interceptorBindings)); Set<DotName> additionalStereotypes = new HashSet<>(); @@ -185,12 +187,11 @@ public class BeanDeployment { additionalStereotypes.addAll(stereotypeRegistrar.getAdditionalStereotypes()); } - this.stereotypes = findStereotypes(this.beanArchiveIndex, interceptorBindings, customContexts, additionalStereotypes, + this.stereotypes = findStereotypes(interceptorBindings, customContexts, additionalStereotypes, annotationStore); buildContextPut(Key.STEREOTYPES.asString(), Collections.unmodifiableMap(stereotypes)); this.transitiveInterceptorBindings = findTransitiveInterceptorBindings(interceptorBindings.keySet(), - this.beanArchiveIndex, new HashMap<>(), interceptorBindings, annotationStore); this.injectionPoints = new CopyOnWriteArrayList<>(); @@ -199,7 +200,7 @@ public class BeanDeployment { this.beans = new CopyOnWriteArrayList<>(); this.observers = new CopyOnWriteArrayList<>(); - this.assignabilityCheck = new AssignabilityCheck(beanArchiveIndex, applicationIndex); + this.assignabilityCheck = new AssignabilityCheck(getBeanArchiveIndex(), applicationIndex); this.beanResolver = new BeanResolverImpl(this); this.delegateInjectionPointResolver = new DelegateInjectionPointResolverImpl(this); this.interceptorResolver = new InterceptorResolver(this); @@ -517,12 +518,17 @@ public Collection<StereotypeInfo> getStereotypes() { } /** - * This index was used to discover components (beans, interceptors, qualifiers, etc.) and during type-safe resolution. + * Returns the index that was used during discovery and type-safe resolution. + * <p> + * In general, the returned index is usually "computing" which means that it attempts to compute the information for the + * classes that were not part of the initial bean archive index. I.e. the returned index corresponds to + * {@link BeanProcessor.Builder#setComputingBeanArchiveIndex(IndexView)}. However, if the computing index was not set then + * the index set by {@link BeanProcessor.Builder#setImmutableBeanArchiveIndex(IndexView)} is used instead. * * @return the bean archive index */ public IndexView getBeanArchiveIndex() { - return beanArchiveIndex; + return beanArchiveComputingIndex != null ? beanArchiveComputingIndex : beanArchiveImmutableIndex; } /** @@ -670,9 +676,9 @@ private void buildContextPut(String key, Object value) { } } - private Map<DotName, ClassInfo> findQualifiers(IndexView index) { + private Map<DotName, ClassInfo> findQualifiers() { Map<DotName, ClassInfo> qualifiers = new HashMap<>(); - for (AnnotationInstance qualifier : index.getAnnotations(DotNames.QUALIFIER)) { + for (AnnotationInstance qualifier : beanArchiveImmutableIndex.getAnnotations(DotNames.QUALIFIER)) { ClassInfo qualifierClass = qualifier.target().asClass(); if (isExcluded(qualifierClass)) { continue; @@ -682,23 +688,23 @@ private Map<DotName, ClassInfo> findQualifiers(IndexView index) { return qualifiers; } - private Map<DotName, ClassInfo> findContainerAnnotations(Map<DotName, ClassInfo> annotations, IndexView index) { + private Map<DotName, ClassInfo> findContainerAnnotations(Map<DotName, ClassInfo> annotations) { Map<DotName, ClassInfo> containerAnnotations = new HashMap<>(); for (ClassInfo annotation : annotations.values()) { AnnotationInstance repeatableMetaAnnotation = annotation.declaredAnnotation(DotNames.REPEATABLE); if (repeatableMetaAnnotation != null) { DotName containerAnnotationName = repeatableMetaAnnotation.value().asClass().name(); - ClassInfo containerClass = getClassByName(index, containerAnnotationName); + ClassInfo containerClass = getClassByName(getBeanArchiveIndex(), containerAnnotationName); containerAnnotations.put(containerAnnotationName, containerClass); } } return containerAnnotations; } - private Map<DotName, ClassInfo> findInterceptorBindings(IndexView index) { + private Map<DotName, ClassInfo> findInterceptorBindings() { Map<DotName, ClassInfo> bindings = new HashMap<>(); // Note: doesn't use AnnotationStore, this will operate on classes without applying annotation transformers - for (AnnotationInstance binding : index.getAnnotations(DotNames.INTERCEPTOR_BINDING)) { + for (AnnotationInstance binding : beanArchiveImmutableIndex.getAnnotations(DotNames.INTERCEPTOR_BINDING)) { ClassInfo bindingClass = binding.target().asClass(); if (isExcluded(bindingClass)) { continue; @@ -709,7 +715,6 @@ private Map<DotName, ClassInfo> findInterceptorBindings(IndexView index) { } private static Map<DotName, Set<AnnotationInstance>> findTransitiveInterceptorBindings(Collection<DotName> initialBindings, - IndexView index, Map<DotName, Set<AnnotationInstance>> result, Map<DotName, ClassInfo> interceptorBindings, AnnotationStore annotationStore) { // for all known interceptor bindings @@ -748,20 +753,20 @@ private static Set<AnnotationInstance> recursiveBuild(DotName name, return result; } - private Map<DotName, StereotypeInfo> findStereotypes(IndexView index, Map<DotName, ClassInfo> interceptorBindings, + private Map<DotName, StereotypeInfo> findStereotypes(Map<DotName, ClassInfo> interceptorBindings, Map<ScopeInfo, Function<MethodCreator, ResultHandle>> customContexts, Set<DotName> additionalStereotypes, AnnotationStore annotationStore) { Map<DotName, StereotypeInfo> stereotypes = new HashMap<>(); Set<DotName> stereotypeNames = new HashSet<>(); - for (AnnotationInstance annotation : index.getAnnotations(DotNames.STEREOTYPE)) { + for (AnnotationInstance annotation : beanArchiveImmutableIndex.getAnnotations(DotNames.STEREOTYPE)) { stereotypeNames.add(annotation.target().asClass().name()); } stereotypeNames.addAll(additionalStereotypes); for (DotName stereotypeName : stereotypeNames) { - ClassInfo stereotypeClass = getClassByName(index, stereotypeName); + ClassInfo stereotypeClass = getClassByName(getBeanArchiveIndex(), stereotypeName); if (stereotypeClass != null && !isExcluded(stereotypeClass)) { boolean isAlternative = false; @@ -852,7 +857,8 @@ private List<BeanInfo> findBeans(Collection<DotName> beanDefiningAnnotations, Li .map(StereotypeInfo::getName) .collect(Collectors.toSet()); - for (ClassInfo beanClass : beanArchiveIndex.getKnownClasses()) { + // If needed use the specialized immutable index to discover beans + for (ClassInfo beanClass : beanArchiveImmutableIndex.getKnownClasses()) { if (Modifier.isInterface(beanClass.flags()) || Modifier.isAbstract(beanClass.flags()) || beanClass.isAnnotation() || beanClass.isEnum()) { @@ -987,7 +993,7 @@ private List<BeanInfo> findBeans(Collection<DotName> beanDefiningAnnotations, Li } DotName superType = aClass.superName(); aClass = superType != null && !superType.equals(DotNames.OBJECT) - ? getClassByName(beanArchiveIndex, superType) + ? getClassByName(getBeanArchiveIndex(), superType) : null; } for (FieldInfo field : beanClass.fields()) { @@ -1233,7 +1239,7 @@ static void processErrors(List<Throwable> errors) { private List<InterceptorInfo> findInterceptors(List<InjectionPointInfo> injectionPoints) { Map<DotName, ClassInfo> interceptorClasses = new HashMap<>(); - for (AnnotationInstance annotation : beanArchiveIndex.getAnnotations(DotNames.INTERCEPTOR)) { + for (AnnotationInstance annotation : beanArchiveImmutableIndex.getAnnotations(DotNames.INTERCEPTOR)) { if (Kind.CLASS.equals(annotation.target().kind())) { interceptorClasses.put(annotation.target().asClass().name(), annotation.target().asClass()); } @@ -1260,7 +1266,7 @@ private List<InterceptorInfo> findInterceptors(List<InjectionPointInfo> injectio private List<DecoratorInfo> findDecorators(List<InjectionPointInfo> injectionPoints) { Map<DotName, ClassInfo> decoratorClasses = new HashMap<>(); - for (AnnotationInstance annotation : beanArchiveIndex.getAnnotations(DotNames.DECORATOR)) { + for (AnnotationInstance annotation : beanArchiveImmutableIndex.getAnnotations(DotNames.DECORATOR)) { if (Kind.CLASS.equals(annotation.target().kind())) { decoratorClasses.put(annotation.target().asClass().name(), annotation.target().asClass()); } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java index b869031c546..4427cfe4bea 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java @@ -91,7 +91,10 @@ private BeanProcessor(Builder builder) { this.applicationClassPredicate = builder.applicationClassPredicate; this.name = builder.name; this.output = builder.output; - this.annotationLiterals = new AnnotationLiteralProcessor(builder.beanArchiveIndex, applicationClassPredicate); + this.annotationLiterals = new AnnotationLiteralProcessor( + builder.beanArchiveComputingIndex != null ? builder.beanArchiveComputingIndex + : builder.beanArchiveImmutableIndex, + applicationClassPredicate); this.generateSources = builder.generateSources; this.allowMocking = builder.allowMocking; this.transformUnproxyableClasses = builder.transformUnproxyableClasses; @@ -99,7 +102,9 @@ private BeanProcessor(Builder builder) { // Initialize all build processors buildContext = new BuildContextImpl(); - buildContext.putInternal(Key.INDEX.asString(), builder.beanArchiveIndex); + buildContext.putInternal(Key.INDEX.asString(), + builder.beanArchiveComputingIndex != null ? builder.beanArchiveComputingIndex + : builder.beanArchiveImmutableIndex); this.beanRegistrars = initAndSort(builder.beanRegistrars, buildContext); this.observerRegistrars = initAndSort(builder.observerRegistrars, buildContext); @@ -440,7 +445,8 @@ public Predicate<DotName> getInjectionPointAnnotationsPredicate() { public static class Builder { String name; - IndexView beanArchiveIndex; + IndexView beanArchiveComputingIndex; + IndexView beanArchiveImmutableIndex; IndexView applicationIndex; Collection<BeanDefiningAnnotation> additionalBeanDefiningAnnotations; ResourceOutput output; @@ -510,14 +516,33 @@ public Builder setName(String name) { } /** - * Set the bean archive index. This index is mandatory and is used to discover components (beans, interceptors, - * qualifiers, etc.) and during type-safe resolution. + * Set the computing bean archive index. This index is optional and can be used for example during type-safe resolution. + * If it's not set then the immutable index is used instead. + * <p> + * The computing index must be built on top of the immutable index and compute only the classes that are not part of the + * immutable index. + * <p> + * This index is never used to discover components (beans, observers, etc.). + * + * @param index + * @return self + * @see Builder#setImmutableBeanArchiveIndex(IndexView) + */ + public Builder setComputingBeanArchiveIndex(IndexView index) { + this.beanArchiveComputingIndex = index; + return this; + } + + /** + * Set the immutable bean archive index. This index is mandatory and is used to discover components (beans, observers, + * etc.). * - * @param beanArchiveIndex + * @param index * @return self + * @see Builder#setComputingBeanArchiveIndex(IndexView) */ - public Builder setBeanArchiveIndex(IndexView beanArchiveIndex) { - this.beanArchiveIndex = beanArchiveIndex; + public Builder setImmutableBeanArchiveIndex(IndexView index) { + this.beanArchiveImmutableIndex = index; return this; } @@ -526,11 +551,11 @@ public Builder setBeanArchiveIndex(IndexView beanArchiveIndex) { * <p> * Some types may not be part of the bean archive index but are still needed during type-safe resolution. * - * @param applicationIndex + * @param index * @return self */ - public Builder setApplicationIndex(IndexView applicationIndex) { - this.applicationIndex = applicationIndex; + public Builder setApplicationIndex(IndexView index) { + this.applicationIndex = index; return this; } diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoInjectionsTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoInjectionsTest.java index 981ae74c5bd..ff22bbd5688 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoInjectionsTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoInjectionsTest.java @@ -42,7 +42,7 @@ public void testInjections() throws IOException { Type listStringType = ParameterizedType.create(name(List.class), new Type[] { Type.create(name(String.class), Kind.CLASS) }, null); - BeanDeployment deployment = BeanProcessor.builder().setBeanArchiveIndex(index).build().getBeanDeployment(); + BeanDeployment deployment = BeanProcessor.builder().setImmutableBeanArchiveIndex(index).build().getBeanDeployment(); deployment.registerCustomContexts(Collections.emptyList()); deployment.registerBeans(Collections.emptyList()); BeanInfo barBean = deployment.getBeans().stream().filter(b -> b.getTarget().get().equals(barClass)).findFirst().get(); diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoQualifiersTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoQualifiersTest.java index 6e5203478b4..3c95a2c557f 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoQualifiersTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoQualifiersTest.java @@ -37,7 +37,7 @@ public void testQualifiers() throws IOException { ClassInfo fooClass = index.getClassByName(fooName); BeanInfo bean = Beans.createClassBean(fooClass, - BeanProcessor.builder().setBeanArchiveIndex(index).build().getBeanDeployment(), + BeanProcessor.builder().setImmutableBeanArchiveIndex(index).build().getBeanDeployment(), null); AnnotationInstance requiredFooQualifier = index.getAnnotations(fooQualifierName).stream() diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoTypesTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoTypesTest.java index 75dd27ee2e3..bc53674cd78 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoTypesTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoTypesTest.java @@ -37,7 +37,7 @@ public void testResolver() throws IOException { Collection.class, List.class, Iterable.class, Object.class, String.class); - BeanDeployment deployment = BeanProcessor.builder().setBeanArchiveIndex(index).build().getBeanDeployment(); + BeanDeployment deployment = BeanProcessor.builder().setImmutableBeanArchiveIndex(index).build().getBeanDeployment(); DotName fooName = name(Foo.class); ClassInfo fooClass = index.getClassByName(fooName); diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java index b6bcc935947..fbe3e19e240 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java @@ -32,7 +32,8 @@ public void testGetTypeClosure() throws IOException { DotName producerName = DotName.createSimple(Producer.class.getName()); ClassInfo fooClass = index.getClassByName(fooName); Map<ClassInfo, Map<String, Type>> resolvedTypeVariables = new HashMap<>(); - BeanDeployment dummyDeployment = BeanProcessor.builder().setBeanArchiveIndex(index).build().getBeanDeployment(); + BeanDeployment dummyDeployment = BeanProcessor.builder().setImmutableBeanArchiveIndex(index).build() + .getBeanDeployment(); // Baz, Foo<String>, Object Set<Type> bazTypes = Types.getTypeClosure(index.getClassByName(bazName), null, diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java index 6d428b83335..fda3d072e71 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java @@ -20,6 +20,7 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.Index; +import org.jboss.jandex.IndexView; import org.jboss.jandex.Indexer; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; @@ -322,14 +323,14 @@ private ClassLoader init(ExtensionContext context) { Arc.shutdown(); // Build index - Index beanArchiveIndex; + IndexView immutableBeanArchiveIndex; try { - beanArchiveIndex = index(beanClasses); + immutableBeanArchiveIndex = BeanArchives.buildImmutableBeanArchiveIndex(index(beanClasses)); } catch (IOException e) { throw new IllegalStateException("Failed to create index", e); } - Index applicationIndex; + IndexView applicationIndex; if (additionalClasses.isEmpty()) { applicationIndex = null; } else { @@ -370,8 +371,9 @@ private ClassLoader init(ExtensionContext context) { BeanProcessor.Builder builder = BeanProcessor.builder() .setName(testClass.getSimpleName()) - .setBeanArchiveIndex(BeanArchives.buildBeanArchiveIndex(getClass().getClassLoader(), - new ConcurrentHashMap<>(), beanArchiveIndex)) + .setImmutableBeanArchiveIndex(immutableBeanArchiveIndex) + .setComputingBeanArchiveIndex(BeanArchives.buildComputingBeanArchiveIndex(getClass().getClassLoader(), + new ConcurrentHashMap<>(), immutableBeanArchiveIndex)) .setApplicationIndex(applicationIndex); if (!resourceAnnotations.isEmpty()) { builder.addResourceAnnotations(resourceAnnotations.stream()

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java', 'independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java', 'independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoTypesTest.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveIndexBuildItem.java', 'extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessorTest.java', 'independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoQualifiersTest.java', 'extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpringDIProcessorTest.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java', 'independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java', 'independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoInjectionsTest.java']

{'.java': 14}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29674/29469

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29469

https://github.com/quarkusio/quarkus/pull/29674

https://github.com/quarkusio/quarkus/pull/29674

fix

Response Body in ClientExceptionMapper is always null

### Describe the bug We implemented a REST-Client using the quarkus-rest-client-reactive dependency. For this client we added custom exception handling using the `@ClientExceptionMapper` annotation. There we could read the body of the response. e.g.: ```java @ClientExceptionMapper static ServiceException handle(Response response) { response.bufferEntity(); Error error = response.readEntity(Error.class); return new ServiceException(error.getReason(), error.getMessage(), response.getStatus()); } ``` Now with the new version the entity object is always null. (So error.getMessag will throw a NullPointerException) (Also if we jus handle the WebApplicationException we can't read the body because its null) For the status everything works fine. This works for quarkus-plattform version 2.13.3 but not in version 2.14.1. ### Expected behavior The error object should be the parsed (json-)-response-object. ### Actual behavior The error object is null because the entity of response is null. ### How to Reproduce? 1. Create a rest-client 2. Make a request that will fail (400, 404, ...) 3. Handle the custom/WebApplicationException 4. read the response body from the exception ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` openjdk version "17.0.2" 2022-01-18 OpenJDK Runtime Environment (build 17.0.2+8-86) OpenJDK 64-Bit Server VM (build 17.0.2+8-86, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.2 (ea98e05a04480131370aa0c110b8c54cf726c06f) ### Additional information _No response_

35b6eae2ffe4ba963a485a93fb10bf2306b0420b

bd57642ab2d5451a5652e0cf2f318f1cd9c402c1

https://github.com/quarkusio/quarkus/compare/35b6eae2ffe4ba963a485a93fb10bf2306b0420b...bd57642ab2d5451a5652e0cf2f318f1cd9c402c1

diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicRestClientTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicRestClientTest.java index ab885f48c38..3148c53acf5 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicRestClientTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicRestClientTest.java @@ -1,10 +1,7 @@ package io.quarkus.rest.client.reactive; -import static io.restassured.RestAssured.given; import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; -import java.time.Duration; import java.util.Map; import java.util.Set; @@ -75,23 +72,4 @@ void shouldMapQueryParamsWithSpecialCharacters() { assertThat(map.get("p5")).isEqualTo("5"); assertThat(map.get("p6")).isEqualTo("6"); } - - /** - * Test to reproduce https://github.com/quarkusio/quarkus/issues/28818. - */ - @Test - void shouldCloseConnectionsWhenFailures() { - // It's using 30 seconds because it's the default timeout to release connections. This timeout should not be taken into - // account when there are failures, and we should be able to call 3 times to the service without waiting. - await().atMost(Duration.ofSeconds(30)) - .until(() -> { - for (int call = 0; call < 3; call++) { - given() - .when().get("/hello/callClientForImageInfo") - .then() - .statusCode(500); - } - return true; - }); - } } diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient2.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient2.java index 2c2c31eab34..660c55a0260 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient2.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient2.java @@ -4,7 +4,6 @@ import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; -import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; @@ -24,10 +23,4 @@ public interface HelloClient2 { @GET @Path("delay") Uni<String> delay(); - - @POST - @Path("/imageInfo") - @Consumes("image/gif") - @Produces(MediaType.TEXT_PLAIN) - String imageInfo(byte[] imageFile); } diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloResource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloResource.java index 65b0dc25760..f298c0b3030 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloResource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloResource.java @@ -78,23 +78,4 @@ public Uni<String> delay() { return Uni.createFrom().item("Hello") .onItem().delayIt().by(Duration.ofMillis(500)); } - - @Path("callClientForImageInfo") - @GET - public String callClientForImageInfo() { - int size = 1024 * 1024 * 5; - - byte[] buffer = new byte[size]; - - //Should provoke 415 Unsupported Media Type - return client2.imageInfo(buffer); - } - - @POST - @Consumes({ "image/jpeg", "image/png" }) - @Path("/imageInfo") - @Produces(MediaType.TEXT_PLAIN) - public String imageInfo(byte[] imageFile) { - throw new IllegalStateException("This method should never be invoked"); - } } diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java index 2bf3f434ecb..8d1d7d62c3c 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java @@ -20,7 +20,6 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; import javax.ws.rs.core.Variant; import org.jboss.logging.Logger; @@ -244,11 +243,6 @@ public void handle(HttpClientResponse clientResponse) { } } - if (Response.Status.Family.familyOf(status) != Response.Status.Family.SUCCESSFUL) { - httpClientRequest.connection().close(); - requestContext.resume(); - } - if (isResponseMultipart(requestContext)) { QuarkusMultipartResponseDecoder multipartDecoder = new QuarkusMultipartResponseDecoder( clientResponse); @@ -372,16 +366,17 @@ public void handle(Buffer buffer) { requestContext.resume(t); } } - }).onFailure(new Handler<>() { - @Override - public void handle(Throwable failure) { - if (failure instanceof IOException) { - requestContext.resume(new ProcessingException(failure)); - } else { - requestContext.resume(failure); - } - } - }); + }) + .onFailure(new Handler<>() { + @Override + public void handle(Throwable failure) { + if (failure instanceof IOException) { + requestContext.resume(new ProcessingException(failure)); + } else { + requestContext.resume(failure); + } + } + }); } private boolean isResponseMultipart(RestClientRequestContext requestContext) {

['extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloResource.java', 'extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient2.java', 'independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java', 'extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicRestClientTest.java']

{'.java': 4}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29681/29497

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29497

https://github.com/quarkusio/quarkus/pull/29681

https://github.com/quarkusio/quarkus/pull/29681

fix

Missing spec.template.metadata.labels in deployment

### Describe the bug Following the OpenShift Guide (https://quarkus.io/guides/deploying-to-openshift) I tried to switch from the default DeploymentConfig to Deployment but ended up with the error: ``` Message: Deployment.apps "openshift-quickstart" is invalid: spec.template.metadata.labels: Invalid value: map[string]string(nil): `selector` does not match template `labels`. ``` Looking at the produced openshift.yml I saw that there seems to be missing metadata labels in the spec template: ```yaml --- apiVersion: apps/v1 kind: Deployment metadata: annotations: app.openshift.io/vcs-url: <<unknown>> app.quarkus.io/build-timestamp: 2022-11-25 - 17:08:22 +0000 labels: app.kubernetes.io/version: 1.0.0-SNAPSHOT app.kubernetes.io/name: openshift-quickstart app.openshift.io/runtime: quarkus name: openshift-quickstart spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: openshift-quickstart app.kubernetes.io/version: 1.0.0-SNAPSHOT template: spec: containers: - env: - name: JAVA_APP_JAR value: /deployments/quarkus-run.jar image: image-registry.openshift-image-registry.svc:5000/quarkus-test/openshift-quickstart:1.0.0-SNAPSHOT imagePullPolicy: Always name: openshift-quickstart ports: - containerPort: 8080 name: http protocol: TCP --- ``` ### Expected behavior Ending up with a working Deployment when using the config "quarkus.openshift.deployment-kind=Deployment" ### Actual behavior ```posh [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 49.388 s [INFO] Finished at: 2022-11-25T18:08:46+01:00 [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal io.quarkus.platform:quarkus-maven-plugin:2.14.1.Final:build (default) on project openshift-quickstart: Failed to build quarkus application: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [ERROR] [error]: Build step io.quarkus.kubernetes.deployment.KubernetesDeployer#deploy threw an exception: io.fabric8.kubernetes.client.KubernetesClientException: Failure executing: POST at: https://api.crc.testing:6443/apis/apps/v1/namespaces/quarkus-test/deployments. Message: Deployment.apps "openshift-quickstart" is invalid: spec.template.metadata.labels: Invalid value: map[string]string(nil): `selector` does not match template `labels`. Received status: Status(apiVersion=v1, code=422, details=StatusDetails(causes=[StatusCause(field=spec.template.metadata.labels, message=Invalid value: map[string]string(nil): `selector` does not match template `labels`, reason=FieldValueInvalid, additionalProperties={})], group=apps, kind=Deployment, name=openshift-quickstart, retryAfterSeconds=null, uid=null, additionalProperties={}), kind=Status, message=Deployment.apps "openshift-quickstart" is invalid: spec.template.metadata.labels: Invalid value: map[string]string(nil): `selector` does not match template `labels`, metadata=ListMeta(_continue=null, remainingItemCount=null, resourceVersion=null, selfLink=null, additionalProperties={}), reason=Invalid, status=Failure, additionalProperties={}). [ERROR] at io.fabric8.kubernetes.client.KubernetesClientException.copyAsCause(KubernetesClientException.java:238) [ERROR] at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.waitForResult(OperationSupport.java:517) [ERROR] at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.handleResponse(OperationSupport.java:551) [ERROR] at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.handleResponse(OperationSupport.java:535) [ERROR] at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.handleCreate(OperationSupport.java:328) [ERROR] at io.fabric8.kubernetes.client.dsl.internal.BaseOperation.handleCreate(BaseOperation.java:675) [ERROR] at io.fabric8.kubernetes.client.dsl.internal.BaseOperation.handleCreate(BaseOperation.java:88) [ERROR] at io.fabric8.kubernetes.client.dsl.internal.CreateOnlyResourceOperation.create(CreateOnlyResourceOperation.java:42) [ERROR] at io.fabric8.kubernetes.client.utils.internal.CreateOrReplaceHelper.createOrReplace(CreateOrReplaceHelper.java:50) [ERROR] at io.fabric8.kubernetes.client.dsl.internal.BaseOperation.createOrReplace(BaseOperation.java:296) [ERROR] at io.fabric8.kubernetes.client.dsl.internal.BaseOperation.createOrReplace(BaseOperation.java:88) [ERROR] at io.fabric8.kubernetes.client.extension.ResourceAdapter.createOrReplace(ResourceAdapter.java:121) [ERROR] at io.quarkus.kubernetes.deployment.KubernetesDeployer.lambda$deploy$5(KubernetesDeployer.java:251) [ERROR] at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:183) [ERROR] at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:179) [ERROR] at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1625) [ERROR] at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509) [ERROR] at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499) [ERROR] at java.base/java.util.stream.ForEachOps$ForEachOp.evaluateSequential(ForEachOps.java:150) [ERROR] at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(ForEachOps.java:173) [ERROR] at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234) [ERROR] at java.base/java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:596) [ERROR] at io.quarkus.kubernetes.deployment.KubernetesDeployer.deploy(KubernetesDeployer.java:226) [ERROR] at io.quarkus.kubernetes.deployment.KubernetesDeployer.deploy(KubernetesDeployer.java:135) [ERROR] at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [ERROR] at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) [ERROR] at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [ERROR] at java.base/java.lang.reflect.Method.invoke(Method.java:568) [ERROR] at io.quarkus.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:909) [ERROR] at io.quarkus.builder.BuildContext.run(BuildContext.java:281) [ERROR] at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) [ERROR] at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) [ERROR] at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1478) [ERROR] at java.base/java.lang.Thread.run(Thread.java:833) [ERROR] at org.jboss.threads.JBossThread.run(JBossThread.java:501) [ERROR] Caused by: io.fabric8.kubernetes.client.KubernetesClientException: Failure executing: POST at: https://api.crc.testing:6443/apis/apps/v1/namespaces/quarkus-test/deployments. Message: Deployment.apps "openshift-quickstart" is invalid: spec.template.metadata.labels: Invalid value: map[string]string(nil): `selector` does not match template `labels`. Received status: Status(apiVersion=v1, code=422, details=StatusDetails(causes=[StatusCause(field=spec.template.metadata.labels, message=Invalid value: map[string]string(nil): `selector` does not match template `labels`, reason=FieldValueInvalid, additionalProperties={})], group=apps, kind=Deployment, name=openshift-quickstart, retryAfterSeconds=null, uid=null, additionalProperties={}), kind=Status, message=Deployment.apps "openshift-quickstart" is invalid: spec.template.metadata.labels: Invalid value: map[string]string(nil): `selector` does not match template `labels`, metadata=ListMeta(_continue=null, remainingItemCount=null, resourceVersion=null, selfLink=null, additionalProperties={}), reason=Invalid, status=Failure, additionalProperties={}). [ERROR] at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.requestFailure(OperationSupport.java:709) [ERROR] at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.requestFailure(OperationSupport.java:689) [ERROR] at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.assertResponseCode(OperationSupport.java:640) [ERROR] at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.lambda$handleResponse$0(OperationSupport.java:576) [ERROR] at java.base/java.util.concurrent.CompletableFuture$UniApply.tryFire(CompletableFuture.java:646) [ERROR] at java.base/java.util.concurrent.CompletableFuture.postComplete(CompletableFuture.java:510) [ERROR] at java.base/java.util.concurrent.CompletableFuture.complete(CompletableFuture.java:2147) [ERROR] at io.fabric8.kubernetes.client.dsl.internal.OperationSupport.lambda$retryWithExponentialBackoff$2(OperationSupport.java:618) [ERROR] at java.base/java.util.concurrent.CompletableFuture.uniWhenComplete(CompletableFuture.java:863) [ERROR] at java.base/java.util.concurrent.CompletableFuture$UniWhenComplete.tryFire(CompletableFuture.java:841) [ERROR] at java.base/java.util.concurrent.CompletableFuture.postComplete(CompletableFuture.java:510) [ERROR] at java.base/java.util.concurrent.CompletableFuture.complete(CompletableFuture.java:2147) [ERROR] at io.fabric8.kubernetes.client.okhttp.OkHttpClientImpl$4.onResponse(OkHttpClientImpl.java:277) [ERROR] at okhttp3.RealCall$AsyncCall.execute(RealCall.java:174) [ERROR] at okhttp3.internal.NamedRunnable.run(NamedRunnable.java:32) [ERROR] at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136) [ERROR] at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635) [ERROR] at java.base/java.lang.Thread.run(Thread.java:833) [ERROR] -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException ``` ### How to Reproduce? 1. mvn io.quarkus.platform:quarkus-maven-plugin:2.14.1.Final:create -DprojectGroupId=org.acme -DprojectArtifactId=openshift-quickstart -Dextensions="resteasy-reactive,openshift" 2. cd openshift-quickstart 3. mvnw install -Dquarkus.kubernetes.deploy=true -Dquarkus.openshift.deployment-kind=Deployment -Dquarkus.container-image.group=quarkus-test ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` Java version: 17.0.3 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 ### Additional information _No response_

36c5fa542edbf49351e2b9ee0392fd56863452e4

e673ea5989f422866bcd37cfac05fac6453f13d0

https://github.com/quarkusio/quarkus/compare/36c5fa542edbf49351e2b9ee0392fd56863452e4...e673ea5989f422866bcd37cfac05fac6453f13d0

diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddDeploymentResourceDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddDeploymentResourceDecorator.java index c877ad32e26..2afcf46e728 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddDeploymentResourceDecorator.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddDeploymentResourceDecorator.java @@ -24,6 +24,8 @@ public void visit(KubernetesListFluent<?> list) { .withMatchLabels(new HashMap<String, String>()) .endSelector() .withNewTemplate() + .withNewMetadata() + .endMetadata() .withNewSpec() .addNewContainer() .withName(name) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDeploymentResourceTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDeploymentResourceTest.java index d4e5ae89ea8..4b86271cfdc 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDeploymentResourceTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDeploymentResourceTest.java @@ -2,6 +2,7 @@ package io.quarkus.it.kubernetes; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.entry; import java.io.IOException; import java.nio.file.Path; @@ -29,10 +30,12 @@ // public class OpenshiftWithDeploymentResourceTest { + private static final String NAME = "openshift-with-deployment-resource"; + @RegisterExtension static final QuarkusProdModeTest config = new QuarkusProdModeTest() .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) - .setApplicationName("openshift-with-deployment-resource") + .setApplicationName(NAME) .setApplicationVersion("0.1-SNAPSHOT") .overrideConfigKey("quarkus.openshift.deployment-kind", "Deployment") .overrideConfigKey("quarkus.openshift.replicas", "3") @@ -55,17 +58,21 @@ public void assertGeneratedResources() throws IOException { assertThat(kubernetesList).filteredOn(h -> "BuildConfig".equals(h.getKind())).hasSize(1); assertThat(kubernetesList).filteredOn(h -> "ImageStream".equals(h.getKind())).hasSize(2); assertThat(kubernetesList).filteredOn(h -> "ImageStream".equals(h.getKind()) - && h.getMetadata().getName().equals("openshift-with-deployment-resource")).hasSize(1); + && h.getMetadata().getName().equals(NAME)).hasSize(1); assertThat(kubernetesList).filteredOn(i -> i instanceof Deployment).singleElement().satisfies(i -> { assertThat(i).isInstanceOfSatisfying(Deployment.class, d -> { assertThat(d.getMetadata()).satisfies(m -> { - assertThat(m.getName()).isEqualTo("openshift-with-deployment-resource"); + assertThat(m.getName()).isEqualTo(NAME); }); assertThat(d.getSpec()).satisfies(deploymentSpec -> { assertThat(deploymentSpec.getReplicas()).isEqualTo(3); assertThat(deploymentSpec.getTemplate()).satisfies(t -> { + assertThat(t.getMetadata()).satisfies(metadata -> assertThat(metadata.getLabels()).containsAnyOf( + entry("app.kubernetes.io/name", NAME), + entry("app.kubernetes.io/version", "0.1-SNAPSHOT"))); + assertThat(t.getSpec()).satisfies(podSpec -> { assertThat(podSpec.getContainers()).singleElement().satisfies(container -> { assertThat(container.getImage())

['integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDeploymentResourceTest.java', 'extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddDeploymentResourceDecorator.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29683/29663

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29663

https://github.com/quarkusio/quarkus/pull/29683

https://github.com/quarkusio/quarkus/pull/29683

fixes

gradle addExtension fails if you have no root properties file defined

### Describe the bug Running `gradle addExtension --extensions='container-image-jib'` with no root properties file, I.E. `gradle.properties` fails. ### Expected behavior I would expect the extension to be added successfully. ### Actual behavior ``` ❯ gradle addExtension --extensions='container-image-jib' > Task :lib:addExtension FAILED FAILURE: Build failed with an exception. * What went wrong: Execution failed for task ':lib:addExtension'. > Failed to add extensions [container-image-jib] * Try: > Run with --stacktrace option to get the stack trace. > Run with --info or --debug option to get more log output. > Run with --scan to get full insights. * Get more help at https://help.gradle.org BUILD FAILED in 566ms 1 actionable task: 1 executed ``` Running with `--stacktrace`: ``` org.gradle.api.tasks.TaskExecutionException: Execution failed for task ':lib:addExtension'. at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.lambda$executeIfValid$1(ExecuteActionsTaskExecuter.java:142) at org.gradle.internal.Try$Failure.ifSuccessfulOrElse(Try.java:282) at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.executeIfValid(ExecuteActionsTaskExecuter.java:140) at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.execute(ExecuteActionsTaskExecuter.java:128) at org.gradle.api.internal.tasks.execution.CleanupStaleOutputsExecuter.execute(CleanupStaleOutputsExecuter.java:77) at org.gradle.api.internal.tasks.execution.FinalizePropertiesTaskExecuter.execute(FinalizePropertiesTaskExecuter.java:46) at org.gradle.api.internal.tasks.execution.ResolveTaskExecutionModeExecuter.execute(ResolveTaskExecutionModeExecuter.java:51) at org.gradle.api.internal.tasks.execution.SkipTaskWithNoActionsExecuter.execute(SkipTaskWithNoActionsExecuter.java:57) at org.gradle.api.internal.tasks.execution.SkipOnlyIfTaskExecuter.execute(SkipOnlyIfTaskExecuter.java:56) at org.gradle.api.internal.tasks.execution.CatchExceptionTaskExecuter.execute(CatchExceptionTaskExecuter.java:36) at org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter$1.executeTask(EventFiringTaskExecuter.java:77) at org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter$1.call(EventFiringTaskExecuter.java:55) at org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter$1.call(EventFiringTaskExecuter.java:52) at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:204) at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:199) at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:66) at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:59) at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:157) at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:59) at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:53) at org.gradle.internal.operations.DefaultBuildOperationExecutor.call(DefaultBuildOperationExecutor.java:73) at org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter.execute(EventFiringTaskExecuter.java:52) at org.gradle.execution.plan.LocalTaskNodeExecutor.execute(LocalTaskNodeExecutor.java:69) at org.gradle.execution.taskgraph.DefaultTaskExecutionGraph$InvokeNodeExecutorsAction.execute(DefaultTaskExecutionGraph.java:327) at org.gradle.execution.taskgraph.DefaultTaskExecutionGraph$InvokeNodeExecutorsAction.execute(DefaultTaskExecutionGraph.java:314) at org.gradle.execution.taskgraph.DefaultTaskExecutionGraph$BuildOperationAwareExecutionAction.execute(DefaultTaskExecutionGraph.java:307) at org.gradle.execution.taskgraph.DefaultTaskExecutionGraph$BuildOperationAwareExecutionAction.execute(DefaultTaskExecutionGraph.java:293) at org.gradle.execution.plan.DefaultPlanExecutor$ExecutorWorker.execute(DefaultPlanExecutor.java:420) at org.gradle.execution.plan.DefaultPlanExecutor$ExecutorWorker.run(DefaultPlanExecutor.java:342) at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64) at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48) Caused by: org.gradle.api.GradleException: Failed to add extensions [container-image-jib] at io.quarkus.gradle.tasks.QuarkusAddExtension.addExtension(QuarkusAddExtension.java:47) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at org.gradle.internal.reflect.JavaMethod.invoke(JavaMethod.java:125) at org.gradle.api.internal.project.taskfactory.StandardTaskAction.doExecute(StandardTaskAction.java:58) at org.gradle.api.internal.project.taskfactory.StandardTaskAction.execute(StandardTaskAction.java:51) at org.gradle.api.internal.project.taskfactory.StandardTaskAction.execute(StandardTaskAction.java:29) at org.gradle.api.internal.tasks.execution.TaskExecution$3.run(TaskExecution.java:236) at org.gradle.internal.operations.DefaultBuildOperationRunner$1.execute(DefaultBuildOperationRunner.java:29) at org.gradle.internal.operations.DefaultBuildOperationRunner$1.execute(DefaultBuildOperationRunner.java:26) at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:66) at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:59) at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:157) at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:59) at org.gradle.internal.operations.DefaultBuildOperationRunner.run(DefaultBuildOperationRunner.java:47) at org.gradle.internal.operations.DefaultBuildOperationExecutor.run(DefaultBuildOperationExecutor.java:68) at org.gradle.api.internal.tasks.execution.TaskExecution.executeAction(TaskExecution.java:221) at org.gradle.api.internal.tasks.execution.TaskExecution.executeActions(TaskExecution.java:204) at org.gradle.api.internal.tasks.execution.TaskExecution.executeWithPreviousOutputFiles(TaskExecution.java:187) at org.gradle.api.internal.tasks.execution.TaskExecution.execute(TaskExecution.java:165) at org.gradle.internal.execution.steps.ExecuteStep.executeInternal(ExecuteStep.java:89) at org.gradle.internal.execution.steps.ExecuteStep.access$000(ExecuteStep.java:40) at org.gradle.internal.execution.steps.ExecuteStep$1.call(ExecuteStep.java:53) at org.gradle.internal.execution.steps.ExecuteStep$1.call(ExecuteStep.java:50) at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:204) at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:199) at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:66) at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:59) at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:157) at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:59) at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:53) at org.gradle.internal.operations.DefaultBuildOperationExecutor.call(DefaultBuildOperationExecutor.java:73) at org.gradle.internal.execution.steps.ExecuteStep.execute(ExecuteStep.java:50) at org.gradle.internal.execution.steps.ExecuteStep.execute(ExecuteStep.java:40) at org.gradle.internal.execution.steps.RemovePreviousOutputsStep.execute(RemovePreviousOutputsStep.java:68) at org.gradle.internal.execution.steps.RemovePreviousOutputsStep.execute(RemovePreviousOutputsStep.java:38) at org.gradle.internal.execution.steps.CancelExecutionStep.execute(CancelExecutionStep.java:41) at org.gradle.internal.execution.steps.TimeoutStep.executeWithoutTimeout(TimeoutStep.java:74) at org.gradle.internal.execution.steps.TimeoutStep.execute(TimeoutStep.java:55) at org.gradle.internal.execution.steps.CreateOutputsStep.execute(CreateOutputsStep.java:51) at org.gradle.internal.execution.steps.CreateOutputsStep.execute(CreateOutputsStep.java:29) at org.gradle.internal.execution.steps.CaptureStateAfterExecutionStep.executeDelegateBroadcastingChanges(CaptureStateAfterExecutionStep.java:124) at org.gradle.internal.execution.steps.CaptureStateAfterExecutionStep.execute(CaptureStateAfterExecutionStep.java:80) at org.gradle.internal.execution.steps.CaptureStateAfterExecutionStep.execute(CaptureStateAfterExecutionStep.java:58) at org.gradle.internal.execution.steps.ResolveInputChangesStep.execute(ResolveInputChangesStep.java:48) at org.gradle.internal.execution.steps.ResolveInputChangesStep.execute(ResolveInputChangesStep.java:36) at org.gradle.internal.execution.steps.BuildCacheStep.executeWithoutCache(BuildCacheStep.java:181) at org.gradle.internal.execution.steps.BuildCacheStep.lambda$execute$1(BuildCacheStep.java:71) at org.gradle.internal.Either$Right.fold(Either.java:175) at org.gradle.internal.execution.caching.CachingState.fold(CachingState.java:59) at org.gradle.internal.execution.steps.BuildCacheStep.execute(BuildCacheStep.java:69) at org.gradle.internal.execution.steps.BuildCacheStep.execute(BuildCacheStep.java:47) at org.gradle.internal.execution.steps.StoreExecutionStateStep.execute(StoreExecutionStateStep.java:36) at org.gradle.internal.execution.steps.StoreExecutionStateStep.execute(StoreExecutionStateStep.java:25) at org.gradle.internal.execution.steps.RecordOutputsStep.execute(RecordOutputsStep.java:36) at org.gradle.internal.execution.steps.RecordOutputsStep.execute(RecordOutputsStep.java:22) at org.gradle.internal.execution.steps.SkipUpToDateStep.executeBecause(SkipUpToDateStep.java:110) at org.gradle.internal.execution.steps.SkipUpToDateStep.lambda$execute$2(SkipUpToDateStep.java:56) at org.gradle.internal.execution.steps.SkipUpToDateStep.execute(SkipUpToDateStep.java:56) at org.gradle.internal.execution.steps.SkipUpToDateStep.execute(SkipUpToDateStep.java:38) at org.gradle.internal.execution.steps.ResolveChangesStep.execute(ResolveChangesStep.java:73) at org.gradle.internal.execution.steps.ResolveChangesStep.execute(ResolveChangesStep.java:44) at org.gradle.internal.execution.steps.legacy.MarkSnapshottingInputsFinishedStep.execute(MarkSnapshottingInputsFinishedStep.java:37) at org.gradle.internal.execution.steps.legacy.MarkSnapshottingInputsFinishedStep.execute(MarkSnapshottingInputsFinishedStep.java:27) at org.gradle.internal.execution.steps.ResolveCachingStateStep.execute(ResolveCachingStateStep.java:89) at org.gradle.internal.execution.steps.ResolveCachingStateStep.execute(ResolveCachingStateStep.java:50) at org.gradle.internal.execution.steps.ValidateStep.execute(ValidateStep.java:114) at org.gradle.internal.execution.steps.ValidateStep.execute(ValidateStep.java:57) at org.gradle.internal.execution.steps.CaptureStateBeforeExecutionStep.execute(CaptureStateBeforeExecutionStep.java:76) at org.gradle.internal.execution.steps.CaptureStateBeforeExecutionStep.execute(CaptureStateBeforeExecutionStep.java:50) at org.gradle.internal.execution.steps.SkipEmptyWorkStep.executeWithNoEmptySources(SkipEmptyWorkStep.java:254) at org.gradle.internal.execution.steps.SkipEmptyWorkStep.execute(SkipEmptyWorkStep.java:91) at org.gradle.internal.execution.steps.SkipEmptyWorkStep.execute(SkipEmptyWorkStep.java:56) at org.gradle.internal.execution.steps.RemoveUntrackedExecutionStateStep.execute(RemoveUntrackedExecutionStateStep.java:32) at org.gradle.internal.execution.steps.RemoveUntrackedExecutionStateStep.execute(RemoveUntrackedExecutionStateStep.java:21) at org.gradle.internal.execution.steps.legacy.MarkSnapshottingInputsStartedStep.execute(MarkSnapshottingInputsStartedStep.java:38) at org.gradle.internal.execution.steps.LoadPreviousExecutionStateStep.execute(LoadPreviousExecutionStateStep.java:43) at org.gradle.internal.execution.steps.LoadPreviousExecutionStateStep.execute(LoadPreviousExecutionStateStep.java:31) at org.gradle.internal.execution.steps.AssignWorkspaceStep.lambda$execute$0(AssignWorkspaceStep.java:40) at org.gradle.api.internal.tasks.execution.TaskExecution$4.withWorkspace(TaskExecution.java:281) at org.gradle.internal.execution.steps.AssignWorkspaceStep.execute(AssignWorkspaceStep.java:40) at org.gradle.internal.execution.steps.AssignWorkspaceStep.execute(AssignWorkspaceStep.java:30) at org.gradle.internal.execution.steps.IdentityCacheStep.execute(IdentityCacheStep.java:37) at org.gradle.internal.execution.steps.IdentityCacheStep.execute(IdentityCacheStep.java:27) at org.gradle.internal.execution.steps.IdentifyStep.execute(IdentifyStep.java:44) at org.gradle.internal.execution.steps.IdentifyStep.execute(IdentifyStep.java:33) at org.gradle.internal.execution.impl.DefaultExecutionEngine$1.execute(DefaultExecutionEngine.java:76) at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.executeIfValid(ExecuteActionsTaskExecuter.java:139) at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.execute(ExecuteActionsTaskExecuter.java:128) at org.gradle.api.internal.tasks.execution.CleanupStaleOutputsExecuter.execute(CleanupStaleOutputsExecuter.java:77) at org.gradle.api.internal.tasks.execution.FinalizePropertiesTaskExecuter.execute(FinalizePropertiesTaskExecuter.java:46) at org.gradle.api.internal.tasks.execution.ResolveTaskExecutionModeExecuter.execute(ResolveTaskExecutionModeExecuter.java:51) at org.gradle.api.internal.tasks.execution.SkipTaskWithNoActionsExecuter.execute(SkipTaskWithNoActionsExecuter.java:57) at org.gradle.api.internal.tasks.execution.SkipOnlyIfTaskExecuter.execute(SkipOnlyIfTaskExecuter.java:56) at org.gradle.api.internal.tasks.execution.CatchExceptionTaskExecuter.execute(CatchExceptionTaskExecuter.java:36) at org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter$1.executeTask(EventFiringTaskExecuter.java:77) at org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter$1.call(EventFiringTaskExecuter.java:55) at org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter$1.call(EventFiringTaskExecuter.java:52) at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:204) at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:199) at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:66) at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:59) at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:157) at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:59) at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:53) at org.gradle.internal.operations.DefaultBuildOperationExecutor.call(DefaultBuildOperationExecutor.java:73) at org.gradle.api.internal.tasks.execution.EventFiringTaskExecuter.execute(EventFiringTaskExecuter.java:52) at org.gradle.execution.plan.LocalTaskNodeExecutor.execute(LocalTaskNodeExecutor.java:69) at org.gradle.execution.taskgraph.DefaultTaskExecutionGraph$InvokeNodeExecutorsAction.execute(DefaultTaskExecutionGraph.java:327) at org.gradle.execution.taskgraph.DefaultTaskExecutionGraph$InvokeNodeExecutorsAction.execute(DefaultTaskExecutionGraph.java:314) at org.gradle.execution.taskgraph.DefaultTaskExecutionGraph$BuildOperationAwareExecutionAction.execute(DefaultTaskExecutionGraph.java:307) at org.gradle.execution.taskgraph.DefaultTaskExecutionGraph$BuildOperationAwareExecutionAction.execute(DefaultTaskExecutionGraph.java:293) at org.gradle.execution.plan.DefaultPlanExecutor$ExecutorWorker.execute(DefaultPlanExecutor.java:420) at org.gradle.execution.plan.DefaultPlanExecutor$ExecutorWorker.run(DefaultPlanExecutor.java:342) at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64) at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48) Caused by: java.lang.NullPointerException: Cannot invoke "java.util.Properties.store(java.io.OutputStream, String)" because the return value of "io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile$Model.getRootPropertiesContent()" is null at io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile.writeToDisk(AbstractGradleBuildFile.java:50) at io.quarkus.devtools.project.buildfile.GradleProjectBuildFile.writeToDisk(GradleProjectBuildFile.java:20) at io.quarkus.devtools.project.buildfile.BuildFile.install(BuildFile.java:72) at io.quarkus.devtools.commands.handlers.AddExtensionsCommandHandler.execute(AddExtensionsCommandHandler.java:49) at io.quarkus.devtools.commands.AddExtensions.execute(AddExtensions.java:47) at io.quarkus.gradle.tasks.QuarkusAddExtension.addExtension(QuarkusAddExtension.java:45) ... 116 more ``` ### How to Reproduce? Set up a new gradle project as follows: ``` ❯ gradle init Select type of project to generate: 1: basic 2: application 3: library 4: Gradle plugin Enter selection (default: basic) [1..4] 3 Select implementation language: 1: C++ 2: Groovy 3: Java 4: Kotlin 5: Scala 6: Swift Enter selection (default: Java) [1..6] 3 Select build script DSL: 1: Groovy 2: Kotlin Enter selection (default: Groovy) [1..2] 1 Generate build using new APIs and behavior (some features may change in the next minor release)? (default: no) [yes, no] Select test framework: 1: JUnit 4 2: TestNG 3: Spock 4: JUnit Jupiter Enter selection (default: JUnit Jupiter) [1..4] Project name (default: code): Source package (default: code): > Task :init Get more help with your project: https://docs.gradle.org/7.5.1/samples/sample_building_java_libraries.html BUILD SUCCESSFUL in 17s 2 actionable tasks: 2 executed ``` Overwrite `lib/build.gradle` with the following: ``` plugins { // Apply the java-library plugin for API and implementation separation. id 'java-library' id "io.quarkus" version "2.14.2.Final" } repositories { // Use Maven Central for resolving dependencies. mavenCentral() mavenLocal() } dependencies { implementation enforcedPlatform(implementation(enforcedPlatform("io.quarkus.platform:quarkus-bom:2.14.2.Final"))) implementation 'io.quarkus:quarkus-container-image-jib-parent:2.14.2.Final' implementation 'io.quarkus:quarkus-container-image-jib:2.14.2.Final' } ``` Run `gradle addExtension --extensions='container-image-jib'` and watch it fail. Now add `gradle.properties` to the root directory of the project, re-run the command and watch it pass. ### Output of `uname -a` or `ver` Darwin C02GF586MD6R 22.1.0 Darwin Kernel Version 22.1.0: Sun Oct 9 20:14:54 PDT 2022; root:xnu-8792.41.9~2/RELEASE_X86_64 x86_64 ### Output of `java -version` openjdk version "17.0.5" 2022-10-18 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.14.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 7.5.1 ### Additional information _No response_

36c5fa542edbf49351e2b9ee0392fd56863452e4

1c16ec12e22dcfe7a311aa1ed02cbce2a73dbb37

https://github.com/quarkusio/quarkus/compare/36c5fa542edbf49351e2b9ee0392fd56863452e4...1c16ec12e22dcfe7a311aa1ed02cbce2a73dbb37

diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java index dba8d5bd5a3..dd5ea2931ce 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java @@ -46,16 +46,20 @@ public AbstractGradleBuildFile(final Path projectDirPath, final ExtensionCatalog public void writeToDisk() throws IOException { if (rootProjectPath != null) { Files.write(rootProjectPath.resolve(getSettingsGradlePath()), getModel().getRootSettingsContent().getBytes()); - try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { - getModel().getRootPropertiesContent().store(out, "Gradle properties"); - Files.write(rootProjectPath.resolve(GRADLE_PROPERTIES_PATH), - out.toByteArray()); + if (hasRootProjectFile(GRADLE_PROPERTIES_PATH)) { + try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { + getModel().getRootPropertiesContent().store(out, "Gradle properties"); + Files.write(rootProjectPath.resolve(GRADLE_PROPERTIES_PATH), + out.toByteArray()); + } } } else { writeToProjectFile(getSettingsGradlePath(), getModel().getSettingsContent().getBytes()); - try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { - getModel().getPropertiesContent().store(out, "Gradle properties"); - writeToProjectFile(GRADLE_PROPERTIES_PATH, out.toByteArray()); + if (hasProjectFile(GRADLE_PROPERTIES_PATH)) { + try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { + getModel().getPropertiesContent().store(out, "Gradle properties"); + writeToProjectFile(GRADLE_PROPERTIES_PATH, out.toByteArray()); + } } } writeToProjectFile(getBuildGradlePath(), getModel().getBuildContent().getBytes());

['independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28935/28922

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28922

https://github.com/quarkusio/quarkus/pull/28935

https://github.com/quarkusio/quarkus/pull/28935

fix

NullPointerException in Reactive REST Client

### Describe the bug There is a NullPointerException in the quarkus reactive rest client (at least in version 2.13.3.Final and 2.14.0.CR1): ``` java.lang.NullPointerException at org.jboss.resteasy.reactive.common.jaxrs.AbstractResponseBuilder.setAllHeaders(AbstractResponseBuilder.java:134) at org.jboss.resteasy.reactive.client.handlers.ClientResponseCompleteRestHandler.mapToResponse(ClientResponseCompleteRestHandler.java:45) at io.quarkus.rest.client.reactive.runtime.MicroProfileRestClientResponseFilter.filter(MicroProfileRestClientResponseFilter.java:35) at org.jboss.resteasy.reactive.client.handlers.ClientResponseFilterRestHandler.handle(ClientResponseFilterRestHandler.java:21) at org.jboss.resteasy.reactive.client.handlers.ClientResponseFilterRestHandler.handle(ClientResponseFilterRestHandler.java:10) at org.jboss.resteasy.reactive.common.core.AbstractResteasyReactiveContext.invokeHandler(AbstractResteasyReactiveContext.java:229) at org.jboss.resteasy.reactive.common.core.AbstractResteasyReactiveContext.run(AbstractResteasyReactiveContext.java:145) at org.jboss.resteasy.reactive.client.impl.RestClientRequestContext$1.lambda$execute$0(RestClientRequestContext.java:279) at io.vertx.core.impl.ContextInternal.dispatch(ContextInternal.java:264) at io.vertx.core.impl.ContextInternal.dispatch(ContextInternal.java:246) at io.vertx.core.impl.EventLoopContext.lambda$runOnContext$0(EventLoopContext.java:43) at io.netty.util.concurrent.AbstractEventExecutor.runTask(AbstractEventExecutor.java:174) at io.netty.util.concurrent.AbstractEventExecutor.safeExecute(AbstractEventExecutor.java:167) at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:470) at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:569) at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:997) at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.base/java.lang.Thread.run(Thread.java:829) ``` I managed to create a reproducer, see https://github.com/simonbaeumler/quarkus-rest-client-reactive-npe-reproducer To see the NullPointerException, just execute the test ExtensionsResourceTest.customTest() in the reproducer. So far I have pinned down the Exception happening only with this two conditions present: * The rest-client has a custom exeption handler defined (see e.g. class org.acme.rest.client.ApiExceptionMapper in the reproducer) * The rest-client runs in a read-timeout. ### Expected behavior An IllegalStateException that will be raised in the caller method of the RestClient. ### Actual behavior An NullPointerException is thrown that cannot be catched by the caller method of the RestClient. ### How to Reproduce? See https://github.com/simonbaeumler/quarkus-rest-client-reactive-npe-reproducer To see the NullPointerException, just execute the test ExtensionsResourceTest.customTest() in the reproducer. ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` openjdk version "11.0.16.1" 2022-08-12 OpenJDK Runtime Environment (Red_Hat-11.0.16.1.1-1.fc35) (build 11.0.16.1+1) OpenJDK 64-Bit Server VM (Red_Hat-11.0.16.1.1-1.fc35) (build 11.0.16.1+1, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.13.3.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

95db64848e29e9787e58e8d4cae27d2e808a0bcd

1d074d6cfb4b4c12648ddeb9221ae8711e3b7176

https://github.com/quarkusio/quarkus/compare/95db64848e29e9787e58e8d4cae27d2e808a0bcd...1d074d6cfb4b4c12648ddeb9221ae8711e3b7176

diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java index 591867ed4b8..27a43da67ef 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java @@ -131,9 +131,11 @@ public <T extends ResponseImpl> T populateResponse(T response, boolean copyHeade } public void setAllHeaders(MultivaluedMap<String, String> values) { - for (Map.Entry<String, List<String>> i : values.entrySet()) { - for (String v : i.getValue()) { - metadata.add(i.getKey(), v); + if (values != null) { + for (Map.Entry<String, List<String>> i : values.entrySet()) { + for (String v : i.getValue()) { + metadata.add(i.getKey(), v); + } } } }

['independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28608/28607

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28607

https://github.com/quarkusio/quarkus/pull/28608

https://github.com/quarkusio/quarkus/pull/28608

fixes

MongoDb Srv connection does not work on windows

### Describe the bug For the windows project, when you run the application with the maven commande mvn compile quarkus:dev -Dquarkus.profile=local The application failed to open a mongo connection with the SRV protocol. "/etc/resolv.conf" ### Expected behavior The mongodb SRV protocol should work out of the box ### Actual behavior we have a great stack trace with NPE : ``` 2022-10-14 18:17:06,767 ERROR [org.jbo.res.rea.com.cor.AbstractResteasyReactiveContext] (executor-thread-0) Request failed: java.lang.NullPointerException: Cannot invoke "java.util.List.isEmpty()" because "list" is null at io.quarkus.mongodb.runtime.dns.MongoDnsClient.lambda$new$0(MongoDnsClient.java:58) at java.base/java.util.Optional.orElseGet(Optional.java:364) at io.quarkus.mongodb.runtime.dns.MongoDnsClient.<init>(MongoDnsClient.java:56) at io.quarkus.mongodb.runtime.dns.MongoDnsClientProvider.create(MongoDnsClientProvider.java:12) at com.mongodb.internal.dns.DefaultDnsResolver.<init>(DefaultDnsResolver.java:44) at com.mongodb.ConnectionString.<init>(ConnectionString.java:397) at io.quarkus.mongodb.runtime.MongoClients.createMongoConfiguration(MongoClients.java:262) at io.quarkus.mongodb.runtime.MongoClients.createMongoClient(MongoClients.java:118) at io.quarkus.mongodb.runtime.MongoClients_Subclass.createMongoClient$$superforward1(Unknown Source) at io.quarkus.mongodb.runtime.MongoClients_Subclass$$function$$4.apply(Unknown Source) at io.quarkus.arc.impl.AroundInvokeInvocationContext.proceed(AroundInvokeInvocationContext.java:53) at io.quarkus.arc.runtime.devconsole.InvocationInterceptor.proceed(InvocationInterceptor.java:62) at io.quarkus.arc.runtime.devconsole.InvocationInterceptor.monitor(InvocationInterceptor.java:49) at io.quarkus.arc.runtime.devconsole.InvocationInterceptor_Bean.intercept(Unknown Source) at io.quarkus.arc.impl.InterceptorInvocation.invoke(InterceptorInvocation.java:41) at io.quarkus.arc.impl.AroundInvokeInvocationContext.perform(AroundInvokeInvocationContext.java:40) at io.quarkus.arc.impl.InvocationContexts.performAroundInvoke(InvocationContexts.java:32) at io.quarkus.mongodb.runtime.MongoClients_Subclass.createMongoClient(Unknown Source) at io.quarkus.mongodb.runtime.MongoClientRecorder.lambda$mongoClientSupplier$0(MongoClientRecorder.java:63) at io.quarkus.mongodb.runtime.MongoClientRecorder$MongoClientSupplier.get(MongoClientRecorder.java:57) at com.mongodb.client.MongoClient_38bcba43bbcf7928744e8baa654420f551f1ff9a_Synthetic_Bean.create(Unknown Source) at com.mongodb.client.MongoClient_38bcba43bbcf7928744e8baa654420f551f1ff9a_Synthetic_Bean.create(Unknown Source) at io.quarkus.arc.impl.AbstractSharedContext.createInstanceHandle(AbstractSharedContext.java:111) at io.quarkus.arc.impl.AbstractSharedContext$1.get(AbstractSharedContext.java:35) at io.quarkus.arc.impl.AbstractSharedContext$1.get(AbstractSharedContext.java:32) at io.quarkus.arc.impl.LazyValue.get(LazyValue.java:26) at io.quarkus.arc.impl.ComputingCache.computeIfAbsent(ComputingCache.java:69) at io.quarkus.arc.impl.AbstractSharedContext.get(AbstractSharedContext.java:32) at io.quarkus.arc.impl.ClientProxies.getApplicationScopedDelegate(ClientProxies.java:19) at com.mongodb.client.MongoClient_38bcba43bbcf7928744e8baa654420f551f1ff9a_Synthetic_ClientProxy.arc$delegate(Unknown Source) at com.mongodb.client.MongoClient_38bcba43bbcf7928744e8baa654420f551f1ff9a_Synthetic_ClientProxy.getDatabase(Unknown Source) ``` ### How to Reproduce? Step to reproduce the behaviour : 1. Having a windows environment or not having the right to read this file ( "/etc/resolv.conf") 2. try to connect a mongodb with srv protocole ( url connection must start with mongodb+srv) 3. try to open the connection, the NPE rise ! ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` Java version: 17.0.1 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.12.0 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.1 ### Additional information You should not initialize a list with null List<String> nameServers = null; should be nameServers = new ArrayList<>();

983ab03aff1087656e81c780cb2768c7ef3dd76c

06ff785629b0b4a23b5ec754eeed71a84ae03804

https://github.com/quarkusio/quarkus/compare/983ab03aff1087656e81c780cb2768c7ef3dd76c...06ff785629b0b4a23b5ec754eeed71a84ae03804

diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/dns/MongoDnsClient.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/dns/MongoDnsClient.java index e12c70dc854..d20705bedae 100644 --- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/dns/MongoDnsClient.java +++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/dns/MongoDnsClient.java @@ -8,6 +8,7 @@ import java.nio.file.Paths; import java.time.Duration; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -82,7 +83,7 @@ public class MongoDnsClient implements DnsClient { private static List<String> nameServers() { Path conf = Paths.get("/etc/resolv.conf"); - List<String> nameServers = null; + List<String> nameServers = Collections.emptyList(); if (Files.exists(conf)) { try (Stream<String> lines = Files.lines(conf)) { nameServers = lines @@ -91,7 +92,6 @@ private static List<String> nameServers() { .collect(Collectors.toList()); } catch (IOException | ArrayIndexOutOfBoundsException e) { Logger.getLogger(MongoDnsClientProvider.class).info("Unable to read the /etc/resolv.conf file", e); - nameServers = new ArrayList<>(); } } return nameServers;

['extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/dns/MongoDnsClient.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28056/28049

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28049

https://github.com/quarkusio/quarkus/pull/28056

https://github.com/quarkusio/quarkus/pull/28056

fix

Redis client filters the null values with the mget command

### Describe the bug In the redis documentation, here : https://redis.io/commands/mget/ The missing values should be returned as null, it enables to detect in an efficient way, which keys are missing or have been deleted due to timeout policies. However, the implementation of the ReactiveRedisClient uses the io.quarkus.redis.runtime.datasource.Marshaller which filters this values with the method #decodeAsOrderedMap. The null values should not be filtered and the user should do it, if necessary. ### Expected behavior More compliance with the redis documentation, and non filtered null values. ### Actual behavior The null values are filtered by default. ### How to Reproduce? 1. Create a quarkus app with version 2.12.2.Final 2. Create a ReactiveRedisDatasource 3. use the mget command to fetch non existing values 4. Recover an empty map ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.12.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) maven ### Additional information _No response_

9bc683f75218169a5a613de87e75102532330586

ca68abb68ef95dd9ac896058d280448a3d0f6afb

https://github.com/quarkusio/quarkus/compare/9bc683f75218169a5a613de87e75102532330586...ca68abb68ef95dd9ac896058d280448a3d0f6afb

diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/hash/HashCommands.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/hash/HashCommands.java index 1f923856fa3..d71e80ae867 100644 --- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/hash/HashCommands.java +++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/hash/HashCommands.java @@ -125,6 +125,7 @@ * @param key the key * @param fields the fields * @return list of values associated with the given fields, in the same order as they are requested. + * If a requested field does not exist, the returned map contains a {@code null} value for that field. **/ Map<F, V> hmget(K key, F... fields); diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/hash/ReactiveHashCommands.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/hash/ReactiveHashCommands.java index ccea4615e14..51647e07464 100644 --- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/hash/ReactiveHashCommands.java +++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/hash/ReactiveHashCommands.java @@ -126,6 +126,7 @@ * @param key the key * @param fields the fields * @return list of values associated with the given fields, in the same order as they are requested. + * If a requested field does not exist, the returned map contains a {@code null} value for that field. **/ Uni<Map<F, V>> hmget(K key, F... fields); diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/string/ReactiveStringCommands.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/string/ReactiveStringCommands.java index fcbe689fb14..5bac8b361ff 100644 --- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/string/ReactiveStringCommands.java +++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/string/ReactiveStringCommands.java @@ -183,7 +183,8 @@ * Requires Redis 1.0.0 * * @param keys the keys - * @return list of values at the specified keys. + * @return the value of key, or {@code null} when key does not exist. If one of the passed key does not exist, the + * returned map contains a {@code null} value associated with the missing key. **/ Uni<Map<K, V>> mget(K... keys); diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/string/StringCommands.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/string/StringCommands.java index ac992c038ad..b3d592620e3 100644 --- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/string/StringCommands.java +++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/string/StringCommands.java @@ -182,7 +182,8 @@ * Requires Redis 1.0.0 * * @param keys the keys - * @return list of values at the specified keys. + * @return list of values at the specified keys. If one of the passed key does not exist, the returned map contains + * a {@code null} value associated with the missing key. **/ Map<K, V> mget(K... keys); diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/value/ReactiveValueCommands.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/value/ReactiveValueCommands.java index 896d7793a3a..e9ddc167549 100644 --- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/value/ReactiveValueCommands.java +++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/value/ReactiveValueCommands.java @@ -63,7 +63,8 @@ * Requires Redis 1.0.0 * * @param key the key - * @return the value of key, or {@code null} when key does not exist. + * @return the value of key, or {@code null} when key does not exist. If one of the passed key does not exist, the + * returned map contains a {@code null} value associated with the missing key. **/ Uni<V> get(K key); diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/value/ValueCommands.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/value/ValueCommands.java index 2f6416d11e8..48ad3e81489 100644 --- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/value/ValueCommands.java +++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/value/ValueCommands.java @@ -183,7 +183,8 @@ * Requires Redis 1.0.0 * * @param keys the keys - * @return list of values at the specified keys. + * @return list of values at the specified keys. If one of the passed key does not exist, the returned map contains + * a {@code null} value associated with the missing key. **/ Map<K, V> mget(K... keys); diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/datasource/Marshaller.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/datasource/Marshaller.java index c6d1186d144..d34850f1085 100644 --- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/datasource/Marshaller.java +++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/datasource/Marshaller.java @@ -149,9 +149,7 @@ final <F, V> Map<F, V> decodeAsOrderedMap(Response response, Class<V> typeOfValu Map<F, V> map = new LinkedHashMap<>(); for (F field : fields) { Response v = iterator.next(); - if (v != null) { // Skip null entries - map.put(field, decode(typeOfValue, v)); - } + map.put(field, decode(typeOfValue, v)); } return map; } diff --git a/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/HashCommandsTest.java b/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/HashCommandsTest.java index 643952e39ab..a5dd256e798 100644 --- a/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/HashCommandsTest.java +++ b/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/HashCommandsTest.java @@ -142,12 +142,12 @@ void hstrlen() { void hmget() { populateForHmget(); Map<String, Person> values = hash.hmget(key, "one", "missing", "two"); - assertThat(values).hasSize(2); - assertThat(values).containsExactly(entry("one", Person.person1), entry("two", Person.person2)); + assertThat(values).hasSize(3); + assertThat(values).containsExactly(entry("one", Person.person1), entry("missing", null), entry("two", Person.person2)); } private void populateForHmget() { - assertThat(hash.hmget(key, "one", "two").values()).isEmpty(); + assertThat(hash.hmget(key, "one", "two")).allSatisfy((s, p) -> assertThat(p).isNull()); hash.hset(key, "one", Person.person1); hash.hset(key, "two", Person.person2); } diff --git a/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/StringCommandsTest.java b/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/StringCommandsTest.java index bb73b2b134b..3e0e16ca628 100644 --- a/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/StringCommandsTest.java +++ b/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/StringCommandsTest.java @@ -99,15 +99,24 @@ void getset() { @Test void mget() { - assertThat(strings.mget(key)).isEmpty(); + assertThat(strings.mget(key)).containsExactly(entry(key, null)); strings.set("one", "1"); strings.set("two", "2"); assertThat(strings.mget("one", "two")).containsExactly(entry("one", "1"), entry("two", "2")); } + @Test + void mgetWithMissingKey() { + assertThat(strings.mget(key)).containsExactly(entry(key, null)); + strings.set("one", "1"); + strings.set("two", "2"); + assertThat(strings.mget("one", "missing", "two")).containsExactly(entry("one", "1"), + entry("missing", null), entry("two", "2")); + } + @Test void mset() { - assertThat(strings.mget("one", "two")).isEmpty(); + assertThat(strings.mget(key)).containsExactly(entry(key, null)); Map<String, String> map = new LinkedHashMap<>(); map.put("one", "1"); map.put("two", "2"); diff --git a/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/ValueCommandsTest.java b/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/ValueCommandsTest.java index 0bd8815e307..18d63308c18 100644 --- a/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/ValueCommandsTest.java +++ b/extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/ValueCommandsTest.java @@ -99,15 +99,24 @@ void getset() { @Test void mget() { - assertThat(values.mget(key)).isEmpty(); + assertThat(values.mget(key)).containsExactly(entry(key, null)); values.set("one", "1"); values.set("two", "2"); assertThat(values.mget("one", "two")).containsExactly(entry("one", "1"), entry("two", "2")); } + @Test + void mgetWithMissingKey() { + assertThat(values.mget(key)).containsExactly(entry(key, null)); + values.set("one", "1"); + values.set("two", "2"); + assertThat(values.mget("one", "missing", "two")).containsExactly(entry("one", "1"), + entry("missing", null), entry("two", "2")); + } + @Test void mset() { - assertThat(values.mget("one", "two")).isEmpty(); + assertThat(values.mget("one", "two")).containsExactly(entry("one", null), entry("two", null)); Map<String, String> map = new LinkedHashMap<>(); map.put("one", "1"); map.put("two", "2");

['extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/hash/HashCommands.java', 'extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/value/ValueCommands.java', 'extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/ValueCommandsTest.java', 'extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/datasource/Marshaller.java', 'extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/StringCommandsTest.java', 'extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/string/ReactiveStringCommands.java', 'extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/string/StringCommands.java', 'extensions/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/HashCommandsTest.java', 'extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/value/ReactiveValueCommands.java', 'extensions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/hash/ReactiveHashCommands.java']

{'.java': 10}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28578/28577

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28577

https://github.com/quarkusio/quarkus/pull/28578

https://github.com/quarkusio/quarkus/pull/28578

fixes

Access log logged twice if non-root path is a prefix of root path

### Describe the bug Original - https://github.com/smallrye/smallrye-health/issues/412#issuecomment-1272883427. We need to distinguish cases where either of the paths is mapped to "/" (root/main router), if one is a subpath of another, or if they are totally different. TBH, I'm thinking the best would be to log everything under "/". So the question is whether it makes sense to log for instance GET /whatever if the quarkus.http.root-path=/app. Not for me to decide but I'll mention it in the PR. ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

2e7bba4037340bdc7468a0d763bd9632705db017

0e100af7c02d4abe51e433c54a1eece7bfa5527a

https://github.com/quarkusio/quarkus/compare/2e7bba4037340bdc7468a0d763bd9632705db017...0e100af7c02d4abe51e433c54a1eece7bfa5527a

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 ef861524db7..0380a2925ed 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 @@ -312,9 +312,8 @@ ServiceStartBuildItem finalizeRouter( defaultRoute.map(DefaultRouteBuildItem::getRoute).orElse(null), listOfFilters, vertx.getVertx(), lrc, mainRouter, httpRouteRouter.getHttpRouter(), httpRouteRouter.getMutinyRouter(), httpRouteRouter.getFrameworkRouter(), - nonApplicationRootPathBuildItem.isDedicatedRouterRequired(), - nonApplicationRootPathBuildItem.isAttachedToMainRouter(), httpRootPathBuildItem.getRootPath(), + nonApplicationRootPathBuildItem.getNonApplicationRootPath(), launchMode.getLaunchMode(), !requireBodyHandlerBuildItems.isEmpty(), bodyHandler, gracefulShutdownFilter, shutdownConfig, executorBuildItem.getExecutorProxy()); diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java index fb2249f0335..b596cee278f 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java @@ -341,8 +341,8 @@ public void finalizeRouter(BeanContainer container, Consumer<Route> defaultRoute LiveReloadConfig liveReloadConfig, Optional<RuntimeValue<Router>> mainRouterRuntimeValue, RuntimeValue<Router> httpRouterRuntimeValue, RuntimeValue<io.vertx.mutiny.ext.web.Router> mutinyRouter, RuntimeValue<Router> frameworkRouter, - boolean nonApplicationDedicatedRouter, boolean nonApplicationAttachedToMainRouter, - String rootPath, LaunchMode launchMode, boolean requireBodyHandler, + String rootPath, String nonRootPath, + LaunchMode launchMode, boolean requireBodyHandler, Handler<RoutingContext> bodyHandler, GracefulShutdownFilter gracefulShutdownFilter, ShutdownConfig shutdownConfig, Executor executor) { @@ -560,10 +560,17 @@ public void handle(HttpServerRequest event) { } AccessLogHandler handler = new AccessLogHandler(receiver, accessLog.pattern, getClass().getClassLoader(), accessLog.excludePattern); - if (nonApplicationDedicatedRouter && !nonApplicationAttachedToMainRouter) { + if (rootPath.equals("/") || nonRootPath.equals("/")) { + mainRouterRuntimeValue.orElse(httpRouterRuntimeValue).getValue().route().order(Integer.MIN_VALUE) + .handler(handler); + } else if (nonRootPath.startsWith(rootPath)) { + httpRouteRouter.route().order(Integer.MIN_VALUE).handler(handler); + } else if (rootPath.startsWith(nonRootPath)) { + frameworkRouter.getValue().route().order(Integer.MIN_VALUE).handler(handler); + } else { + httpRouteRouter.route().order(Integer.MIN_VALUE).handler(handler); frameworkRouter.getValue().route().order(Integer.MIN_VALUE).handler(handler); } - httpRouteRouter.route().order(Integer.MIN_VALUE).handler(handler); quarkusWrapperNeeded = true; }

['extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java', 'extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28141/28090

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28090

https://github.com/quarkusio/quarkus/pull/28141

https://github.com/quarkusio/quarkus/pull/28141

fixes

cli test fails without settings.xml

### Describe the bug If no settings.xml is present in the maven user location, cli test will fail with 3 failures and 3 errors. ```shell ./mvnw -f devtools/cli test ... [ERROR] Tests run: 79, Failures: 3, Errors: 3, Skipped: 0 ``` [Full Maven Log](https://github.com/quarkusio/quarkus/files/9607348/maven.log) ### Expected behavior cli test should be able to run without settings.xml ### Actual behavior Fails without settings.xml ### How to Reproduce? Steps to reproduce the behavior: 1. Ensure that no user settings.xml is defined 2. Run `./mvnw -f devtools/cli test` ### Output of `uname -a` or `ver` Darwin mavenrunner-mac 21.6.0 Darwin Kernel Version 21.6.0: Mon Aug 22 20:19:52 PDT 2022; root:xnu-8020.140.49~2/RELEASE_ARM64_T6000 arm64 ### Output of `java -version` openjdk version "17.0.2" 2022-01-18 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev e19f65e535 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 (84538c9988a25aec085021c365c560670ad80f63) ### Additional information _No response_

23562c3ed09f8f79ce4f1c24f91a03bcfa918235

2b0923f614c04aa16ece0c11ae4e70d5f850e00a

https://github.com/quarkusio/quarkus/compare/23562c3ed09f8f79ce4f1c24f91a03bcfa918235...2b0923f614c04aa16ece0c11ae4e70d5f850e00a

diff --git a/devtools/cli/src/main/java/io/quarkus/cli/build/MavenRunner.java b/devtools/cli/src/main/java/io/quarkus/cli/build/MavenRunner.java index d8bcb2b29ab..2c801a99990 100644 --- a/devtools/cli/src/main/java/io/quarkus/cli/build/MavenRunner.java +++ b/devtools/cli/src/main/java/io/quarkus/cli/build/MavenRunner.java @@ -1,6 +1,7 @@ package io.quarkus.cli.build; import java.io.File; +import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayDeque; import java.util.ArrayList; @@ -32,6 +33,7 @@ import picocli.CommandLine; public class MavenRunner implements BuildSystemRunner { + public static String MAVEN_SETTINGS = "maven.settings"; static final String[] windowsWrapper = { "mvnw.cmd", "mvnw.bat" }; static final String otherWrapper = "mvnw"; @@ -238,13 +240,13 @@ void setMavenProperties(ArrayDeque<String> args, boolean batchMode) { args.addFirst("-Dstyle.color=always"); } - String mavenSettings = propertiesOptions.properties.remove("maven.settings"); + String mavenSettings = propertiesOptions.properties.remove(MAVEN_SETTINGS); if (mavenSettings != null && !mavenSettings.isEmpty()) { args.add("-s"); args.add(mavenSettings); } else { - mavenSettings = System.getProperty("maven.settings"); - if (mavenSettings != null && !mavenSettings.isEmpty()) { + mavenSettings = System.getProperty(MAVEN_SETTINGS); + if (mavenSettings != null && !mavenSettings.isEmpty() && Files.exists(Path.of(mavenSettings))) { args.add("-s"); args.add(mavenSettings); } diff --git a/devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java b/devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java index ddf060402c3..2ee05931bef 100644 --- a/devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java +++ b/devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java @@ -1,5 +1,8 @@ package io.quarkus.cli; +import static io.quarkus.cli.build.MavenRunner.MAVEN_SETTINGS; +import static org.apache.maven.cli.MavenCli.LOCAL_REPO_PROPERTY; + import java.io.ByteArrayOutputStream; import java.io.File; import java.io.PrintStream; @@ -12,6 +15,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; +import java.util.function.BinaryOperator; +import java.util.function.UnaryOperator; import org.junit.jupiter.api.Assertions; @@ -20,6 +26,9 @@ public class CliDriver { static final PrintStream stdout = System.out; static final PrintStream stderr = System.err; + private static final BinaryOperator<String> ARG_FORMATTER = (key, value) -> "-D" + key + "=" + value; + private static final UnaryOperator<String> REPO_ARG_FORMATTER = value -> ARG_FORMATTER.apply(LOCAL_REPO_PROPERTY, value); + private static final UnaryOperator<String> SETTINGS_ARG_FORMATTER = value -> ARG_FORMATTER.apply(MAVEN_SETTINGS, value); public static class CliDriverBuilder { @@ -63,8 +72,10 @@ public Result execute() throws Exception { newArgs.subList(index, newArgs.size()).clear(); } - propagateProperty("maven.repo.local", mavenLocalRepo, newArgs); - propagateProperty("maven.settings", mavenSettings, newArgs); + Optional.ofNullable(mavenLocalRepo).or(CliDriver::getMavenLocalRepoProperty).map(REPO_ARG_FORMATTER) + .ifPresent(newArgs::add); + Optional.ofNullable(mavenSettings).or(CliDriver::getMavenSettingsProperty).map(SETTINGS_ARG_FORMATTER) + .ifPresent(newArgs::add); newArgs.add("--cli-test"); newArgs.add("--cli-test-dir"); @@ -81,7 +92,7 @@ public Result execute() throws Exception { PrintStream errPs = new PrintStream(err); System.setErr(errPs); - final Map<String, String> originalProps = collectOverridenProps(newArgs); + final Map<String, String> originalProps = collectOverriddenProps(newArgs); Result result = new Result(); QuarkusCli cli = new QuarkusCli(); @@ -109,7 +120,7 @@ protected void resetProperties(Map<String, String> originalProps) { } } - protected Map<String, String> collectOverridenProps(List<String> newArgs) { + protected Map<String, String> collectOverriddenProps(List<String> newArgs) { final Map<String, String> originalProps = new HashMap<>(); for (String s : newArgs) { if (s.startsWith("-D")) { @@ -121,22 +132,14 @@ protected Map<String, String> collectOverridenProps(List<String> newArgs) { originalProps.put(propName, origValue); } else if (System.getProperties().contains(propName)) { originalProps.put(propName, "true"); + } else { + originalProps.put(propName, null); } } } } return originalProps; } - - private static void propagateProperty(String propName, String testValue, List<String> args) { - if (testValue == null) { - testValue = System.getProperty(propName); - if (testValue == null) { - return; - } - } - args.add("-D" + propName + "=" + testValue); - } } public static CliDriverBuilder builder() { @@ -144,14 +147,8 @@ public static CliDriverBuilder builder() { } public static void preserveLocalRepoSettings(Collection<String> args) { - String s = convertToProperty("maven.repo.local"); - if (s != null) { - args.add(s); - } - s = convertToProperty("maven.settings"); - if (s != null) { - args.add(s); - } + getMavenLocalRepoProperty().map(REPO_ARG_FORMATTER).ifPresent(args::add); + getMavenSettingsProperty().map(SETTINGS_ARG_FORMATTER).ifPresent(args::add); } public static Result executeArbitraryCommand(Path startingDir, String... args) throws Exception { @@ -439,12 +436,12 @@ public static void validateApplicationProperties(Path projectRoot, List<String> "Properties file should contain " + conf + ". Found:\\n" + propertiesFile)); } - private static String convertToProperty(String name) { - String value = System.getProperty(name); - if (value != null) { - return "-D" + name + "=" + value; - } - return null; + private static Optional<String> getMavenLocalRepoProperty() { + return Optional.ofNullable(System.getProperty(LOCAL_REPO_PROPERTY)); + } + + private static Optional<String> getMavenSettingsProperty() { + return Optional.ofNullable(System.getProperty(MAVEN_SETTINGS)).filter(value -> Files.exists(Path.of(value))); } private static void retryDelete(File file) { diff --git a/devtools/cli/src/test/java/io/quarkus/cli/RegistryClientBuilderTestBase.java b/devtools/cli/src/test/java/io/quarkus/cli/RegistryClientBuilderTestBase.java index 00a402bcda5..d101dbe0018 100644 --- a/devtools/cli/src/test/java/io/quarkus/cli/RegistryClientBuilderTestBase.java +++ b/devtools/cli/src/test/java/io/quarkus/cli/RegistryClientBuilderTestBase.java @@ -1,7 +1,7 @@ package io.quarkus.cli; -import java.io.BufferedReader; import java.io.BufferedWriter; +import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.nio.file.Files; @@ -59,7 +59,7 @@ static void setup() throws Exception { final BootstrapMavenContext mavenContext = new BootstrapMavenContext( BootstrapMavenContext.config().setWorkspaceDiscovery(false)); - final Settings settings = getBaseMavenSettings(mavenContext.getUserSettings().toPath()); + final Settings settings = getBaseMavenSettings(mavenContext.getUserSettings()); Profile profile = new Profile(); settings.addActiveProfile("qs-test-registry"); @@ -106,11 +106,9 @@ protected static String getCurrentQuarkusVersion() { return v; } - private static Settings getBaseMavenSettings(Path mavenSettings) throws IOException { - if (Files.exists(mavenSettings)) { - try (BufferedReader reader = Files.newBufferedReader(mavenSettings)) { - return new DefaultSettingsReader().read(reader, Map.of()); - } + private static Settings getBaseMavenSettings(File mavenSettings) throws IOException { + if (mavenSettings != null && mavenSettings.exists()) { + return new DefaultSettingsReader().read(mavenSettings, Map.of()); } return new Settings(); }

['devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java', 'devtools/cli/src/main/java/io/quarkus/cli/build/MavenRunner.java', 'devtools/cli/src/test/java/io/quarkus/cli/RegistryClientBuilderTestBase.java']

{'.java': 3}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28174/28088

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28088

https://github.com/quarkusio/quarkus/pull/28174

https://github.com/quarkusio/quarkus/pull/28174

fixes

REST client considers the wrong environment variable for `quarkus.rest-client."config-key".url`

### Describe the bug I have set an environment `QUARKUS_REST_CLIENT__MY_CLIENT__URL` variable set which is supposed to override the `quarkus.rest-client."my-client".url` at runtime. The `quarkus.rest-client."my-client".url` has a fallback setting in `application.properties`. ### Expected behavior The REST client uses the URL from the environment variable. This works in Quarkus 2.11.1, but does not work in Quarkus 2.12.2. ### Actual behavior This happens in Quarkus 2.12.2: The REST client ignores the environment variablee and uses the fallback setting in `application.properties`. When I change the name of the environment variable to `QUARKUS_REST_CLIENT_MY_CLIENT_URL` (note the missing extra underscores for the `"`) then the value of the environment variable is used. In Quarkus 2.11.1, everything works as expected. ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` Darwin <redacted> 20.6.0 Darwin Kernel Version 20.6.0: Tue Feb 22 21:10:41 PST 2022; root:xnu-7195.141.26~1/RELEASE_X86_64 x86_64 ### Output of `java -version` openjdk version "11.0.11" 2021-04-20 OpenJDK Runtime Environment AdoptOpenJDK-11.0.11+9 (build 11.0.11+9) OpenJDK 64-Bit Server VM AdoptOpenJDK-11.0.11+9 (build 11.0.11+9, mixed mode) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.12.2 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 ### Additional information _No response_

d18b47671db3303e950eba55436bf7d8dd23ce33

1c0f8e7f6340f4c614c31089f777688631106cf7

https://github.com/quarkusio/quarkus/compare/d18b47671db3303e950eba55436bf7d8dd23ce33...1c0f8e7f6340f4c614c31089f777688631106cf7

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 210d5f34d1c..4fc98dae8fe 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 @@ -5,6 +5,8 @@ import static io.smallrye.config.SmallRyeConfig.SMALLRYE_CONFIG_PROFILE; import static io.smallrye.config.SmallRyeConfig.SMALLRYE_CONFIG_PROFILE_PARENT; import static io.smallrye.config.SmallRyeConfigBuilder.META_INF_MICROPROFILE_CONFIG_PROPERTIES; +import static java.lang.Integer.MAX_VALUE; +import static java.lang.Integer.MIN_VALUE; import java.io.IOException; import java.net.URL; @@ -13,7 +15,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -39,13 +40,13 @@ import io.smallrye.config.EnvConfigSource; import io.smallrye.config.FallbackConfigSourceInterceptor; import io.smallrye.config.KeyMap; -import io.smallrye.config.KeyMapBackedConfigSource; import io.smallrye.config.Priorities; import io.smallrye.config.ProfileConfigSourceInterceptor; import io.smallrye.config.RelocateConfigSourceInterceptor; import io.smallrye.config.SmallRyeConfig; import io.smallrye.config.SmallRyeConfigBuilder; import io.smallrye.config.SysPropConfigSource; +import io.smallrye.config.common.MapBackedConfigSource; import io.smallrye.config.common.utils.ConfigSourceUtil; /** @@ -115,10 +116,8 @@ public static SmallRyeConfigBuilder configBuilder(final boolean runTime, final b builder.addDiscoveredValidator(); builder.withDefaultValue(UUID_KEY, UUID.randomUUID().toString()); builder.withSources(new DotEnvConfigSourceProvider()); - builder.withSources( - new DefaultsConfigSource(loadBuildTimeRunTimeValues(), "BuildTime RunTime Fixed", Integer.MAX_VALUE)); - builder.withSources( - new DefaultsConfigSource(loadRunTimeDefaultValues(), "RunTime Defaults", Integer.MIN_VALUE + 100)); + builder.withSources(new DefaultsConfigSource(loadBuildTimeRunTimeValues(), "BuildTime RunTime Fixed", MAX_VALUE)); + builder.withSources(new DefaultsConfigSource(loadRunTimeDefaultValues(), "RunTime Defaults", MIN_VALUE + 100)); } else { List<ConfigSource> sources = new ArrayList<>(); sources.addAll(classPathSources(META_INF_MICROPROFILE_CONFIG_PROPERTIES, classLoader)); @@ -384,43 +383,35 @@ public Set<String> getPropertyNames() { } } - static class DefaultsConfigSource extends KeyMapBackedConfigSource { + static class DefaultsConfigSource extends MapBackedConfigSource { private final KeyMap<String> wildcards; - private final Set<String> propertyNames; public DefaultsConfigSource(final Map<String, String> properties, final String name, final int ordinal) { - super(name, ordinal, propertiesToKeyMap(properties)); + // Defaults may contain wildcards, but we don't want to expose them in getPropertyNames, so we need to filter them + super(name, filterWildcards(properties), ordinal); this.wildcards = new KeyMap<>(); - this.propertyNames = new HashSet<>(); for (Map.Entry<String, String> entry : properties.entrySet()) { if (entry.getKey().contains("*")) { this.wildcards.findOrAdd(entry.getKey()).putRootValue(entry.getValue()); - } else { - this.propertyNames.add(entry.getKey()); } } } - @Override - public Set<String> getPropertyNames() { - return propertyNames; - } - @Override public String getValue(final String propertyName) { String value = super.getValue(propertyName); return value == null ? wildcards.findRootValue(propertyName) : value; } - private static KeyMap<String> propertiesToKeyMap(final Map<String, String> properties) { - KeyMap<String> keyMap = new KeyMap<>(); + private static Map<String, String> filterWildcards(final Map<String, String> properties) { + Map<String, String> filtered = new HashMap<>(); for (Map.Entry<String, String> entry : properties.entrySet()) { if (entry.getKey().contains("*")) { continue; } - keyMap.findOrAdd(entry.getKey()).putRootValue(entry.getValue()); + filtered.put(entry.getKey(), entry.getValue()); } - return keyMap; + return filtered; } }

['core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28198/27862

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/27862

https://github.com/quarkusio/quarkus/pull/28198

https://github.com/quarkusio/quarkus/pull/28198

fixes

ElasticSearch Dev Service image cannot be replaced with custom-built image

### Describe the bug In the ElasticSearch DEV service you can use your own image (`quarkus.elasticsearch.devservices.image-name`), however it is not accepted because it is not **name-compatible** with the expected value: `docker.elastic.co/elasticsearch/elasticsearch`. ### Expected behavior Any image that extends an ElasticSearch image is accepted and used. ### Actual behavior ``` ERROR [io.qua.dep.dev.IsolatedDevModeMain] (main) Failed to start quarkus: java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.elasticsearch.restclient.common.deployment.DevServicesElasticsearchProcessor#startElasticsearchDevService threw an exception: java.lang.RuntimeException: java.lang.IllegalStateException: Failed to verify that image 'registry.gitlab.com/xxxxx/search-service/elastic-with-files:my-tag' is a compatible substitute for 'docker.elastic.co/elasticsearch/elasticsearch'. This generally means that you are trying to use an image that Testcontainers has not been designed to use. If this is deliberate, and if you are confident that the image is compatible, you should declare compatibility in code using the `asCompatibleSubstituteFor` method. For example: DockerImageName myImage = DockerImageName.parse("registry.gitlab.com/xxxxx/search-service/elastic-with-files:my-tag").asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch"); and then use `myImage` instead. at io.quarkus.elasticsearch.restclient.common.deployment.DevServicesElasticsearchProcessor.startElasticsearchDevService(DevServicesElasticsearchProcessor.java:98) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at io.quarkus.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:977) at io.quarkus.builder.BuildContext.run(BuildContext.java:281) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1478) at java.base/java.lang.Thread.run(Thread.java:833) at org.jboss.threads.JBossThread.run(JBossThread.java:501) Caused by: java.lang.IllegalStateException: Failed to verify that image 'registry.gitlab.com/xxxxx/search-service/elastic-with-files:my-tag' is a compatible substitute for 'docker.elastic.co/elasticsearch/elasticsearch'. This generally means that you are trying to use an image that Testcontainers has not been designed to use. If this is deliberate, and if you are confident that the image is compatible, you should declare compatibility in code using the `asCompatibleSubstituteFor` method. For example: DockerImageName myImage = DockerImageName.parse("registry.gitlab.com/xxxxx/search-service/elastic-with-files:my-tag").asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch"); and then use `myImage` instead. at org.testcontainers.utility.DockerImageName.assertCompatibleWith(DockerImageName.java:270) at org.testcontainers.elasticsearch.ElasticsearchContainer.<init>(ElasticsearchContainer.java:95) at io.quarkus.elasticsearch.restclient.common.deployment.DevServicesElasticsearchProcessor.lambda$startElasticsearch$1(DevServicesElasticsearchProcessor.java:198) at java.base/java.util.Optional.orElseGet(Optional.java:364) at io.quarkus.elasticsearch.restclient.common.deployment.DevServicesElasticsearchProcessor.startElasticsearch(DevServicesElasticsearchProcessor.java:224) at io.quarkus.elasticsearch.restclient.common.deployment.DevServicesElasticsearchProcessor.startElasticsearchDevService(DevServicesElasticsearchProcessor.java:88) ... 11 more ``` ### How to Reproduce? mvn io.quarkus.platform:quarkus-maven-plugin:2.12.1.Final:create \\ -DprojectGroupId=org.acme \\ -DprojectArtifactId=elasticsearch-quickstart \\ -DclassName="org.acme.datasource.GreetingResource" \\ -Dextensions="resteasy,resteasy-jackson,elasticsearch-rest-client" cd elasticsearch-quickstart/ echo "quarkus.elasticsearch.devservices.image-name = debian:buster" >> ./src/main/resources/application.properties mvn verify ### Output of `uname -a` or `ver` Linux ****** 5.4.72-microsoft-standard-WSL2 #1 SMP Wed Oct 28 23:40:43 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "17.0.3" 2022-04-19 OpenJDK Runtime Environment (build 17.0.3+7-Ubuntu-0ubuntu0.20.04.1) OpenJDK 64-Bit Server VM (build 17.0.3+7-Ubuntu-0ubuntu0.20.04.1, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.12.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 (84538c9988a25aec085021c365c560670ad80f63) Maven home: /opt/maven Java version: 17.0.3, vendor: Private Build, runtime: /usr/lib/jvm/java-17-openjdk-amd64 Default locale: en, platform encoding: UTF-8 OS name: "linux", version: "5.4.72-microsoft-standard-wsl2", arch: "amd64", family: "unix" ### Additional information This bug has the identical problem as: https://github.com/quarkusio/quarkus/issues/20945

cd4f781a0141cf159102232b553b95bb4357b636

cf81292249ab52f3cd36a81fb0789135c1d81949

https://github.com/quarkusio/quarkus/compare/cd4f781a0141cf159102232b553b95bb4357b636...cf81292249ab52f3cd36a81fb0789135c1d81949

diff --git a/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java b/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java index 44803e7d84c..fae32662211 100644 --- a/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java +++ b/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java @@ -176,7 +176,7 @@ private DevServicesResultBuildItem.RunningDevService startElasticsearch( throw new BuildException("Dev services for Elasticsearch didn't support Opensearch", Collections.emptyList()); } - // Hibernate search Elasticsearch have a version configuration property, we need to check that it is coherent + // Hibernate Search Elasticsearch have a version configuration property, we need to check that it is coherent // with the image we are about to launch if (buildItemConfig.version != null) { String containerTag = config.imageName.substring(config.imageName.indexOf(':') + 1); @@ -197,7 +197,7 @@ private DevServicesResultBuildItem.RunningDevService startElasticsearch( // Starting the server final Supplier<DevServicesResultBuildItem.RunningDevService> defaultElasticsearchSupplier = () -> { ElasticsearchContainer container = new ElasticsearchContainer( - DockerImageName.parse(config.imageName)); + DockerImageName.parse(config.imageName).asCompatibleSubstituteFor("elasticsearch/elasticsearch")); ConfigureUtil.configureSharedNetwork(container, "elasticsearch"); if (config.serviceName != null) { container.withLabel(DEV_SERVICE_LABEL, config.serviceName); 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 319ff7d521d..0bbe4d81122 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 @@ -246,7 +246,7 @@ private RunningDevService startKafka(DockerStatusBuildItem dockerStatusBuildItem KAFKA_BOOTSTRAP_SERVERS, container.getBootstrapServers()); } else { RedPandaKafkaContainer container = new RedPandaKafkaContainer( - DockerImageName.parse(config.imageName), + DockerImageName.parse(config.imageName).asCompatibleSubstituteFor("vectorized/redpanda"), config.fixedExposedPort, launchMode.getLaunchMode() == LaunchMode.DEVELOPMENT ? config.serviceName : null, useSharedNetwork, config.redpanda); diff --git a/extensions/schema-registry/devservice/deployment/src/main/java/io/quarkus/apicurio/registry/devservice/DevServicesApicurioRegistryProcessor.java b/extensions/schema-registry/devservice/deployment/src/main/java/io/quarkus/apicurio/registry/devservice/DevServicesApicurioRegistryProcessor.java index 79e659a5562..7698a26f355 100644 --- a/extensions/schema-registry/devservice/deployment/src/main/java/io/quarkus/apicurio/registry/devservice/DevServicesApicurioRegistryProcessor.java +++ b/extensions/schema-registry/devservice/deployment/src/main/java/io/quarkus/apicurio/registry/devservice/DevServicesApicurioRegistryProcessor.java @@ -173,7 +173,8 @@ private RunningDevService startApicurioRegistry(DockerStatusBuildItem dockerStat getRegistryUrlConfigs("http://" + address.getUrl()))) .orElseGet(() -> { ApicurioRegistryContainer container = new ApicurioRegistryContainer( - DockerImageName.parse(config.imageName), config.fixedExposedPort, + DockerImageName.parse(config.imageName).asCompatibleSubstituteFor("apicurio/apicurio-registry-mem"), + config.fixedExposedPort, launchMode.getLaunchMode() == LaunchMode.DEVELOPMENT ? config.serviceName : null, useSharedNetwork); timeout.ifPresent(container::withStartupTimeout); 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 d6c6fa0146a..99fdf9a906b 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 @@ -176,7 +176,7 @@ private RunningDevService startAmqpBroker(DockerStatusBuildItem dockerStatusBuil final Supplier<RunningDevService> defaultAmqpBrokerSupplier = () -> { // Starting the broker ArtemisContainer container = new ArtemisContainer( - DockerImageName.parse(config.imageName), + DockerImageName.parse(config.imageName).asCompatibleSubstituteFor("artemiscloud/activemq-artemis-broker"), config.extra, config.fixedExposedPort, launchMode.getLaunchMode() == LaunchMode.DEVELOPMENT ? config.serviceName : null); diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/RabbitMQDevServicesProcessor.java b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/RabbitMQDevServicesProcessor.java index 85763f737ae..39d102ff575 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/RabbitMQDevServicesProcessor.java +++ b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/RabbitMQDevServicesProcessor.java @@ -176,7 +176,7 @@ private RunningDevService startRabbitMQBroker(DockerStatusBuildItem dockerStatus } ConfiguredRabbitMQContainer container = new ConfiguredRabbitMQContainer( - DockerImageName.parse(config.imageName), + DockerImageName.parse(config.imageName).asCompatibleSubstituteFor("rabbitmq"), config.fixedExposedPort, config.fixedExposedHttpPort, launchMode.getLaunchMode() == LaunchMode.DEVELOPMENT ? config.serviceName : null);

['extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java', 'extensions/schema-registry/devservice/deployment/src/main/java/io/quarkus/apicurio/registry/devservice/DevServicesApicurioRegistryProcessor.java', 'extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java', 'extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/RabbitMQDevServicesProcessor.java', 'extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java']

{'.java': 5}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28210/28098

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28098

https://github.com/quarkusio/quarkus/pull/28210

https://github.com/quarkusio/quarkus/pull/28210

fix

Potential NPE in QuarkusClassLoader

I am trying to run a Quarkus app in a local container and use [remote development mode](https://quarkus.io/guides/maven-tooling#remote-development-mode) and I'm facing the same error: ``` backend | 2022-09-20 14:56:35,633 ERROR [io.qua.dep.dev.IsolatedDevModeMain] (vert.x-worker-thread-1) Failed to start quarkus: java.lang.RuntimeException: java.lang.NullPointerException: Cannot invoke "io.quarkus.bootstrap.classloading.ClassPathResource.getUrl()" because "res" is null backend | at io.quarkus.runner.bootstrap.AugmentActionImpl.runAugment(AugmentActionImpl.java:330) backend | at io.quarkus.runner.bootstrap.AugmentActionImpl.reloadExistingApplication(AugmentActionImpl.java:265) backend | at io.quarkus.runner.bootstrap.AugmentActionImpl.reloadExistingApplication(AugmentActionImpl.java:60) backend | at io.quarkus.deployment.dev.IsolatedDevModeMain.restartApp(IsolatedDevModeMain.java:251) backend | at io.quarkus.deployment.dev.IsolatedDevModeMain.restartCallback(IsolatedDevModeMain.java:234) backend | at io.quarkus.deployment.dev.RuntimeUpdatesProcessor.doScan(RuntimeUpdatesProcessor.java:536) backend | at io.quarkus.deployment.dev.RuntimeUpdatesProcessor.doScan(RuntimeUpdatesProcessor.java:436) backend | at io.quarkus.vertx.http.runtime.devmode.VertxHttpHotReplacementSetup$4.handle(VertxHttpHotReplacementSetup.java:152) backend | at io.quarkus.vertx.http.runtime.devmode.VertxHttpHotReplacementSetup$4.handle(VertxHttpHotReplacementSetup.java:139) backend | at io.vertx.core.impl.ContextBase.lambda$null$0(ContextBase.java:137) backend | at io.vertx.core.impl.ContextInternal.dispatch(ContextInternal.java:264) backend | at io.vertx.core.impl.ContextBase.lambda$executeBlocking$1(ContextBase.java:135) backend | at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) backend | at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) backend | at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1452) backend | at org.jboss.threads.DelegatingRunnable.run(DelegatingRunnable.java:29) backend | at org.jboss.threads.ThreadLocalResettingRunnable.run(ThreadLocalResettingRunnable.java:29) backend | at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) backend | at java.base/java.lang.Thread.run(Thread.java:833) backend | Caused by: java.lang.NullPointerException: Cannot invoke "io.quarkus.bootstrap.classloading.ClassPathResource.getUrl()" because "res" is null backend | at io.quarkus.bootstrap.classloading.QuarkusClassLoader.getResources(QuarkusClassLoader.java:250) backend | at io.quarkus.bootstrap.classloading.QuarkusClassLoader.getResources(QuarkusClassLoader.java:265) backend | at io.quarkus.bootstrap.classloading.QuarkusClassLoader.getResources(QuarkusClassLoader.java:197) backend | at io.smallrye.common.classloader.ClassPathUtils.consumeAsPaths(ClassPathUtils.java:84) backend | at io.smallrye.config.AbstractLocationConfigSourceLoader.tryClassPath(AbstractLocationConfigSourceLoader.java:128) backend | at io.smallrye.config.AbstractLocationConfigSourceLoader.loadConfigSources(AbstractLocationConfigSourceLoader.java:93) backend | at io.smallrye.config.AbstractLocationConfigSourceLoader.loadConfigSources(AbstractLocationConfigSourceLoader.java:76) backend | at io.quarkus.runtime.configuration.ApplicationPropertiesConfigSourceLoader$InClassPath.getConfigSources(ApplicationPropertiesConfigSourceLoader.java:30) backend | at io.quarkus.runtime.configuration.ApplicationPropertiesConfigSourceLoader$InClassPath.getConfigSources(ApplicationPropertiesConfigSourceLoader.java:27) backend | at io.smallrye.config.SmallRyeConfigBuilder.build(SmallRyeConfigBuilder.java:439) backend | at io.quarkus.deployment.ExtensionLoader.loadStepsFrom(ExtensionLoader.java:179) backend | at io.quarkus.deployment.QuarkusAugmentor.run(QuarkusAugmentor.java:105) backend | at io.quarkus.runner.bootstrap.AugmentActionImpl.runAugment(AugmentActionImpl.java:328) backend | ... 18 more ``` I am not using any database migration tool. Could it be related? _Originally posted by @y-luis in https://github.com/quarkusio/quarkus/issues/25256#issuecomment-1252562974_

8b2acbe409c521b3c84f527a47ee3215bc1dd298

93f5b5b1f4a7ad4085d54069eab8efbba025cecc

https://github.com/quarkusio/quarkus/compare/8b2acbe409c521b3c84f527a47ee3215bc1dd298...93f5b5b1f4a7ad4085d54069eab8efbba025cecc

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java index 57df8f03e13..3b869b5fadf 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java @@ -53,6 +53,7 @@ import org.jboss.jandex.Indexer; import org.jboss.logging.Logger; +import io.quarkus.bootstrap.runner.DevModeMediator; import io.quarkus.bootstrap.runner.Timing; import io.quarkus.changeagent.ClassChangeAgent; import io.quarkus.deployment.dev.DevModeContext.ModuleInfo; @@ -602,6 +603,7 @@ public Set<String> syncState(Map<String, String> fileHashes) { ret.add(i.getKey()); } } + List<Path> removedFiles = List.of(); for (Map.Entry<String, String> remaining : ourHashes.entrySet()) { String file = remaining.getKey(); if (file.endsWith("META-INF/MANIFEST.MF") || file.contains("META-INF/maven") @@ -609,8 +611,14 @@ public Set<String> syncState(Map<String, String> fileHashes) { //we have some filters, for files that we don't want to delete continue; } - log.info("Deleting removed file " + file); - Files.deleteIfExists(applicationRoot.resolve(file)); + log.info("Scheduled for removal " + file); + if (removedFiles.isEmpty()) { + removedFiles = new ArrayList<>(); + } + removedFiles.add(applicationRoot.resolve(file)); + } + if (!removedFiles.isEmpty()) { + DevModeMediator.removedFiles.addLast(removedFiles); } return ret; } catch (IOException e) { diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/DevModeMediator.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/DevModeMediator.java index 0cc428bf191..87d382db3c6 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/DevModeMediator.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/DevModeMediator.java @@ -9,9 +9,11 @@ import java.net.URLClassLoader; import java.nio.file.Files; import java.nio.file.Path; +import java.util.Deque; import java.util.List; import java.util.Timer; import java.util.TimerTask; +import java.util.concurrent.LinkedBlockingDeque; import org.jboss.logging.Logger; @@ -24,6 +26,8 @@ public class DevModeMediator { protected static final Logger LOGGER = Logger.getLogger(DevModeMediator.class); + public static final Deque<List<Path>> removedFiles = new LinkedBlockingDeque<>(); + static void doDevMode(Path appRoot) throws IOException, ClassNotFoundException, IllegalAccessException, InvocationTargetException, NoSuchMethodException { Path deploymentClassPath = appRoot.resolve(QuarkusEntryPoint.LIB_DEPLOYMENT_DEPLOYMENT_CLASS_PATH_DAT); @@ -88,6 +92,13 @@ public void run() { closeable.close(); } closeable = null; + final List<Path> pathsToDelete = removedFiles.pollFirst(); + if (pathsToDelete != null) { + for (Path p : pathsToDelete) { + LOGGER.info("Deleting " + p); + Files.deleteIfExists(p); + } + } try { closeable = doStart(appRoot, deploymentClassPath); } catch (Exception e) {

['core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java', 'independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/DevModeMediator.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28213/28116

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28116

https://github.com/quarkusio/quarkus/pull/28213

https://github.com/quarkusio/quarkus/pull/28213

fixes

VertxInputStream 10 s delay with parallel requests

### Describe the bug I have setup reseteasy reactive POST endpoint. When sending a lot of parallel requests with a client that reuses the connection, a delay of 10 seconds sometimes can occur in VertxInputStream. The bug seems to be the following: Assume we have two parallel requests A and B. connection is shared between A and B. 1. A and B both sets waiting = true and ends up in connection.wait() (VertxInputStream ~row 245) 2. A.endHandler is called (VertxInputStream ~row 188) 3. A.waiting == true so connection.notify() is called 4. Now, it is arbitray who will continue, assume B continues to run. This sets B.waiting = false (VertxInputStream ~row 249) 5. B.endHandler is called (VertxInputStream ~row 188) 6. B.waiting == false so connection.notify() is not called 7. The conneciton.wait() for A will not get notified and will timeout after rem (~10) seconds The code below shows the code from the sequence above. ```java request.endHandler(new Handler<Void>() { @Override public void handle(Void event) { synchronized (connection) { eof = true; if (waiting) { connection.notify(); } } } }); ... protected ByteBuf readBlocking() throws IOException { synchronized (request.connection()) { ... try { ... waiting = true; request.connection().wait(rem); } catch (InterruptedException e) { throw new InterruptedIOException(e.getMessage()); } finally { waiting = false; } } ... } ``` It works fine when not sharing the connection. ### Expected behavior The expected behaviour is that VertxInputStream should not delay the requests like this. ### Actual behavior Sometimes requests (that reads data with VertxInputStream) gets delayed by 10 seconds. ### How to Reproduce? [src.zip](https://github.com/quarkusio/quarkus/files/9614315/src.zip) The attached code shows the problem isolated. Also, the code from the description shows the core of the problem. ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` 17.0.1 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.12.2 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) 7.4 ### Additional information _No response_

70df6b8d5313960d86338d886a2169a6ccf099de

eb5083b8745a850b6eb73be8a05480e10c70e1e1

https://github.com/quarkusio/quarkus/compare/70df6b8d5313960d86338d886a2169a6ccf099de...eb5083b8745a850b6eb73be8a05480e10c70e1e1

diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxInputStream.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxInputStream.java index 9e56af5b332..10717a6f0c8 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxInputStream.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxInputStream.java @@ -190,7 +190,7 @@ public void handle(Void event) { synchronized (connection) { eof = true; if (waiting) { - connection.notify(); + connection.notifyAll(); } } } @@ -212,7 +212,7 @@ public void handle(Throwable event) { } } if (waiting) { - connection.notify(); + connection.notifyAll(); } } } diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxInputStream.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxInputStream.java index c30afb92de7..9c56278499d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxInputStream.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxInputStream.java @@ -190,7 +190,7 @@ public void handle(Void event) { synchronized (connection) { eof = true; if (waiting) { - connection.notify(); + connection.notifyAll(); } } } @@ -212,7 +212,7 @@ public void handle(Throwable event) { } } if (waiting) { - connection.notify(); + connection.notifyAll(); } } }

['extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxInputStream.java', 'independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxInputStream.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28253/27904

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/27904

https://github.com/quarkusio/quarkus/pull/28253

https://github.com/quarkusio/quarkus/pull/28253

fixes

Kafka configuration reported as unknown config

### Describe the bug I have configured a property for a kafka incoming topic which quarkus report as unknown: `mp.messaging.incoming.topic-test1-in.pause-if-no-requests=false` The documentation has this propertties available to use but I get a warning on startup: `2022-09-13 17:34:03,125 WARN [org.apa.kaf.cli.con.ConsumerConfig] (main) The configuration 'pause-if-no-requests' was supplied but isn't a known config.` In DEV mode, sometimes, it also issues a warning for the property: `mp.messaging.incoming.topic-test1-in.group.id=my-consumer-group` The warning is issues on the AdminClientConfig class: `2022-09-13 17:38:29,082 WARN [org.apa.kaf.cli.adm.AdminClientConfig] (executor-thread-0) The configuration 'group.id' was supplied but isn't a known config` ### Expected behavior No warning issued if these property is present ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.12.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

38f4138c08b31575def5dac3c2e4b35bea9d3c98

57f18eb8792673a93c364db14ed21d205e720193

https://github.com/quarkusio/quarkus/compare/38f4138c08b31575def5dac3c2e4b35bea9d3c98...57f18eb8792673a93c364db14ed21d205e720193

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 0bbe4d81122..03b704e56fe 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 @@ -152,7 +152,7 @@ public void createTopicPartitions(String bootstrapServers, KafkaDevServiceCfg co // get current partitions for topics asked to be created Set<String> currentTopics = adminClient.listTopics().names() .get(adminClientTimeout, TimeUnit.MILLISECONDS); - Map<String, TopicDescription> partitions = adminClient.describeTopics(currentTopics).all() + Map<String, TopicDescription> partitions = adminClient.describeTopics(currentTopics).allTopicNames() .get(adminClientTimeout, TimeUnit.MILLISECONDS); // find new topics to create List<NewTopic> newTopics = topicPartitions.entrySet().stream() diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaAdminClient.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaAdminClient.java index c9b75dc1d00..d9901b7bb12 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaAdminClient.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaAdminClient.java @@ -30,8 +30,13 @@ public class KafkaAdminClient { @PostConstruct void init() { - Map<String, Object> conf = new HashMap<>(config); + Map<String, Object> conf = new HashMap<>(); conf.put(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG, DEFAULT_ADMIN_CLIENT_TIMEOUT); + for (Map.Entry<String, Object> entry : config.entrySet()) { + if (AdminClientConfig.configNames().contains(entry.getKey())) { + conf.put(entry.getKey(), entry.getValue().toString()); + } + } client = AdminClient.create(conf); } @@ -81,4 +86,11 @@ public Collection<AclBinding> getAclInfo() throws InterruptedException, Executio var options = new DescribeAclsOptions().timeoutMs(1_000); return client.describeAcls(filter, options).values().get(); } + + public Map<String, TopicDescription> describeTopics(Collection<String> topicNames) + throws InterruptedException, ExecutionException { + return client.describeTopics(topicNames) + .allTopicNames() + .get(); + } } diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaTopicClient.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaTopicClient.java index 174ef04aa08..8a2340fd475 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaTopicClient.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaTopicClient.java @@ -9,12 +9,9 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.apache.kafka.clients.admin.AdminClient; -import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -27,6 +24,7 @@ import org.apache.kafka.common.serialization.BytesSerializer; import org.apache.kafka.common.utils.Bytes; +import io.quarkus.kafka.client.runtime.KafkaAdminClient; import io.quarkus.kafka.client.runtime.ui.model.Order; import io.quarkus.kafka.client.runtime.ui.model.converter.KafkaModelConverter; import io.quarkus.kafka.client.runtime.ui.model.request.KafkaMessageCreateRequest; @@ -38,8 +36,8 @@ public class KafkaTopicClient { // TODO: make configurable private static final int RETRIES = 3; - //TODO: inject me - private AdminClient adminClient; + @Inject + KafkaAdminClient adminClient; KafkaModelConverter modelConverter = new KafkaModelConverter(); @@ -47,13 +45,6 @@ public class KafkaTopicClient { @Identifier("default-kafka-broker") Map<String, Object> config; - @PostConstruct - void init() { - Map<String, Object> conf = new HashMap<>(config); - conf.put(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG, "5000"); - adminClient = AdminClient.create(conf); - } - private Producer<Bytes, Bytes> createProducer() { Map<String, Object> config = new HashMap<>(this.config); @@ -260,8 +251,6 @@ public void createMessage(KafkaMessageCreateRequest request) { public List<Integer> partitions(String topicName) throws ExecutionException, InterruptedException { return adminClient.describeTopics(List.of(topicName)) - .allTopicNames() - .get() .values().stream() .reduce((a, b) -> { throw new IllegalStateException(

['extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaTopicClient.java', 'extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaAdminClient.java', 'extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java']

{'.java': 3}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28254/28246

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28246

https://github.com/quarkusio/quarkus/pull/28254

https://github.com/quarkusio/quarkus/pull/28254

fixes

Using oidc error-path doesn't keep the original path params used for session handling

### Describe the bug I have an rest resource protected with OIDC, and wants to implement a customized web page when the authentication could not be performed. I am trying to accomplish this with the setting: quarkus.oidc.authentication.error-path=/error If I surf to my application with the following url: http://localhost/application?ref=xxxxx Quarkus will redirect the browser with a 302 response and the location url as something like this: http://thirdPartyAuth/uas?state=yyyyy&redirect_uri=http://localhost/application If the user perform a successful authentication and gets redirected back to the application I will land on this page: http://localhost:8080/application?ref=xxxxx i.e I have access to the original ref parameter and I can correlate this in my bigger session and a can mark this task as completed. However when something gets wrong. For example when a user is canceling the authentication on the third party auth server the user is redirected to the error page with this uri: http://localhost/application/error?state=yyyyy The redirect on error is working and the user is presented with a correct error web page. The problem is that I am missing the ref=xxxxx parameter. I have only access to the parameter state=yyyyy whis is made up in the Quarkus extension. If this is an expected behaviour is it possible for me to set the state=yyyyy parameter from the application myself or if it is possible to fetch this parameter when the authentication process is starting so that I now whet user is landing on the error page? ### Expected behavior Using the property: quarkus.oidc.authentication.error-path=/error Quarkus should keep the original path parameters so that the user land on the page: http://localhost:8080/application/error?ref=xxxxx when an error occurs during the authentication process. ### Actual behavior Using the property: quarkus.oidc.authentication.error-path=/error The user land on the page: http://localhost:8080/application/error?state=yyyyy I can't figure out how to map the state paramater to my original ref parameter? ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` Quarkus 2.12.1.Final ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

258d9d1826de6b0ecb00750d0d9d4fa4c2fc0864

50125bce72a63e18d6e423dfa217d3809e08c500

https://github.com/quarkusio/quarkus/compare/258d9d1826de6b0ecb00750d0d9d4fa4c2fc0864...50125bce72a63e18d6e423dfa217d3809e08c500

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 84576f9348c..68e53d0a981 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 @@ -153,17 +153,41 @@ public Uni<SecurityIdentity> apply(TenantConfigContext tenantContext) { LOG.debugf("Authentication has failed, error: %s, description: %s", error, errorDescription); if (oidcTenantConfig.authentication.errorPath.isPresent()) { - URI absoluteUri = URI.create(context.request().absoluteURI()); + Uni<TenantConfigContext> resolvedContext = resolver.resolveContext(context); + return resolvedContext.onItem() + .transformToUni(new Function<TenantConfigContext, Uni<? extends SecurityIdentity>>() { + @Override + public Uni<SecurityIdentity> apply(TenantConfigContext tenantContext) { + URI absoluteUri = URI.create(context.request().absoluteURI()); + + String userQuery = null; + + // This is an original redirect from IDP, check if the original request path and query need to be restored + CodeAuthenticationStateBean stateBean = getCodeAuthenticationBean(parsedStateCookieValue, + tenantContext); + if (stateBean != null && stateBean.getRestorePath() != null) { + String restorePath = stateBean.getRestorePath(); + int userQueryIndex = restorePath.indexOf("?"); + if (userQueryIndex >= 0 && userQueryIndex + 1 < restorePath.length()) { + userQuery = restorePath.substring(userQueryIndex + 1); + } + } - StringBuilder errorUri = new StringBuilder(buildUri(context, - isForceHttps(oidcTenantConfig), - absoluteUri.getAuthority(), - oidcTenantConfig.authentication.errorPath.get())); - errorUri.append('?').append(getRequestParametersAsQuery(absoluteUri, requestParams, oidcTenantConfig)); + StringBuilder errorUri = new StringBuilder(buildUri(context, + isForceHttps(oidcTenantConfig), + absoluteUri.getAuthority(), + oidcTenantConfig.authentication.errorPath.get())); + errorUri.append('?') + .append(getRequestParametersAsQuery(absoluteUri, requestParams, oidcTenantConfig)); + if (userQuery != null) { + errorUri.append('&').append(userQuery); + } - String finalErrorUri = errorUri.toString(); - LOG.debugf("Error URI: %s", finalErrorUri); - return Uni.createFrom().failure(new AuthenticationRedirectException(finalErrorUri)); + String finalErrorUri = errorUri.toString(); + LOG.debugf("Error URI: %s", finalErrorUri); + return Uni.createFrom().failure(new AuthenticationRedirectException(finalErrorUri)); + } + }); } else { LOG.error( "Authentication has failed but no error handler is found, completing the code flow with HTTP status 401"); diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java index 4f752143d3e..f06cffa5a46 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java @@ -33,7 +33,8 @@ public String getTenantWithQuery(@QueryParam("code") String value) { @GET @Path("error") - public String getError(@QueryParam("error") String error, @QueryParam("error_description") String errorDescription) { - return "error: " + error + ", error_description: " + errorDescription; + public String getError(@QueryParam("error") String error, @QueryParam("error_description") String errorDescription, + @QueryParam("code") String value) { + return "code: " + value + ", error: " + error + ", error_description: " + errorDescription; } } diff --git a/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java index 0049d1d1eed..a808bf0c98a 100644 --- a/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java +++ b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java @@ -148,7 +148,7 @@ public void testCodeFlowScopeErrorWithErrorPage() throws IOException { endpointErrorLocation = "http" + endpointErrorLocation.substring(5); HtmlPage page = webClient.getPage(URI.create(endpointErrorLocation).toURL()); - assertEquals("error: invalid_scope, error_description: Invalid scopes: unknown", + assertEquals("code: b, error: invalid_scope, error_description: Invalid scopes: unknown", page.getBody().asText()); webClient.getCookieManager().clearCookies(); }

['integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java', 'integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java', 'extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java']

{'.java': 3}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28285/28184

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28184

https://github.com/quarkusio/quarkus/pull/28285

https://github.com/quarkusio/quarkus/pull/28285

fixes

quarkus-smallrye-graphql: @ErrorDataFetch event is not emitted in batch query

### Describe the bug When executing a non-batch query, the following code can receive the error that is thrown during data-fetching process. ``` public void onError(@Observes @ErrorDataFetch ErrorInfo errorInfo) { System.out.println("[error] " + errorInfo.getT().getMessage()); } ``` But, when executing a [batch query](https://quarkus.io/guides/smallrye-graphql#batching) and an error is thrown in the batch process, the above observer can't receive the error. I guess that we should call `eventEmitter.fireOnDataFetchError(...)` like [this code of non-batching query](https://github.com/quarkusio/quarkus/blob/7744dec/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/spi/datafetcher/QuarkusDefaultDataFetcher.java#L90). ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? I wrote a minimum reproducible example. https://github.com/ikenox/code-with-quarkus/blob/e794dddd21d75d09e9a3e68b4602f5da48d7ca62/src/main/java/info/ikenox/ExampleResolver.java You can reproduce the issue by executing the following GraphQL query. ``` query { example{ fooValue bar{ barValue } } } ``` ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

47429fc11ded66d1571601fd81fca78cf9b2ea05

0ac49b1f6f8247e6ec0f8661f77833a009e7602a

https://github.com/quarkusio/quarkus/compare/47429fc11ded66d1571601fd81fca78cf9b2ea05...0ac49b1f6f8247e6ec0f8661f77833a009e7602a

diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/spi/datafetcher/QuarkusDefaultDataFetcher.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/spi/datafetcher/QuarkusDefaultDataFetcher.java index d6d6dad5005..311891879e5 100644 --- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/spi/datafetcher/QuarkusDefaultDataFetcher.java +++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/spi/datafetcher/QuarkusDefaultDataFetcher.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.CompletionStage; +import java.util.function.Consumer; import org.eclipse.microprofile.graphql.GraphQLException; @@ -110,10 +111,20 @@ private CompletionStage<List<T>> invokeBatchBlocking(DataFetchingEnvironment dfe return (List<T>) operationInvoker.invokePrivileged(arguments); }); + // this gets called on a batch error, so that error callbacks can run with the proper context too + Consumer<Throwable> onErrorConsumer = threadContext.contextualConsumer((Throwable exception) -> { + io.smallrye.graphql.api.Context context = dfe.getGraphQlContext().get("context"); + eventEmitter.fireOnDataFetchError(context, exception); + }); + // Here call blocking with context BlockingHelper.runBlocking(vc, contextualCallable, result); - return result.future().toCompletionStage(); - + return result.future().toCompletionStage() + .whenComplete((resultList, error) -> { + if (error != null) { + onErrorConsumer.accept(error); + } + }); } private boolean runBlocking(DataFetchingEnvironment dfe) {

['extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/spi/datafetcher/QuarkusDefaultDataFetcher.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28296/28292

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28292

https://github.com/quarkusio/quarkus/pull/28296

https://github.com/quarkusio/quarkus/pull/28296

fix

`StorkClientRequestFilter` not registered when using `ClientBuilder` to build a jax-rs client

### Describe the bug When using Stork with a manually-created jax-rs client (via `ClientBuilder.newClient()`), the `StorkClientRequestFilter` is not automatically registered. Stork worked fine with the jax-rs client in Quarkus 2.12, but in 2.13 this is broken unless the user manually registers the filter. See https://github.com/quarkusio/quarkus-super-heroes/blob/main/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/client/VillainClient.java#L38 If the user does not manually register the filter then they will end up with a failure that looks something like ``` java.lang.IllegalArgumentException: Invalid REST Client URL used: 'stork://villain-service/api/villains/random' ``` At a very minimum, this should be documented in the Quarkus 2.13 release notes. ### Expected behavior I would expect Stork to "just work" with the jax-rs client, as it did prior to Quarkus 2.12. ### Actual behavior The application fails if the user does not manually register the filter. ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information The `OpenTelemetryClientFilter` seems to be registered automatically when creating the jax-rs client this way, so there must be a way to do this as well for the `StorkClientRequestFilter`.

8da3049fe4bc109060c3d4c8f0d37107be48264b

1563b88de6d6d08e83e9df2fb27ccd384c57ade6

https://github.com/quarkusio/quarkus/compare/8da3049fe4bc109060c3d4c8f0d37107be48264b...1563b88de6d6d08e83e9df2fb27ccd384c57ade6

diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkIntegrationTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkIntegrationTest.java index f57a1d437d7..32c92031137 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkIntegrationTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkIntegrationTest.java @@ -4,6 +4,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.net.URI; +import java.net.URISyntaxException; + +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.core.UriBuilder; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; @@ -34,6 +38,19 @@ void shouldDetermineUrlViaStork() { assertThat(greeting).isEqualTo("hello, black and white bird"); } + @Test + void shouldDetermineUrlViaStorkWhenUsingTarget() throws URISyntaxException { + String greeting = ClientBuilder.newClient().target("stork://hello-service/hello").request().get(String.class); + assertThat(greeting).isEqualTo("Hello"); + + greeting = ClientBuilder.newClient().target(new URI("stork://hello-service/hello")).request().get(String.class); + assertThat(greeting).isEqualTo("Hello"); + + greeting = ClientBuilder.newClient().target(UriBuilder.fromUri("stork://hello-service/hello")).request() + .get(String.class); + assertThat(greeting).isEqualTo("Hello"); + } + @Test void shouldDetermineUrlViaStorkCDI() { String greeting = client.echo("big bird"); diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java index 56fc7d2f4d0..1b4b0355ae6 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java @@ -320,10 +320,45 @@ private void abortIfClosed() { protected InvocationBuilderImpl createQuarkusRestInvocationBuilder(HttpClient client, UriBuilder uri, ConfigurationImpl configuration) { - return new InvocationBuilderImpl(uri.build(), restClient, client, this, configuration, + URI actualUri = uri.build(); + registerStorkFilterIfNeeded(configuration, actualUri); + return new InvocationBuilderImpl(actualUri, restClient, client, this, configuration, handlerChain.setPreClientSendHandler(preClientSendHandler), requestContext); } + /** + * If the URI starts with stork:// or storks://, then register the StorkClientRequestFilter automatically. + * + * @param configuration the configuration + * @param actualUri the uri + */ + private static void registerStorkFilterIfNeeded(ConfigurationImpl configuration, URI actualUri) { + if (actualUri.getScheme() != null && actualUri.getScheme().startsWith("stork") + && !isStorkAlreadyRegistered(configuration)) { + configuration.register(StorkClientRequestFilter.class); + } + } + + /** + * Checks if the Stork request filter is already registered. + * We cannot use configuration.isRegistered, as the user registration uses a subclass, and so fail the equality + * expectation. + * <p> + * This method prevents having the stork filter registered twice: once because the uri starts with stork:// and, + * once from the user. + * + * @param configuration the configuration + * @return {@code true} if stork is already registered. + */ + private static boolean isStorkAlreadyRegistered(ConfigurationImpl configuration) { + for (Class<?> clazz : configuration.getClasses()) { + if (clazz.getName().startsWith(StorkClientRequestFilter.class.getName())) { + return true; + } + } + return false; + } + @Override public WebTargetImpl property(String name, Object value) { abortIfClosed();

['independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java', 'extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkIntegrationTest.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28312/27778

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/27778

https://github.com/quarkusio/quarkus/pull/28312

https://github.com/quarkusio/quarkus/pull/28312

fixes

Misleading 'unrecognized configuration' warnings for quarkus.debug.transformed-classes-dir and quarkus.debug.generated-sources-dir

### Describe the bug https://quarkus.io/guides/writing-extensions suggests the following debug options: > There are also three system properties that allow you to dump the generated/transformed classes to the filesystem and inspect them later, for example via a decompiler in your IDE. > > `quarkus.debug.generated-classes-dir` - to dump the generated classes, such as bean metadata > `quarkus.debug.transformed-classes-dir` - to dump the transformed classes, e.g. Panache entities > `quarkus.debug.generated-sources-dir` - to dump the ZIG files; ZIG file is a textual representation of the generated code that is referenced in the stack traces All of the options produce the expected output, but there are warnings in the log for the transformed classes and generated sources options (but not the generated classes): ``` 2022-09-07 10:45:32,489 WARN [io.qua.config] (Quarkus Main Thread) Unrecognized configuration key "quarkus.debug.generated-sources-dir" was provided; it will be ignored; verify that the dependency extension for this configuration is set or that you did not make a typo 2022-09-07 10:45:32,489 WARN [io.qua.config] (Quarkus Main Thread) Unrecognized configuration key "quarkus.debug.transformed-classes-dir" was provided; it will be ignored; verify that the dependency extension for this configuration is set or that you did not make a typo ``` I can't see any different handling in the code for the three options, so I'm not sure why one doesn't get a warning and two do. ### Expected behavior Since these are valid options, there should not be a warning in the log. ### Actual behavior ``` 2022-09-07 10:45:32,489 WARN [io.qua.config] (Quarkus Main Thread) Unrecognized configuration key "quarkus.debug.generated-sources-dir" was provided; it will be ignored; verify that the dependency extension for this configuration is set or that you did not make a typo 2022-09-07 10:45:32,489 WARN [io.qua.config] (Quarkus Main Thread) Unrecognized configuration key "quarkus.debug.transformed-classes-dir" was provided; it will be ignored; verify that the dependency extension for this configuration is set or that you did not make a typo ``` ### How to Reproduce? Any Quarkus application should reproduce; I used an application of my own and also the getting started app. ``` quarkus create app org.acme:getting-started \\ --extension=resteasy-reactive cd getting-started mvn quarkus:dev -Dquarkus.debug.transformed-classes-dir=transformed -Dquarkus.debug.generated-classes-dir=generated -Dquarkus.debug.generated-sources-dir=sources ``` ### Output of `uname -a` or `ver` Darwin hcummins-mac 21.6.0 Darwin Kernel Version 21.6.0: Wed Aug 10 14:28:23 PDT 2022; root:xnu-8020.141.5~2/RELEASE_ARM64_T6000 arm64 ### Output of `java -version` openjdk version "17.0.2" 2022-01-18 OpenJDK Runtime Environment Temurin-17.0.2+8 (build 17.0.2+8) OpenJDK 64-Bit Server VM Temurin-17.0.2+8 (build 17.0.2+8, mixed mode) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.12.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 (84538c9988a25aec085021c365c560670ad80f63) ### Additional information _No response_

91be040f20841699302ae2c89852ede12802d8e0

15424f4e8fb0142571d5793f7453131f56a38453

https://github.com/quarkusio/quarkus/compare/91be040f20841699302ae2c89852ede12802d8e0...15424f4e8fb0142571d5793f7453131f56a38453

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/DebugConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/DebugConfig.java index e54d05c7355..bdacdd8419c 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/DebugConfig.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/DebugConfig.java @@ -25,4 +25,18 @@ public class DebugConfig { */ @ConfigItem Optional<String> generatedClassesDir; + + /** + * If set to a directory, all transformed classes (e.g. Panache entities) will be written into that directory + */ + @ConfigItem + Optional<String> transformedClassesDir; + + /** + * If set to a directory, ZIG files for generated code will be written into that directory. + * <p> + * A ZIG file is a textual representation of the generated code that is referenced in the stacktraces. + */ + @ConfigItem + Optional<String> generatedSourcesDir; }

['core/deployment/src/main/java/io/quarkus/deployment/DebugConfig.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/30255/30044

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/30044

https://github.com/quarkusio/quarkus/pull/30255

https://github.com/quarkusio/quarkus/pull/30255

fix

Resteasy Reactive Rest Client fails to re-construct large chunks of streamed json (stream+json) and fails deserialization

### Describe the bug Note: This is related to #30040 in that both result in `JsonMappingException`s, but this is a different issue. I am trying to use `RestMediaType.APPLICATION_STREAM_JSON` to stream a `Multi` that contains a few larger objects (think ~25 kB each) from my reactive java server to a reactive java client, using the rest client. However, the deserialization of the objects fails with `Unexpected end-of-input` errors, either at the end of `1943` bytes or `8192` bytes. (For the `1943` case, I think there is potentially header info on the first chunk that is cutting into the `8192` total, since when I try to collect the chunks as Strings instead of reading them as my custom objects, all but the first String are 8192 chars long) Through my own investigation I have found the workaround is to increase the Vertx `HttpClientOptions` for `DEFAULT_MAX_CHUNK_SIZE` and `DEFAULT_RECEIVE_BUFFER_SIZE`, both of which are defaulted to `8192` Maybe that is the final solution, but I would think that the rest client should be able to use the newline-delimited json to determine when it has received an entire object, and buffer/hold in memory up to that point before attempting to deserialize. ### Expected behavior Rest client can properly receive and deserialize a stream of larger json objects, without having to fiddle with the http client options myself ### Actual behavior Errors in the client: ``` com.fasterxml.jackson.databind.JsonMappingException: Unexpected end-of-input in field name at [Source: (ByteArrayInputStream); line: 1, column: 1943] ... com.fasterxml.jackson.core.io.JsonEOFException: Unexpected end-of-input in VALUE_STRING at [Source: (ByteArrayInputStream); line: 1, column: 8192] ``` ### How to Reproduce? Reproducer: `service3` (client) and `service4` (server) in https://github.com/fleckware/quarkus-test 1. in one terminal `./gradlew service4:quarkusDev` 2. in a separate terminal `./gradlew service3:quarkusDev` 3. in a separate terminal `curl localhost:8081/service4/test/large > output.json` 4. observe that when hitting the streaming endpoint on the server directly, there is no issue 5. now try to hit it using the rest client `curl localhost:8080/service3/test/large` 6. observe the json mapping error in the `service3` terminal ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` openjdk 11.0.10 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.15.0 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) gradle 7.4.2 ### Additional information _No response_

f9a688a2185346b9ff41ff0e9157c9ab30f142c4

e7eeaea9944db9700ce9f8c6ace17d49237f3313

https://github.com/quarkusio/quarkus/compare/f9a688a2185346b9ff41ff0e9157c9ab30f142c4...e7eeaea9944db9700ce9f8c6ace17d49237f3313

diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/Message.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/Message.java similarity index 70% rename from extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/Message.java rename to extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/Message.java index c09c92acb96..79109e22e20 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/Message.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/Message.java @@ -1,4 +1,4 @@ -package io.quarkus.resteasy.reactive.jackson.deployment.test.sse; +package io.quarkus.resteasy.reactive.jackson.deployment.test.streams; public class Message { public String name; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/SseResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamResource.java similarity index 84% rename from extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/SseResource.java rename to extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamResource.java index 3176a97a817..fd5c2b81a72 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/SseResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamResource.java @@ -1,6 +1,9 @@ -package io.quarkus.resteasy.reactive.jackson.deployment.test.sse; +package io.quarkus.resteasy.reactive.jackson.deployment.test.streams; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -16,8 +19,8 @@ import io.smallrye.common.annotation.Blocking; import io.smallrye.mutiny.Multi; -@Path("sse") -public class SseResource { +@Path("streams") +public class StreamResource { @GET @Produces(MediaType.SERVER_SENT_EVENTS) @@ -120,4 +123,21 @@ public Multi<Message> multiStreamJson() { return Multi.createFrom().items(new Message("hello"), new Message("stef")); } + /** + * Reproduce <a href="https://github.com/quarkusio/quarkus/issues/30044">#30044</a>. + */ + @Path("stream-json/multi/fast") + @GET + @Produces(RestMediaType.APPLICATION_STREAM_JSON) + @RestStreamElementType(MediaType.APPLICATION_JSON) + public Multi<Message> multiStreamJsonFast() { + List<UUID> ids = new ArrayList<>(5000); + for (int i = 0; i < 5000; i++) { + ids.add(UUID.randomUUID()); + } + return Multi.createFrom().items(ids::stream) + .onItem().transform(id -> new Message(id.toString())) + .onOverflow().buffer(81920); + } + } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/SseTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamTestCase.java similarity index 78% rename from extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/SseTestCase.java rename to extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamTestCase.java index afb909111ba..bc82769dd1d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/SseTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamTestCase.java @@ -1,4 +1,4 @@ -package io.quarkus.resteasy.reactive.jackson.deployment.test.sse; +package io.quarkus.resteasy.reactive.jackson.deployment.test.streams; import static io.restassured.RestAssured.when; import static org.assertj.core.api.Assertions.assertThat; @@ -33,7 +33,7 @@ import io.quarkus.test.common.http.TestHTTPResource; import io.smallrye.mutiny.Multi; -public class SseTestCase { +public class StreamTestCase { @TestHTTPResource URI uri; @@ -41,16 +41,16 @@ public class SseTestCase { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) - .addClasses(SseResource.class, Message.class)); + .addClasses(StreamResource.class, Message.class)); @Test public void testSseFromSse() throws Exception { - testSse("sse"); + testSse("streams"); } @Test public void testSseFromMulti() throws Exception { - testSse("sse/multi"); + testSse("streams/multi"); } private void testSse(String path) throws Exception { @@ -81,12 +81,12 @@ public void accept(Throwable throwable) { @Test public void testMultiFromSse() { - testMulti("sse"); + testMulti("streams"); } @Test public void testMultiFromMulti() { - testMulti("sse/multi"); + testMulti("streams/multi"); } private void testMulti(String path) { @@ -99,24 +99,24 @@ private void testMulti(String path) { @Test public void testJsonMultiFromSse() { - testJsonMulti("sse/json"); - testJsonMulti("sse/json2"); - testJsonMulti("sse/blocking/json"); + testJsonMulti("streams/json"); + testJsonMulti("streams/json2"); + testJsonMulti("streams/blocking/json"); } @Test public void testJsonMultiFromMulti() { - testJsonMulti("sse/json/multi"); + testJsonMulti("streams/json/multi"); } @Test public void testJsonMultiFromMultiWithDefaultElementType() { - testJsonMulti("sse/json/multi2"); + testJsonMulti("streams/json/multi2"); } @Test public void testNdJsonMultiFromMulti() { - when().get(uri.toString() + "sse/ndjson/multi") + when().get(uri.toString() + "streams/ndjson/multi") .then().statusCode(HttpStatus.SC_OK) // @formatter:off .body(is("{\\"name\\":\\"hello\\"}\\n" @@ -127,7 +127,7 @@ public void testNdJsonMultiFromMulti() { @Test public void testStreamJsonMultiFromMulti() { - when().get(uri.toString() + "sse/stream-json/multi") + when().get(uri.toString() + "streams/stream-json/multi") .then().statusCode(HttpStatus.SC_OK) // @formatter:off .body(is("{\\"name\\":\\"hello\\"}\\n" @@ -143,4 +143,19 @@ private void testJsonMulti(String path) { List<Message> list = multi.collect().asList().await().atMost(Duration.ofSeconds(30)); assertThat(list).extracting("name").containsExactly("hello", "stef"); } + + /** + * Reproduce <a href="https://github.com/quarkusio/quarkus/issues/30044">#30044</a>. + */ + @Test + public void testStreamJsonMultiFromMultiFast() { + String payload = when().get(uri.toString() + "streams/stream-json/multi/fast") + .then().statusCode(HttpStatus.SC_OK) + .header(HttpHeaders.CONTENT_TYPE, containsString(RestMediaType.APPLICATION_STREAM_JSON)) + .extract().response().asString(); + + // the payload include 5000 json objects + assertThat(payload.lines()).hasSize(5000) + .allSatisfy(s -> assertThat(s).matches("\\\\{\\"name\\":\\".*\\"}")); + } } diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java index c6edb7584aa..aa4129bbd27 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.client.impl; import java.io.ByteArrayInputStream; +import java.io.IOException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; @@ -18,6 +19,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.http.HttpClientResponse; import io.vertx.core.net.impl.ConnectionBase; +import io.vertx.core.parsetools.RecordParser; public class MultiInvoker extends AbstractRxInvoker<Multi<?>> { @@ -121,10 +123,13 @@ public <R> Multi<R> method(String name, Entity<?> entity, GenericType<R> respons } else { HttpClientResponse vertxResponse = restClientRequestContext.getVertxClientResponse(); if (!emitter.isCancelled()) { - // FIXME: this is probably not good enough if (response.getStatus() == 200 && MediaType.SERVER_SENT_EVENTS_TYPE.isCompatible(response.getMediaType())) { registerForSse(multiRequest, responseType, response, vertxResponse); + } else if (response.getStatus() == 200 + && RestMediaType.APPLICATION_STREAM_JSON_TYPE.isCompatible(response.getMediaType())) { + registerForJsonStream(multiRequest, restClientRequestContext, responseType, response, + vertxResponse); } else { // read stuff in chunks registerForChunks(multiRequest, restClientRequestContext, responseType, response, vertxResponse); @@ -267,4 +272,46 @@ private boolean startsWith(byte[] array, byte[] prefix) { }); } + private <R> void registerForJsonStream(MultiRequest<? super R> multiRequest, + RestClientRequestContext restClientRequestContext, + GenericType<R> responseType, + ResponseImpl response, + HttpClientResponse vertxClientResponse) { + RecordParser parser = RecordParser.newDelimited("\\n"); + parser.handler(new Handler<Buffer>() { + @Override + public void handle(Buffer chunk) { + + ByteArrayInputStream in = new ByteArrayInputStream(chunk.getBytes()); + try { + R item = restClientRequestContext.readEntity(in, responseType, response.getMediaType(), + response.getMetadata()); + multiRequest.emitter.emit(item); + } catch (IOException e) { + multiRequest.emitter.fail(e); + } + } + }); + vertxClientResponse.exceptionHandler(t -> { + if (t == ConnectionBase.CLOSED_EXCEPTION) { + // we can ignore this one since we registered a closeHandler + } else { + multiRequest.emitter.fail(t); + } + }); + vertxClientResponse.endHandler(new Handler<Void>() { + @Override + public void handle(Void c) { + multiRequest.complete(); + } + }); + + vertxClientResponse.handler(parser); + + // watch for user cancelling + multiRequest.onCancel(() -> { + vertxClientResponse.request().connection().close(); + }); + } + }

['extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/Message.java', 'extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/SseTestCase.java', 'extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/sse/SseResource.java', 'independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java']

{'.java': 4}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/30214/30046

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/30046

https://github.com/quarkusio/quarkus/pull/30214

https://github.com/quarkusio/quarkus/pull/30214

closes

MultiPartConfig in HTTP Vert.x extension is insufficiently documented

### Describe the bug Hello, I have one opinion (you can ignore that one) and one concern (IMO bug) regarding https://github.com/quarkusio/quarkus/pull/29729 documentation. **Opinion**: Please document this feature in more detail and ideally provide an example in docs. Documentation does not provide single example on `MultiPartConfig` and `fileContentTypes`. I understand you (and me) know what `MultiPartConfig#fileContentType` should be used for because we read this PR, but users didn't not, they only see this configuration property with text `A list of {@code ContentType} to indicate whether a given multipart field should be handled as a file part.` With context of #29729 that sentence is completely clear, but you can only find this in configuration properties list. **Concern** This PR added `MultiPartConfig` to Vert.x HTTP extension. `MultiPartConfig` only used by RESTEasy Reactive and ignored by every other extension (RESTEasy Classic, Reactive Routes, ...) while that fact is literally nowhere mentioned. How is it possible to have the configuration in Vert.X HTTP extension and do not mention it only works for RESTEasy Reactive? How should user know that? ### Expected behavior one of: - I expect `MultiPartConfig#fileContentType` configuration property works for RESTEasy Classic, Reactive Routes etc. - Document that it only works for RESTEasy Reactive ### Actual behavior - only works for RESTEasy Reactive - docs don't tell me that the property only works for single extension ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

e47a267e13819cf5ebd4322ad2b2c88b06209a34

30c51ab5ace3f1182b154886e00e508533b0950c

https://github.com/quarkusio/quarkus/compare/e47a267e13819cf5ebd4322ad2b2c88b06209a34...30c51ab5ace3f1182b154886e00e508533b0950c

diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/MultiPartConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/MultiPartConfig.java index a0e262b28d6..43cfe26f7ed 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/MultiPartConfig.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/MultiPartConfig.java @@ -15,7 +15,12 @@ public class MultiPartConfig { /** - * A list of {@code ContentType} to indicate whether a given multipart field should be handled as a file part. + * A comma-separated list of {@code ContentType} to indicate whether a given multipart field should be handled as a file + * part. + * + * You can use this setting to force HTTP-based extensions to parse a message part as a file based on its content type. + * + * For now, this setting only works when using RESTEasy Reactive. */ @ConfigItem @ConvertWith(TrimmedStringConverter.class)

['extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/MultiPartConfig.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/30157/30061

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/30061

https://github.com/quarkusio/quarkus/pull/30157

https://github.com/quarkusio/quarkus/pull/30157

fix

Adding Kotlin Tests Breaks Kotlin/Java project

### Describe the bug I posted a more in-depth description of the issue here last night: <https://github.com/quarkusio/quarkus/discussions/30049> The summary is: Adding a Kotlin test file breaks `quarkus dev`. Some of my resources mysteriously disappear and aren't available at runtime. ### Expected behavior I should be able to mix Java and Kotlin code in the same project and have everything work. One of the great advantages of Kotlin is that it's usually easy to gradually introduce it to a project without rewriting everything. (read: I'll have a *much* easier time getting my team to adopt this if Java and Kotlin play well together. 😄) ### Actual behavior Adding a(n empty!) Kotlin test file causes some of my resources to be (silently!) unavailable while running `quarkus dev`. ### How to Reproduce? ``` > quarkus version 2.15.1.Final > quarkus create app org.acme:rest-example --extension='resteasy-reactive-jackson' --gradle-kotlin-dsl > cd rest-example > quarkus dev # At this point, the example code works. # can access http://localhost:8080/hello # Save state: > git init . > git add . > git commit -m "initial code" > quarkus extension add kotlin ``` You'll also need to add Kotlin config to your build.gradle.kts as documented in: <https://quarkus.io/guides/kotlin#important-gradle-configuration-points> Now add a new REST endpoint in Kotlin so we can show how Java/Kotlin code *should* work together. ```kotlin // file: src/main/kotlin/org/acme/KotlinGreeting.kt 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("/hello2") class KotlinGreeting( private var javaResource: GreetingResource ) { @GET @Produces(MediaType.TEXT_PLAIN) fun hello(): String { return "${javaResource.hello()} -- now in Kotlin!" } } ``` Verify this works by running `quarkus dev` and visiting `http://localhost:8080/hello2`. ``` > git add . > git commit -m "checkpoint: Java + Kotlin working" ``` Now add a new "test" file. (No actual test necessary) ```kotlin // file: test/kotlin/org/acme/KotlinGreetingTest.kt package org.acme // This file left intentionally blank. ``` Once again run `quarkus dev`. While the server starts up without error, neither `/hello` nor `/hello2` resources are loaded. And there are no errors to let you know something has gone wrong. ``` > git add . > git commit -m "checkpoint: broken" ``` I'll attach the zip file (including git history) here. [rest-example.zip](https://github.com/quarkusio/quarkus/files/10296136/rest-example.zip) ### Output of `uname -a` or `ver` Windows. :p But I also originally bumped into this on macOS. ### Output of `java -version` openjdk version "16.0.2" 2021-07-20 ### GraalVM version (if different from Java) n/a ### Quarkus version or git rev 2.15.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 7.5.1 ### Additional information _No response_

4dd3936da69d2d4bfa7826015445c29d60bf9a34

dad033640ceaf0a7c6ef80935d1e7e4a4782f356

https://github.com/quarkusio/quarkus/compare/4dd3936da69d2d4bfa7826015445c29d60bf9a34...dad033640ceaf0a7c6ef80935d1e7e4a4782f356

diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java index e248cfc79fe..9a3ebcf051b 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java @@ -571,7 +571,7 @@ private void addLocalProject(ResolvedDependency project, GradleDevModeLauncher.B } } Path classesDir = classesDirs.isEmpty() ? null - : QuarkusGradleUtils.mergeClassesDirs(classesDirs, project.getWorkspaceModule().getBuildDir(), root, root); + : QuarkusGradleUtils.mergeClassesDirs(classesDirs, project.getWorkspaceModule().getBuildDir(), root, false); final Set<Path> resourcesSrcDirs = new LinkedHashSet<>(); // resourcesSrcDir may exist but if it's empty the resources output dir won't be created

['devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/30141/20034

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/20034

https://github.com/quarkusio/quarkus/pull/30141

https://github.com/quarkusio/quarkus/pull/30141

fixes

@TestTransaction in combination with Junit5 @Nested does not roll back

### Describe the bug In a `@QuarkusTest` placing `@TestTransaction` on methods inside a Junit5 `@Nested` class does not roll back the transaction - the test data stays in the database. Moving the test method out of the `@Nested class` makes it work. ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.0.2.Final and latest ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

019b8299ae534b915f4bad9de627e9d51b46cd0a

57112e0e7e872d9023da807ed21f5a972dff869f

https://github.com/quarkusio/quarkus/compare/019b8299ae534b915f4bad9de627e9d51b46cd0a...57112e0e7e872d9023da807ed21f5a972dff869f

diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.java index d7597589eb6..e10d994a4e8 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.java @@ -17,6 +17,7 @@ import org.jboss.jandex.IndexView; import io.quarkus.arc.deployment.ValidationPhaseBuildItem.ValidationErrorBuildItem; +import io.quarkus.arc.processor.Annotations; import io.quarkus.arc.processor.DotNames; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; @@ -26,7 +27,8 @@ public class WrongAnnotationUsageProcessor { @BuildStep void detect(ArcConfig config, ApplicationIndexBuildItem applicationIndex, CustomScopeAnnotationsBuildItem scopeAnnotations, - TransformedAnnotationsBuildItem transformedAnnotations, BuildProducer<ValidationErrorBuildItem> validationErrors) { + TransformedAnnotationsBuildItem transformedAnnotations, BuildProducer<ValidationErrorBuildItem> validationErrors, + InterceptorResolverBuildItem interceptorResolverBuildItem) { if (!config.detectWrongAnnotations) { return; @@ -90,6 +92,14 @@ public String apply(AnnotationInstance annotationInstance) { new IllegalStateException(String.format( "The %s class %s declares a producer but it must be ignored per the CDI rules", clazz.nestingType().toString(), clazz.name().toString())))); + } else if (Annotations.containsAny(classAnnotations, interceptorResolverBuildItem.getInterceptorBindings()) + || Annotations.containsAny(clazz.annotations(), + interceptorResolverBuildItem.getInterceptorBindings())) { + // detect interceptor bindings on nested classes + validationErrors.produce(new ValidationErrorBuildItem( + new IllegalStateException(String.format( + "The %s class %s declares an interceptor binding but it must be ignored per CDI rules", + clazz.nestingType().toString(), clazz.name().toString())))); } } }

['extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29984/29976

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29976

https://github.com/quarkusio/quarkus/pull/29984

https://github.com/quarkusio/quarkus/pull/29984

fixes

Custom ObjectMapper in application affects Kafka UI Dev service

### Describe the bug I have custom ObjectMapperCustomizer that I needed to convert all json payloads to use snake_case. ``` @Singleton public class ObjectMapperCustomizer implements io.quarkus.jackson.ObjectMapperCustomizer { public void customize(ObjectMapper mapper) { mapper.setSerializationInclusion(NON_NULL); mapper.setPropertyNamingStrategy(SNAKE_CASE); } } ``` This apparently affects the Kafka UI running as one of the dev services. How do I isolate kafka dev services from this? ### Expected behavior The Kafka UI dev service should function as expected ### Actual behavior Application's custom JsonMappers affects Kafka UI's payload and as a result renders the UI unusable ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

05a7c8b0b87f70e26363b8e136d0b4b3feff5621

0b76f7213266cb0849fb2bac97004ab35cadc771

https://github.com/quarkusio/quarkus/compare/05a7c8b0b87f70e26363b8e136d0b4b3feff5621...0b76f7213266cb0849fb2bac97004ab35cadc771

diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaUiUtils.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaUiUtils.java index 862fdcfeb2d..bc9b3ba525d 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaUiUtils.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaUiUtils.java @@ -2,7 +2,12 @@ import static io.quarkus.kafka.client.runtime.ui.util.ConsumerFactory.createConsumer; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; @@ -17,7 +22,10 @@ import org.apache.kafka.common.TopicPartition; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.json.JsonMapper; import io.quarkus.kafka.client.runtime.KafkaAdminClient; import io.quarkus.kafka.client.runtime.ui.model.Order; @@ -37,12 +45,15 @@ public class KafkaUiUtils { private final Map<String, Object> config; - public KafkaUiUtils(KafkaAdminClient kafkaAdminClient, KafkaTopicClient kafkaTopicClient, ObjectMapper objectMapper, + public KafkaUiUtils(KafkaAdminClient kafkaAdminClient, KafkaTopicClient kafkaTopicClient, @Identifier("default-kafka-broker") Map<String, Object> config) { this.kafkaAdminClient = kafkaAdminClient; this.kafkaTopicClient = kafkaTopicClient; - this.objectMapper = objectMapper; this.config = config; + this.objectMapper = JsonMapper.builder() + .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS) + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .build(); } public KafkaInfo getKafkaInfo() throws ExecutionException, InterruptedException {

['extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaUiUtils.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29981/29956

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29956

https://github.com/quarkusio/quarkus/pull/29981

https://github.com/quarkusio/quarkus/pull/29981

fixes

Hibernate reactive disregarding quarkus.hibernate-orm.jdbc.timezone

### Describe the bug I have the last couple of days been trying to understand why my code does not consider `TIMESTAMP WITH TIME ZONE` in my main postgresSQL application that uses hibernate reactive so I created two smaller applications to test just test how hibernate-orm and hibernate-reactive work in quarkus with time zones. First of I tried hibernate reactive and stumbled across the issue listed in #10768 on my own whilst running my `@QuarkusIntegrationTest` and `@QuarkusTest` and then changed my approach to use the normal “jdbc driver” to get flyway working to have it more like main PostgreSQL project. After the jdbc change I once of my test suits with `quarkus.hibernate-orm.jdbc.timezone` set to `UTC` with no effect whilst always running with `user.timezone=Etc/GMT-1` to simulate a consistent time zone, but neither of these settings helped ☹. So after that I created a `user.timezone=UTC` test which works since now both my postgres container and quarkus application now run in UTC. So then does it work in the normal quarkus hibernate-orm implementation? Well yeah everything works fine there when having `quarkus.hibernate-orm.jdbc.timezone` set to `UTC`. P.S. One thing I forgot to comment about in my findings is the code that converts a `TIMESTAMP WITH TIME ZONE` from a database field (that is stored in postgres as UTC) to UTC again without taking into regard the time zone part of the original value in the database before converting it to the java object with the user.timezone so… the conversion loses one hour in my GmtIT.java tests… 👏🎉🧨😂. But this is releated to the other issue that has already been created. P.S.S. Create a branch in the hibernate reactive application with no flyway. ### Expected behavior quarkus.hibernate-orm.jdbc.timezone works according to specificaiton and can take into account database timezone when converting ### Actual behavior Does nothing application boot timezone is used for all convertion of date and time ### How to Reproduce? Github repos with my test code: - [hibernate-reactive repo](https://github.com/agreedSkiing/test-hibernate-reactive-timezone-postgres) - [hibernate-orm repo]( https://github.com/agreedSkiing/test-hibernate-timezone-postgres) ### Output of `uname -a` or `ver` Linux DI-001000104447 4.19.128-microsoft-standard #1 SMP Tue Jun 23 12:58:10 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` java version "17.0.5" 2022-10-18 LTS Java(TM) SE Runtime Environment (build 17.0.5+9-LTS-191) Java HotSpot(TM) 64-Bit Server VM (build 17.0.5+9-LTS-191, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.15.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 (84538c9988a25aec085021c365c560670ad80f63) ### Additional information _No response_

1079861faf9ef0adc4ab239fe5b9d35566313e8f

aab1831220bc82daab9447948b23fa9a5f77f0ba

https://github.com/quarkusio/quarkus/compare/1079861faf9ef0adc4ab239fe5b9d35566313e8f...aab1831220bc82daab9447948b23fa9a5f77f0ba

diff --git a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java index c5f5207fa3b..0fdcd1e39ab 100644 --- a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java +++ b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java @@ -310,6 +310,13 @@ private static ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit( String.valueOf(persistenceUnitConfig.query.inClauseParameterPadding)); // JDBC + persistenceUnitConfig.jdbc.timezone.ifPresent( + timezone -> desc.getProperties().setProperty(AvailableSettings.JDBC_TIME_ZONE, timezone)); + + persistenceUnitConfig.jdbc.statementFetchSize.ifPresent( + fetchSize -> desc.getProperties().setProperty(AvailableSettings.STATEMENT_FETCH_SIZE, + String.valueOf(fetchSize))); + persistenceUnitConfig.jdbc.statementBatchSize.ifPresent( statementBatchSize -> desc.getProperties().setProperty(AvailableSettings.STATEMENT_BATCH_SIZE, String.valueOf(statementBatchSize)));

['extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28384/28377

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28377

https://github.com/quarkusio/quarkus/pull/28384

https://github.com/quarkusio/quarkus/pull/28384

fixes

Log on startup with "Default CORS properties will be used, please use 'quarkus.http.cors' properties instead" without more information

### Describe the bug If I start a Quarkus application in production mode, with the smallrye-openapi extension enabled, I get this message on startup: ``` 2022-10-04 13:50:54,394 INFO [io.qua.sma.ope.run.OpenApiRecorder] (main) Default CORS properties will be used, please use 'quarkus.http.cors' properties instead ``` I find this confusing, as the message is not telling me what I did wrong (maybe forgot to set some properties, which ones?) nor exactly what is needed to solve it (which properties should I set, simply `quarkus.http.cors=true`? something more complex?). For the record, my `application.properties` is completely empty. ### Expected behavior Maybe the message should expand a bit on what's wrong and what should be done to solve the problem? If there *is* no problem (as the "INFO" level seems to suggest), maybe it should be rephrased from "please use [...]" to "if you want X, do Y"? ### Actual behavior ``` 2022-10-04 13:50:54,394 INFO [io.qua.sma.ope.run.OpenApiRecorder] (main) Default CORS properties will be used, please use 'quarkus.http.cors' properties instead ``` ### How to Reproduce? ``` quarkus create --extension resteasy,hibernate-orm-panache,jdbc-postgresql,smallrye-openapi cd code-with-quarkus ./mvnw clean package java -jar ./target/quarkus-app/quarkus-run.jar ``` ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information The log was apparently introduced in this commit by @sberyozkin: https://github.com/quarkusio/quarkus/commit/597440d6edbeee8850de0d6f34477dd606724287

404d64fb793b665225978746070e1f02abea9f9b

c78f626346f2d89395d8e29bcd904e8ed4ab1fb1

https://github.com/quarkusio/quarkus/compare/404d64fb793b665225978746070e1f02abea9f9b...c78f626346f2d89395d8e29bcd904e8ed4ab1fb1

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 53bac5ddfcf..50efcc3f86e 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 @@ -45,7 +45,10 @@ public void accept(Route route) { public Handler<RoutingContext> handler(OpenApiRuntimeConfig runtimeConfig) { if (runtimeConfig.enable) { if (!configuration.getValue().corsEnabled && LaunchMode.NORMAL == LaunchMode.current()) { - log.info("Default CORS properties will be used, please use 'quarkus.http.cors' properties instead"); + log.info( + "CORS filtering is disabled and cross-origin resource sharing is allowed without restriction, which is not recommended in production." + + " Please configure the CORS filter through 'quarkus.http.cors.*' properties." + + " For more information, see Quarkus HTTP CORS documentation"); } return new OpenApiHandler(configuration.getValue().corsEnabled); } else {

['extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRecorder.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28412/28335

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28335

https://github.com/quarkusio/quarkus/pull/28412

https://github.com/quarkusio/quarkus/pull/28412

fixes

Native awt build fails on Windows also when running with native-build-container

### Describe the bug Running the native build with `-Dquarkus.native.container-build=true` also fails on windows even though the native-build would be executed inside a linux docker container. ### Expected behavior The build should work inside a linux docker container ### Actual behavior Following error is thrown: ``` * What went wrong: Execution failed for task ':devtools:machine-learning:labeling-server:quarkusBuild'. > io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.deployment.pkg.steps.NativeImageBuildStep#build threw an exception: java.lang.RuntimeException: Failed to build native image at io.quarkus.deployment.pkg.steps.NativeImageBuildStep.build(NativeImageBuildStep.java:281) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at io.quarkus.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:909) at io.quarkus.builder.BuildContext.run(BuildContext.java:281) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1478) at java.base/java.lang.Thread.run(Thread.java:833) at org.jboss.threads.JBossThread.run(JBossThread.java:501) Caused by: java.lang.UnsupportedOperationException: Windows AWT integration is not ready in native-image and would result in java.lang.UnsatisfiedLinkError: no awt in java.library.path. at io.quarkus.deployment.pkg.steps.NativeImageBuildStep$NativeImageInvokerInfo$Builder.build(NativeImageBuildStep.java:883) at io.quarkus.deployment.pkg.steps.NativeImageBuildStep.build(NativeImageBuildStep.java:249) ... 11 more ``` ### How to Reproduce? * add `io.quarkus:quarkus-awt` * run ```sh gradlew quarkusBuild -Dquarkus.native.container-build=true -Dquarkus.package.type=native -Dquarkus.container-image.build=true ``` ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` 17 ### GraalVM version (if different from Java) 17 ### Quarkus version or git rev 2.13.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) gradlew 7.5.1 ### Additional information _No response_

7d551fda0b38db8c33f953957567d0b40d43a4ff

00392e75baaa66f0bc5ed9c36e7e25d3d7f66407

https://github.com/quarkusio/quarkus/compare/7d551fda0b38db8c33f953957567d0b40d43a4ff...00392e75baaa66f0bc5ed9c36e7e25d3d7f66407

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/UnsupportedOSBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/UnsupportedOSBuildItem.java index 04ba9d9ab52..159e406ecef 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/UnsupportedOSBuildItem.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/UnsupportedOSBuildItem.java @@ -5,6 +5,7 @@ import static io.quarkus.dev.console.QuarkusConsole.IS_WINDOWS; import io.quarkus.builder.item.MultiBuildItem; +import io.quarkus.deployment.pkg.NativeConfig; /** * Native-image might not be supported for a particular @@ -30,4 +31,15 @@ public UnsupportedOSBuildItem(Os os, String error) { this.os = os; this.error = error; } + + public boolean triggerError(NativeConfig nativeConfig) { + return + // When the host OS is unsupported, it could have helped to + // run in a Linux builder image (e.g. an extension unsupported on Windows). + (os.active && !nativeConfig.isContainerBuild()) || + // If Linux is the OS the extension does not support, + // it fails in a container build regardless the host OS, + // because we have only Linux based builder images. + (nativeConfig.isContainerBuild() && os == Os.LINUX); + } } 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 be61fb022f7..dbedfb8aee9 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 @@ -891,7 +891,9 @@ public NativeImageInvokerInfo build() { } if (unsupportedOSes != null && !unsupportedOSes.isEmpty()) { - final String errs = unsupportedOSes.stream().filter(o -> o.os.active).map(o -> o.error) + final String errs = unsupportedOSes.stream() + .filter(o -> o.triggerError(nativeConfig)) + .map(o -> o.error) .collect(Collectors.joining(", ")); if (!errs.isEmpty()) { throw new UnsupportedOperationException(errs);

['core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java', 'core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/UnsupportedOSBuildItem.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28419/28375

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28375

https://github.com/quarkusio/quarkus/pull/28419

https://github.com/quarkusio/quarkus/pull/28419

fix

Quarkus fails when using jgitver

### Describe the bug Hi, It seems that Quarkus doesn't work properly when the maven project is using the [jgitver-maven-plugin](https://github.com/jgitver/jgitver-maven-plugin) - a maven plugin to automatically define the maven project version based on git branches as tags. Thanks. ### Expected behavior The `./mvnw quarkus:dev` should start Quarkus in development mode, instead of failing. ### Actual behavior Running `./mvnw quarkus:dev` fails with the following error: ``` Listening for transport dt_socket at address: 5005 Exception in thread "main" java.lang.NullPointerException: Cannot invoke "io.quarkus.deployment.dev.DevModeContext$ModuleInfo.getMain()" because the return value of "io.quarkus.deployment.dev.DevModeContext.getApplicationRoot()" is null at io.quarkus.deployment.dev.DevModeMain.start(DevModeMain.java:90) at io.quarkus.deploy [debug.txt](https://github.com/quarkusio/quarkus/files/9704780/debug.txt) ment.dev.DevModeMain.main(DevModeMain.java:62) ``` Output from running `./mvnw quarkus:dev -X`: [debug.txt](https://github.com/quarkusio/quarkus/files/9704782/debug.txt) ### How to Reproduce? 1. Create a Quarkus project with `quarkus create`. 2. Add the jgitver maven extension, by adding a file `.mvn/extensions.xml` to the project with the following content: ``` <extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd"> <extension> <groupId>fr.brouillard.oss</groupId> <artifactId>jgitver-maven-plugin</artifactId> <version>1.9.0</version> </extension> </extensions> ``` 3. Optional: Initialize the git repo and do a commit, just so that jgitver computes the version as `0.0.0-SNAPSHOT` instead of `0.0.0-NOT_A_GIT_REPOSITORY`: ``` git init git add . git commit -m "test" ``` 4. Run `./mvnw quarkus:dev`. ### Output of `uname -a` or `ver` Linux laptop-2220 5.15.0-48-generic #54~20.04.1-Ubuntu SMP Thu Sep 1 16:17:26 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "17.0.4" 2022-07-19 LTS OpenJDK Runtime Environment Corretto-17.0.4.8.1 (build 17.0.4+8-LTS) OpenJDK 64-Bit Server VM Corretto-17.0.4.8.1 (build 17.0.4+8-LTS, mixed mode, sharing) ### GraalVM version (if different from Java) N/A ### Quarkus version or git rev 2.13.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 (84538c9988a25aec085021c365c560670ad80f63) ### Additional information _No response_

f9dd29f6b14263f598728ad99a71d9a9b43187bd

a426f6a372fdfceaaee7d2e3c1342805aa6818df

https://github.com/quarkusio/quarkus/compare/f9dd29f6b14263f598728ad99a71d9a9b43187bd...a426f6a372fdfceaaee7d2e3c1342805aa6818df

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/QuarkusDevModeLauncher.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/QuarkusDevModeLauncher.java index 7108a534536..b219f7e4e67 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/QuarkusDevModeLauncher.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/QuarkusDevModeLauncher.java @@ -419,7 +419,6 @@ protected void prepare() throws Exception { devModeContext.setReleaseJavaVersion(releaseJavaVersion); devModeContext.setSourceJavaVersion(sourceJavaVersion); devModeContext.setTargetJvmVersion(targetJavaVersion); - devModeContext.getLocalArtifacts().addAll(localArtifacts); devModeContext.setApplicationRoot(main); devModeContext.getAdditionalModules().addAll(dependencies); 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 f2172937fda..387fcb3a42f 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java @@ -43,6 +43,7 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.model.BuildBase; import org.apache.maven.model.Dependency; +import org.apache.maven.model.Model; import org.apache.maven.model.Plugin; import org.apache.maven.model.PluginExecution; import org.apache.maven.model.Profile; @@ -90,6 +91,8 @@ import io.quarkus.bootstrap.model.ApplicationModel; import io.quarkus.bootstrap.model.PathsCollection; import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig; import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; import io.quarkus.bootstrap.util.BootstrapUtils; @@ -759,7 +762,6 @@ private String getSourceEncoding() { } private void addProject(MavenDevModeLauncher.Builder builder, ResolvedDependency module, boolean root) throws Exception { - if (!module.isJar()) { return; } @@ -1084,30 +1086,37 @@ private QuarkusDevModeLauncher newLauncher() throws Exception { if (appModel != null) { bootstrapProvider.close(); } else { - final MavenArtifactResolver.Builder resolverBuilder = MavenArtifactResolver.builder() + final BootstrapMavenContextConfig<?> mvnConfig = BootstrapMavenContext.config() .setRemoteRepositories(repos) .setRemoteRepositoryManager(remoteRepositoryManager) .setWorkspaceDiscovery(true) .setPreferPomsFromWorkspace(true) .setCurrentProject(project.getFile().toString()); - // if it already exists, it may be a reload triggered by a change in a POM - // in which case we should not be using the original Maven session - boolean reinitializeMavenSession = Files.exists(appModelLocation); - if (reinitializeMavenSession) { + // if a serialized model is found, it may be a reload triggered by a change in a POM + // in which case we should not be using the original Maven session initialized with the previous POM version + if (Files.exists(appModelLocation)) { Files.delete(appModelLocation); // we can't re-use the repo system because we want to use our interpolating model builder // a use-case where it fails with the original repo system is when dev mode is launched with -Dquarkus.platform.version=xxx // overriding the version of the quarkus-bom in the pom.xml } else { - // we can re-use the original Maven session - resolverBuilder.setRepositorySystemSession(repoSession).setRepositorySystem(repoSystem); + // we can re-use the original Maven session and the system + mvnConfig.setRepositorySystemSession(repoSession).setRepositorySystem(repoSystem); + // there could be Maven extensions manipulating the project versions and models + // the ones returned from the Maven API could be different from the original pom.xml files + final Map<Path, Model> projectModels = new HashMap<>(session.getAllProjects().size()); + for (MavenProject mp : session.getAllProjects()) { + projectModels.put(mp.getBasedir().toPath(), mp.getOriginalModel()); + } + mvnConfig.setProjectModelProvider(projectModels::get); } - appModel = new BootstrapAppModelResolver(resolverBuilder.build()) + final BootstrapMavenContext mvnCtx = new BootstrapMavenContext(mvnConfig); + appModel = new BootstrapAppModelResolver(new MavenArtifactResolver(mvnCtx)) .setDevMode(true) .setCollectReloadableDependencies(!noDeps) - .resolveModel(ArtifactCoords.jar(project.getGroupId(), project.getArtifactId(), project.getVersion())); + .resolveModel(mvnCtx.getCurrentProject().getAppArtifact()); } // serialize the app model to avoid re-resolving it in the dev process diff --git a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java index 78158655364..f340b2048d4 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java @@ -6,6 +6,8 @@ import java.io.Closeable; import java.io.File; import java.io.IOException; +import java.nio.file.Path; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -14,6 +16,7 @@ import java.util.concurrent.ExecutionException; import org.apache.maven.artifact.Artifact; +import org.apache.maven.model.Model; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.component.annotations.Component; @@ -132,16 +135,21 @@ private MavenArtifactResolver artifactResolver(QuarkusBootstrapMojo mojo, Launch throws MojoExecutionException { isWorkspaceDiscovery(mojo); try { - return MavenArtifactResolver.builder() - .setWorkspaceDiscovery( - mode == LaunchMode.DEVELOPMENT || mode == LaunchMode.TEST || isWorkspaceDiscovery(mojo)) + final MavenArtifactResolver.Builder builder = MavenArtifactResolver.builder() .setCurrentProject(mojo.mavenProject().getFile().toString()) .setPreferPomsFromWorkspace(mode == LaunchMode.DEVELOPMENT || mode == LaunchMode.TEST) .setRepositorySystem(repoSystem) .setRepositorySystemSession(mojo.repositorySystemSession()) .setRemoteRepositories(mojo.remoteRepositories()) - .setRemoteRepositoryManager(remoteRepoManager) - .build(); + .setRemoteRepositoryManager(remoteRepoManager); + if (mode == LaunchMode.DEVELOPMENT || mode == LaunchMode.TEST || isWorkspaceDiscovery(mojo)) { + final Map<Path, Model> projectModels = new HashMap<>(mojo.mavenSession().getAllProjects().size()); + for (MavenProject mp : mojo.mavenSession().getAllProjects()) { + projectModels.put(mp.getBasedir().toPath(), mp.getOriginalModel()); + } + builder.setWorkspaceDiscovery(true).setProjectModelProvider(projectModels::get); + } + return builder.build(); } catch (BootstrapMavenException e) { throw new MojoExecutionException("Failed to initialize Quarkus bootstrap Maven artifact resolver", e); } diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java index b456a5c4b3c..22114d0a2b0 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.function.Function; import java.util.function.Supplier; import org.apache.commons.lang3.StringUtils; @@ -169,7 +170,7 @@ public BootstrapMavenContext(BootstrapMavenContextConfig<?> config) this.currentPom = currentProject.getRawModel().getPomFile().toPath(); this.workspace = config.currentProject.getWorkspace(); } else if (config.workspaceDiscovery) { - currentProject = resolveCurrentProject(); + currentProject = resolveCurrentProject(config.modelProvider); this.workspace = currentProject == null ? null : currentProject.getWorkspace(); if (workspace != null) { if (config.repoSession == null && repoSession != null && repoSession.getWorkspaceReader() == null) { @@ -315,9 +316,9 @@ public String getLocalRepo() throws BootstrapMavenException { return localRepo == null ? localRepo = resolveLocalRepo(getEffectiveSettings()) : localRepo; } - private LocalProject resolveCurrentProject() throws BootstrapMavenException { + private LocalProject resolveCurrentProject(Function<Path, Model> modelProvider) throws BootstrapMavenException { try { - return LocalProject.loadWorkspace(this); + return LocalProject.loadWorkspace(this, modelProvider); } catch (Exception e) { throw new BootstrapMavenException("Failed to load current project at " + getCurrentProjectPomOrNull(), e); } diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java index efa4ffa77d9..8b645d5b0c2 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java @@ -5,7 +5,9 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; +import java.util.function.Function; +import org.apache.maven.model.Model; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.impl.RemoteRepositoryManager; @@ -33,6 +35,7 @@ protected boolean preferPomsFromWorkspace; protected Boolean effectiveModelBuilder; protected Boolean wsModuleParentHierarchy; + protected Function<Path, Model> modelProvider; /** * Local repository location @@ -264,6 +267,20 @@ public T setWorkspaceModuleParentHierarchy(boolean wsModuleParentHierarchy) { return (T) this; } + /** + * When workspace discovery is enabled, this method allows to set a POM + * provider that would return a {@link org.apache.maven.model.Model} for + * a given workspace module directory. + * + * @param modelProvider POM provider + * @return this instance + */ + @SuppressWarnings("unchecked") + public T setProjectModelProvider(Function<Path, Model> modelProvider) { + this.modelProvider = modelProvider; + return (T) this; + } + private BootstrapMavenOptions getInitializedCliOptions() { return cliOptions == null ? cliOptions = BootstrapMavenOptions.newInstance() : cliOptions; } diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java index 29e84613bfb..c2fa020ce57 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java @@ -47,6 +47,10 @@ */ public class LocalProject { + private static final String SRC_TEST_RESOURCES = "src/test/resources"; + + private static final String SRC_MAIN_RESOURCES = "src/main/resources"; + public static final String PROJECT_GROUPID = "${project.groupId}"; private static final String PROJECT_BASEDIR = "${project.basedir}"; @@ -78,7 +82,7 @@ public static LocalProject loadWorkspace(Path path) throws BootstrapMavenExcepti public static LocalProject loadWorkspace(Path path, boolean required) throws BootstrapMavenException { try { - return new WorkspaceLoader(null, path.normalize().toAbsolutePath()).load(); + return new WorkspaceLoader(null, path.normalize().toAbsolutePath(), null).load(); } catch (Exception e) { if (required) { throw e; @@ -96,12 +100,17 @@ public static LocalProject loadWorkspace(Path path, boolean required) throws Boo * @throws BootstrapMavenException in case of an error */ public static LocalProject loadWorkspace(BootstrapMavenContext ctx) throws BootstrapMavenException { + return loadWorkspace(ctx, null); + } + + public static LocalProject loadWorkspace(BootstrapMavenContext ctx, Function<Path, Model> modelProvider) + throws BootstrapMavenException { final Path currentProjectPom = ctx.getCurrentProjectPomOrNull(); if (currentProjectPom == null) { return null; } final Path rootProjectBaseDir = ctx.getRootProjectBaseDir(); - final WorkspaceLoader wsLoader = new WorkspaceLoader(ctx, currentProjectPom); + final WorkspaceLoader wsLoader = new WorkspaceLoader(ctx, currentProjectPom, modelProvider); if (rootProjectBaseDir != null && !rootProjectBaseDir.equals(currentProjectPom.getParent())) { wsLoader.setWorkspaceRootPom(rootProjectBaseDir.resolve(POM_XML)); @@ -257,11 +266,11 @@ public PathCollection getResourcesSourcesDirs() { final List<Resource> resources = rawModel.getBuild() == null ? List.of() : rawModel.getBuild().getResources(); if (resources.isEmpty()) { - return PathList.of(resolveRelativeToBaseDir(null, "src/main/resources")); + return PathList.of(resolveRelativeToBaseDir(null, SRC_MAIN_RESOURCES)); } return PathList.from(resources.stream() .map(Resource::getDirectory) - .map(resourcesDir -> resolveRelativeToBaseDir(resourcesDir, "src/main/resources")) + .map(resourcesDir -> resolveRelativeToBaseDir(resourcesDir, SRC_MAIN_RESOURCES)) .collect(Collectors.toCollection(LinkedHashSet::new))); } @@ -269,11 +278,11 @@ public PathCollection getTestResourcesSourcesDirs() { final List<Resource> resources = rawModel.getBuild() == null ? List.of() : rawModel.getBuild().getTestResources(); if (resources.isEmpty()) { - return PathList.of(resolveRelativeToBaseDir(null, "src/test/resources")); + return PathList.of(resolveRelativeToBaseDir(null, SRC_TEST_RESOURCES)); } return PathList.from(resources.stream() .map(Resource::getDirectory) - .map(resourcesDir -> resolveRelativeToBaseDir(resourcesDir, "src/test/resources")) + .map(resourcesDir -> resolveRelativeToBaseDir(resourcesDir, SRC_TEST_RESOURCES)) .collect(Collectors.toCollection(LinkedHashSet::new))); } @@ -302,7 +311,8 @@ public ResolvedDependency getAppArtifact() { } public ResolvedDependency getAppArtifact(String extension) { - return new ResolvedArtifactDependency(key.getGroupId(), key.getArtifactId(), "", extension, getVersion(), + return new ResolvedArtifactDependency(key.getGroupId(), key.getArtifactId(), ArtifactCoords.DEFAULT_CLASSIFIER, + extension, getVersion(), (PathCollection) null); } @@ -521,14 +531,14 @@ private Collection<SourceDir> collectMainResources(PathFilter filter) { final Path classesDir = getClassesDir(); if (resources.isEmpty()) { return List.of(new DefaultSourceDir( - new DirectoryPathTree(resolveRelativeToBaseDir(null, "src/main/resources")), + new DirectoryPathTree(resolveRelativeToBaseDir(null, SRC_MAIN_RESOURCES)), new DirectoryPathTree(classesDir, filter), Map.of())); } final List<SourceDir> sourceDirs = new ArrayList<>(resources.size()); for (Resource r : resources) { sourceDirs.add( new DefaultSourceDir( - new DirectoryPathTree(resolveRelativeToBaseDir(r.getDirectory(), "src/main/resources")), + new DirectoryPathTree(resolveRelativeToBaseDir(r.getDirectory(), SRC_MAIN_RESOURCES)), new DirectoryPathTree((r.getTargetPath() == null ? classesDir : classesDir.resolve(stripProjectBasedirPrefix(r.getTargetPath(), PROJECT_OUTPUT_DIR))), filter), @@ -543,14 +553,14 @@ private Collection<SourceDir> collectTestResources(PathFilter filter) { final Path testClassesDir = getTestClassesDir(); if (resources.isEmpty()) { return List.of(new DefaultSourceDir( - new DirectoryPathTree(resolveRelativeToBaseDir(null, "src/test/resources")), + new DirectoryPathTree(resolveRelativeToBaseDir(null, SRC_TEST_RESOURCES)), new DirectoryPathTree(testClassesDir, filter), Map.of())); } final List<SourceDir> sourceDirs = new ArrayList<>(resources.size()); for (Resource r : resources) { sourceDirs.add( new DefaultSourceDir( - new DirectoryPathTree(resolveRelativeToBaseDir(r.getDirectory(), "src/test/resources")), + new DirectoryPathTree(resolveRelativeToBaseDir(r.getDirectory(), SRC_TEST_RESOURCES)), new DirectoryPathTree((r.getTargetPath() == null ? testClassesDir : testClassesDir.resolve(stripProjectBasedirPrefix(r.getTargetPath(), PROJECT_OUTPUT_DIR))), filter), diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java index 6a0cd9b5627..a30aad09d2f 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java @@ -8,6 +8,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Function; import org.apache.maven.model.Model; import org.apache.maven.model.Parent; @@ -69,6 +70,7 @@ static Path locateCurrentProjectPom(Path path, boolean required) throws Bootstra private final Map<Path, LocalProject> projectCache = new HashMap<>(); private final Path currentProjectPom; private Path workspaceRootPom; + private Function<Path, Model> modelProvider; private ModelBuilder modelBuilder; private ModelResolver modelResolver; @@ -77,7 +79,9 @@ static Path locateCurrentProjectPom(Path path, boolean required) throws Bootstra private List<String> inactiveProfileIds; private List<Profile> profiles; - WorkspaceLoader(BootstrapMavenContext ctx, Path currentProjectPom) throws BootstrapMavenException { + WorkspaceLoader(BootstrapMavenContext ctx, Path currentProjectPom, Function<Path, Model> modelProvider) + throws BootstrapMavenException { + this.modelProvider = modelProvider; if (ctx != null && ctx.isEffectiveModelBuilder()) { modelBuilder = BootstrapModelBuilderFactory.getDefaultModelBuilder(); modelResolver = BootstrapModelResolver.newInstance(ctx, workspace); @@ -100,7 +104,7 @@ static Path locateCurrentProjectPom(Path path, boolean required) throws Bootstra private boolean isPom(Path p) { if (Files.exists(p) && !Files.isDirectory(p)) { try { - loadAndCacheRawModel(p); + rawModel(p); return true; } catch (BootstrapMavenException e) { // not a POM file @@ -115,7 +119,8 @@ private LocalProject project(Path pomFile) throws BootstrapMavenException { } private LocalProject loadAndCacheProject(Path pomFile) throws BootstrapMavenException { - final Model cachedRawModel = rawModelCache.get(pomFile.getParent()); + Model cachedRawModel = rawModelCache.getOrDefault(pomFile.getParent(), + modelProvider == null ? null : modelProvider.apply(pomFile.getParent())); final LocalProject project; if (modelBuilder != null) { ModelBuildingRequest req = new DefaultModelBuildingRequest(); @@ -148,7 +153,8 @@ private LocalProject loadAndCacheProject(Path pomFile) throws BootstrapMavenExce } private Model rawModel(Path pomFile) throws BootstrapMavenException { - final Model rawModel = rawModelCache.get(pomFile.getParent()); + final Model rawModel = rawModelCache.getOrDefault(pomFile.getParent(), + modelProvider == null ? null : modelProvider.apply(pomFile.getParent())); return rawModel == null ? loadAndCacheRawModel(pomFile) : rawModel; }

['independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java', 'independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java', 'independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java', 'independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java', 'core/deployment/src/main/java/io/quarkus/deployment/dev/QuarkusDevModeLauncher.java', 'devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java', 'devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java']

{'.java': 7}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29950/29919

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29919

https://github.com/quarkusio/quarkus/pull/29950

https://github.com/quarkusio/quarkus/pull/29950

resolves

WebSocket auth on VertxCurrentContext not working

### Describe the bug Hello. In my comman we use auth on WebSocket class by this hack ``` @RouteFilter(401) void addAuthHeader(RoutingContext rc) { try { if (rc.request().headers().get("Sec-WebSocket-Protocol") != null) { String token = "Bearer " + rc.request().headers().get("Sec-WebSocket-Protocol").split(", ")[1]; rc.request().headers().add("Authorization", token); } } finally { rc.next(); } } ``` We make ws request such this ``` const ws = new WebSocket(`ws://localhost:8080/ws`, ["access_token", "token"]); ``` And WebSoket class such as ``` @ServerEndpoint( value = "/api/v1/notification-socket/{userId}", decoders = SocketMessageDecoder.class, encoders = SocketMessageEncoder.class ) @Authenticated public class WS { // ...... } ``` Last version when it works is **2.12.3.Final** It works by changes in this commit - [Add proper identity propagation to WebSockets](https://github.com/quarkusio/quarkus/pull/20157/commits/d6a421a5a2e433e6ea4aa966fc66842bebae40fd) - File WebsocketCoreRecorder After update to version 2.13 and higher it work only then used property `quarkus.vertx.customize-arc-context=false` In version 2.13 added changes from this commit [CDI context propagation improvements for the reactive stack](https://github.com/quarkusio/quarkus/pull/27443). Now where is two CurrentContext implementations - ThreadLocalCurrentContext (ws auth works) and VertxCurrentContext (ws auth not work) This code from WebsocketCoreRecorder ``` boolean required = !requestContext.isActive(); if (required) { requestContext.activate(); Principal p = session.getUserPrincipal(); if (p instanceof WebSocketPrincipal) { CurrentIdentityAssociation current = this.getCurrentIdentityAssociation(); if (current != null) { current.setIdentity(((WebSocketPrincipal)p).getSecurityIdentity()); } } } ``` When uses ThreadLocalCurrentContext - requestContext.isActive() is false, and principal added in context When uses VertxCurrentContext - requestContext.isActive() is always true, and user don`t added on context Maybe fix this place, or create fix VertxCurrentContext? Thank you for your job) ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.13+ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

fc20fb29136f9eb0f85bc89165d062b09a45313b

38e36caa2e24d6eec96e1e87c811e724741e67d6

https://github.com/quarkusio/quarkus/compare/fc20fb29136f9eb0f85bc89165d062b09a45313b...38e36caa2e24d6eec96e1e87c811e724741e67d6

diff --git a/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/client/runtime/WebsocketCoreRecorder.java b/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/client/runtime/WebsocketCoreRecorder.java index ca321461c59..670656f1a0a 100644 --- a/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/client/runtime/WebsocketCoreRecorder.java +++ b/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/client/runtime/WebsocketCoreRecorder.java @@ -169,12 +169,12 @@ public T call(C context, UndertowSession session) throws Exception { boolean required = !requestContext.isActive(); if (required) { requestContext.activate(); - Principal p = session.getUserPrincipal(); - if (p instanceof WebSocketPrincipal) { - var current = getCurrentIdentityAssociation(); - if (current != null) { - current.setIdentity(((WebSocketPrincipal) p).getSecurityIdentity()); - } + } + Principal p = session.getUserPrincipal(); + if (p instanceof WebSocketPrincipal) { + var current = getCurrentIdentityAssociation(); + if (current != null) { + current.setIdentity(((WebSocketPrincipal) p).getSecurityIdentity()); } } try {

['extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/client/runtime/WebsocketCoreRecorder.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/29948/29946

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/29946

https://github.com/quarkusio/quarkus/pull/29948

https://github.com/quarkusio/quarkus/pull/29948

fixes

NPE in KeycloakDevServicesProcessor again

### Describe the bug It seems that https://github.com/quarkusio/quarkus/issues/29312 was not properly fixed in 2.15.0.Final. I am now getting a similar, but slightly different NPE: ``` 2022-12-19 08:28:55,072 ERROR [io.qua.dep.dev.IsolatedDevModeMain] (main) Failed to start quarkus: java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor#startKeycloakContainer threw an exception: java.lang.RuntimeException: java.lang.NullPointerException: Cannot invoke "java.util.List.isEmpty()" because "realmReps" is null at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.startKeycloakContainer(KeycloakDevServicesProcessor.java:247) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at io.quarkus.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:909) at io.quarkus.builder.BuildContext.run(BuildContext.java:281) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1478) at java.base/java.lang.Thread.run(Thread.java:833) at org.jboss.threads.JBossThread.run(JBossThread.java:501) Caused by: java.lang.NullPointerException: Cannot invoke "java.util.List.isEmpty()" because "realmReps" is null at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.prepareConfiguration(KeycloakDevServicesProcessor.java:269) at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.lambda$startContainer$5(KeycloakDevServicesProcessor.java:390) at java.base/java.util.Optional.map(Optional.java:260) at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.startContainer(KeycloakDevServicesProcessor.java:388) at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.startKeycloakContainer(KeycloakDevServicesProcessor.java:195) ... 11 more at io.quarkus.runner.bootstrap.AugmentActionImpl.runAugment(AugmentActionImpl.java:335) at io.quarkus.runner.bootstrap.AugmentActionImpl.createInitialRuntimeApplication(AugmentActionImpl.java:252) at io.quarkus.runner.bootstrap.AugmentActionImpl.createInitialRuntimeApplication(AugmentActionImpl.java:60) at io.quarkus.deployment.dev.IsolatedDevModeMain.firstStart(IsolatedDevModeMain.java:86) at io.quarkus.deployment.dev.IsolatedDevModeMain.accept(IsolatedDevModeMain.java:447) at io.quarkus.deployment.dev.IsolatedDevModeMain.accept(IsolatedDevModeMain.java:59) at io.quarkus.bootstrap.app.CuratedApplication.runInCl(CuratedApplication.java:149) at io.quarkus.bootstrap.app.CuratedApplication.runInAugmentClassLoader(CuratedApplication.java:104) at io.quarkus.deployment.dev.DevModeMain.start(DevModeMain.java:131) at io.quarkus.deployment.dev.DevModeMain.main(DevModeMain.java:62) Caused by: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor#startKeycloakContainer threw an exception: java.lang.RuntimeException: java.lang.NullPointerException: Cannot invoke "java.util.List.isEmpty()" because "realmReps" is null at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.startKeycloakContainer(KeycloakDevServicesProcessor.java:247) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at io.quarkus.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:909) at io.quarkus.builder.BuildContext.run(BuildContext.java:281) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1478) at java.base/java.lang.Thread.run(Thread.java:833) at org.jboss.threads.JBossThread.run(JBossThread.java:501) Caused by: java.lang.NullPointerException: Cannot invoke "java.util.List.isEmpty()" because "realmReps" is null at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.prepareConfiguration(KeycloakDevServicesProcessor.java:269) at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.lambda$startContainer$5(KeycloakDevServicesProcessor.java:390) at java.base/java.util.Optional.map(Optional.java:260) at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.startContainer(KeycloakDevServicesProcessor.java:388) at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.startKeycloakContainer(KeycloakDevServicesProcessor.java:195) ... 11 more at io.quarkus.builder.Execution.run(Execution.java:123) at io.quarkus.builder.BuildExecutionBuilder.execute(BuildExecutionBuilder.java:79) at io.quarkus.deployment.QuarkusAugmentor.run(QuarkusAugmentor.java:160) at io.quarkus.runner.bootstrap.AugmentActionImpl.runAugment(AugmentActionImpl.java:331) ... 9 more Caused by: java.lang.RuntimeException: java.lang.NullPointerException: Cannot invoke "java.util.List.isEmpty()" because "realmReps" is null at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.startKeycloakContainer(KeycloakDevServicesProcessor.java:247) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at io.quarkus.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:909) at io.quarkus.builder.BuildContext.run(BuildContext.java:281) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1478) at java.base/java.lang.Thread.run(Thread.java:833) at org.jboss.threads.JBossThread.run(JBossThread.java:501) Caused by: java.lang.NullPointerException: Cannot invoke "java.util.List.isEmpty()" because "realmReps" is null at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.prepareConfiguration(KeycloakDevServicesProcessor.java:269) at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.lambda$startContainer$5(KeycloakDevServicesProcessor.java:390) at java.base/java.util.Optional.map(Optional.java:260) at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.startContainer(KeycloakDevServicesProcessor.java:388) at io.quarkus.oidc.deployment.devservices.keycloak.KeycloakDevServicesProcessor.startKeycloakContainer(KeycloakDevServicesProcessor.java:195) ... 11 more ``` ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

fc20fb29136f9eb0f85bc89165d062b09a45313b

490aeb6291ec62e426eeef7bce108c745969769c

https://github.com/quarkusio/quarkus/compare/fc20fb29136f9eb0f85bc89165d062b09a45313b...490aeb6291ec62e426eeef7bce108c745969769c

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 c7c1674c8f2..a9e4afbb5bb 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 @@ -266,7 +266,7 @@ private Map<String, String> prepareConfiguration( String clientAuthServerBaseUrl = hostURL != null ? hostURL : internalURL; String clientAuthServerUrl = realmsURL(clientAuthServerBaseUrl, realmName); - boolean createDefaultRealm = realmReps.isEmpty() && capturedDevServicesConfiguration.createRealm; + boolean createDefaultRealm = (realmReps == null || realmReps.isEmpty()) && capturedDevServicesConfiguration.createRealm; String oidcClientId = getOidcClientId(createDefaultRealm); String oidcClientSecret = getOidcClientSecret(createDefaultRealm); @@ -283,9 +283,11 @@ private Map<String, String> prepareConfiguration( createDefaultRealm(client, adminToken, clientAuthServerBaseUrl, users, oidcClientId, oidcClientSecret, errors); realmNames.add(realmName); } else { - for (RealmRepresentation realmRep : realmReps) { - createRealm(client, adminToken, clientAuthServerBaseUrl, realmRep, errors); - realmNames.add(realmRep.getRealm()); + if (realmReps != null) { + for (RealmRepresentation realmRep : realmReps) { + createRealm(client, adminToken, clientAuthServerBaseUrl, realmRep, errors); + realmNames.add(realmRep.getRealm()); + } } } } finally {

['extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28533/25809

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/25809

https://github.com/quarkusio/quarkus/pull/28533

https://github.com/quarkusio/quarkus/pull/28533

fixes

Important log message shown during Dev Services for Keycloak initialization is lost

### Describe the bug Not sure it is a bug, as I recall there was an issue related to some of the dev services related to the excessive logging. But in any case, I recall it was possible to see various log messages logged by `KeycloakDevServicesProcessor` but now it is all being collapsed and all I see is ``` -- 2022-05-26 12:38:41,657 INFO [io.qua.oid.dep.dev.key.KeycloakDevServicesProcessor] (build-37) Dev Services for Keycloak started. ``` For example, `KeycloakDevServicesProcessor` logs if it can not find the configured realm file [here](https://github.com/quarkusio/quarkus/blob/main/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java#L457), but it is not visible and the user has just spent a lot of time trying to figure out what went wrong in his replica of the `keycloak-authorization` quickstart which proved to be caused by a missing realm file. I'm not sure throwing the exception in case of a missing realm would be a good dev experience given that one way to fix it is to go to Keycloak Admin UI from DevConsole and import a realm there if one sees a message that no realm is found. ### Expected behavior I think the messages logged by various Dev Services processors themselves (such as `KeycloakDevSericesProcessor`) should be visible, while the test containers logging can indeed be collapsed to minimize the noise. ### Actual behavior _No response_ ### How to Reproduce? Go to the `security-keycloak-authorization-quickstart` in quarkus-quickstarts and change path to the realm to point to a non-existent location. `mvn quarkus-dev` will fail with error caused by the fact DevServices for Keycloak did not import it but no log message informing the user that the realm is missing will be shown ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

553a86806cf3b4431bd710fc1a5f389ac2bd9a53

6b5462713757405bcb9171a62926f23c4fcfca42

https://github.com/quarkusio/quarkus/compare/553a86806cf3b4431bd710fc1a5f389ac2bd9a53...6b5462713757405bcb9171a62926f23c4fcfca42

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 34a1a4cb091..31f90109de2 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 @@ -181,17 +181,24 @@ public DevServicesResultBuildItem startKeycloakContainer( } capturedDevServicesConfiguration = currentDevServicesConfiguration; StartupLogCompressor compressor = new StartupLogCompressor( - (launchMode.isTest() ? "(test) " : "") + "KeyCloak Dev Services Starting:", + (launchMode.isTest() ? "(test) " : "") + "Keycloak Dev Services Starting:", consoleInstalledBuildItem, loggingSetupBuildItem); if (vertxInstance == null) { vertxInstance = Vertx.vertx(); } try { + List<String> errors = new ArrayList<>(); + RunningDevService newDevService = startContainer(dockerStatusBuildItem, keycloakBuildItemBuildProducer, !devServicesSharedNetworkBuildItem.isEmpty(), - devServicesConfig.timeout); + devServicesConfig.timeout, + errors); if (newDevService == null) { - compressor.close(); + if (errors.isEmpty()) { + compressor.close(); + } else { + compressor.closeAndDumpCaptured(); + } return null; } @@ -227,10 +234,10 @@ public void run() { } capturedRealmFileLastModifiedDate = getRealmFileLastModifiedDate(capturedDevServicesConfiguration.realmPath); - if (devService == null) { - compressor.closeAndDumpCaptured(); - } else { + if (devService != null && errors.isEmpty()) { compressor.close(); + } else { + compressor.closeAndDumpCaptured(); } } catch (Throwable t) { compressor.closeAndDumpCaptured(); @@ -241,14 +248,14 @@ public void run() { return devService.toBuildItem(); } - private String startURL(String host, Integer port, boolean isKeyCloakX) { - return "http://" + host + ":" + port + (isKeyCloakX ? "" : "/auth"); + private String startURL(String host, Integer port, boolean isKeycloakX) { + return "http://" + host + ":" + port + (isKeycloakX ? "" : "/auth"); } private Map<String, String> prepareConfiguration( BuildProducer<KeycloakDevServicesConfigBuildItem> keycloakBuildItemBuildProducer, String internalURL, String hostURL, RealmRepresentation realmRep, - boolean keycloakX) { + boolean keycloakX, List<String> errors) { final String realmName = realmRep != null ? realmRep.getRealm() : getDefaultRealmName(); final String authServerInternalUrl = realmsURL(internalURL, realmName); @@ -266,9 +273,10 @@ private Map<String, String> prepareConfiguration( try { String adminToken = getAdminToken(client, clientAuthServerBaseUrl); if (createDefaultRealm) { - createDefaultRealm(client, adminToken, clientAuthServerBaseUrl, users, oidcClientId, oidcClientSecret); + createDefaultRealm(client, adminToken, clientAuthServerBaseUrl, users, oidcClientId, oidcClientSecret, + errors); } else if (realmRep != null && keycloakX) { - createRealm(client, adminToken, clientAuthServerBaseUrl, realmRep); + createRealm(client, adminToken, clientAuthServerBaseUrl, realmRep, errors); } } finally { client.close(); @@ -300,7 +308,8 @@ private String getDefaultRealmName() { private RunningDevService startContainer(DockerStatusBuildItem dockerStatusBuildItem, BuildProducer<KeycloakDevServicesConfigBuildItem> keycloakBuildItemBuildProducer, - boolean useSharedNetwork, Optional<Duration> timeout) { + boolean useSharedNetwork, Optional<Duration> timeout, + List<String> errors) { if (!capturedDevServicesConfiguration.enabled) { // explicitly disabled LOG.debug("Not starting Dev Services for Keycloak as it has been disabled in the config"); @@ -342,7 +351,8 @@ private RunningDevService startContainer(DockerStatusBuildItem dockerStatusBuild capturedDevServicesConfiguration.shared, capturedDevServicesConfiguration.javaOpts, capturedDevServicesConfiguration.startCommand, - capturedDevServicesConfiguration.showLogs); + capturedDevServicesConfiguration.showLogs, + errors); timeout.ifPresent(oidcContainer::withStartupTimeout); oidcContainer.start(); @@ -356,7 +366,8 @@ private RunningDevService startContainer(DockerStatusBuildItem dockerStatusBuild Map<String, String> configs = prepareConfiguration(keycloakBuildItemBuildProducer, internalUrl, hostUrl, oidcContainer.realmRep, - oidcContainer.keycloakX); + oidcContainer.keycloakX, + errors); return new RunningDevService(KEYCLOAK_CONTAINER_NAME, oidcContainer.getContainerId(), oidcContainer::close, configs); }; @@ -366,7 +377,7 @@ private RunningDevService startContainer(DockerStatusBuildItem dockerStatusBuild // TODO: this probably needs to be addressed Map<String, String> configs = prepareConfiguration(keycloakBuildItemBuildProducer, getSharedContainerUrl(containerAddress), - getSharedContainerUrl(containerAddress), null, false); + getSharedContainerUrl(containerAddress), null, false, errors); return new RunningDevService(KEYCLOAK_CONTAINER_NAME, containerAddress.getId(), null, configs); }) .orElseGet(defaultKeycloakContainerSupplier); @@ -395,10 +406,12 @@ private static class QuarkusOidcContainer extends GenericContainer<QuarkusOidcCo private RealmRepresentation realmRep; private final Optional<String> startCommand; private final boolean showLogs; + private final List<String> errors; public QuarkusOidcContainer(DockerImageName dockerImageName, OptionalInt fixedExposedPort, boolean useSharedNetwork, Optional<String> realmPath, String containerLabelValue, - boolean sharedContainer, Optional<String> javaOpts, Optional<String> startCommand, boolean showLogs) { + boolean sharedContainer, Optional<String> javaOpts, Optional<String> startCommand, boolean showLogs, + List<String> errors) { super(dockerImageName); this.useSharedNetwork = useSharedNetwork; @@ -418,6 +431,7 @@ public QuarkusOidcContainer(DockerImageName dockerImageName, OptionalInt fixedEx this.fixedExposedPort = fixedExposedPort; this.startCommand = startCommand; this.showLogs = showLogs; + this.errors = errors; super.setWaitStrategy(Wait.forLogMessage(".*Keycloak.*started.*", 1)); } @@ -468,7 +482,7 @@ protected void configure() { if (realmPath.isPresent()) { URL realmPathUrl = null; if ((realmPathUrl = Thread.currentThread().getContextClassLoader().getResource(realmPath.get())) != null) { - realmRep = readRealmFile(realmPathUrl, realmPath.get()); + realmRep = readRealmFile(realmPathUrl, realmPath.get(), errors); if (!keycloakX) { withClasspathResourceMapping(realmPath.get(), KEYCLOAK_DOCKER_REALM_PATH, BindMode.READ_ONLY); } @@ -478,9 +492,11 @@ protected void configure() { if (!keycloakX) { withFileSystemBind(realmPath.get(), KEYCLOAK_DOCKER_REALM_PATH, BindMode.READ_ONLY); } - realmRep = readRealmFile(filePath.toUri(), realmPath.get()); + realmRep = readRealmFile(filePath.toUri(), realmPath.get(), errors); } else { - LOG.debugf("Realm %s resource is not available", realmPath.get()); + errors.add(String.format("Realm %s resource is not available", realmPath.get())); + + LOG.errorf("Realm %s resource is not available", realmPath.get()); } } @@ -507,21 +523,23 @@ private Integer findRandomPort() { } } - private RealmRepresentation readRealmFile(URI uri, String realmPath) { + private RealmRepresentation readRealmFile(URI uri, String realmPath, List<String> errors) { try { - return readRealmFile(uri.toURL(), realmPath); + return readRealmFile(uri.toURL(), realmPath, errors); } catch (MalformedURLException ex) { // Will not happen as this method is called only when it is confirmed the file exists throw new RuntimeException(ex); } } - private RealmRepresentation readRealmFile(URL url, String realmPath) { + private RealmRepresentation readRealmFile(URL url, String realmPath, List<String> errors) { try { try (InputStream is = url.openStream()) { return JsonSerialization.readValue(is, RealmRepresentation.class); } } catch (IOException ex) { + errors.add(String.format("Realm %s resource can not be opened: %s", realmPath, ex.getMessage())); + LOG.errorf("Realm %s resource can not be opened: %s", realmPath, ex.getMessage()); } return null; @@ -578,7 +596,8 @@ private FileTime getRealmFileLastModifiedDate(Optional<String> realm) { private void createDefaultRealm(WebClient client, String token, String keycloakUrl, Map<String, String> users, String oidcClientId, - String oidcClientSecret) { + String oidcClientSecret, + List<String> errors) { RealmRepresentation realm = createDefaultRealmRep(); realm.getClients().add(createClient(oidcClientId, oidcClientSecret)); @@ -586,7 +605,7 @@ private void createDefaultRealm(WebClient client, String token, String keycloakU realm.getUsers().add(createUser(entry.getKey(), entry.getValue(), getUserRoles(entry.getKey()))); } - createRealm(client, token, keycloakUrl, realm); + createRealm(client, token, keycloakUrl, realm, errors); } private String getAdminToken(WebClient client, String keycloakUrl) { @@ -602,7 +621,8 @@ private String getAdminToken(WebClient client, String keycloakUrl) { return null; } - private void createRealm(WebClient client, String token, String keycloakUrl, RealmRepresentation realm) { + private void createRealm(WebClient client, String token, String keycloakUrl, RealmRepresentation realm, + List<String> errors) { try { LOG.tracef("Creating the realm %s", realm.getRealm()); HttpResponse<Buffer> createRealmResponse = client.postAbs(keycloakUrl + "/admin/realms") @@ -612,6 +632,10 @@ private void createRealm(WebClient client, String token, String keycloakUrl, Rea .await().atMost(oidcConfig.devui.webClientTimeout); if (createRealmResponse.statusCode() > 299) { + errors.add(String.format("Realm %s can not be created %d - %s ", realm.getRealm(), + createRealmResponse.statusCode(), + createRealmResponse.statusMessage())); + LOG.errorf("Realm %s can not be created %d - %s ", realm.getRealm(), createRealmResponse.statusCode(), createRealmResponse.statusMessage()); } @@ -635,6 +659,8 @@ private void createRealm(WebClient client, String token, String keycloakUrl, Rea }); realmStatusCodeUni.await().atMost(Duration.ofSeconds(10)); } catch (Throwable t) { + errors.add(String.format("Realm %s can not be created: %s", realm.getRealm(), t.getMessage())); + LOG.errorf("Realm %s can not be created: %s", realm.getRealm(), t.getMessage()); } }

['extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28542/28541

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28541

https://github.com/quarkusio/quarkus/pull/28542

https://github.com/quarkusio/quarkus/pull/28542

fix

Regression in 2.13.2: NPE in `LocalProject` during `quarkus-maven-plugin:build` when activating `quarkus.bootstrap.workspace-discovery`

### Describe the bug Updating from 2.13.1 to 2.13.2 results in: ``` [ERROR] Failed to execute goal io.quarkus:quarkus-maven-plugin:2.13.2.Final:build (default) on project somecomp-server: Failed to build quarkus application: Failed to initialize Quarkus bootstrap Maven artifact resolver: Failed to load current project at /home/fmo/proj/someproj/somecomp/dev1/server/.flattened-pom.xml: Cannot invoke "java.io.File.toPath()" because the return value of "org.apache.maven.model.Model.getProjectDirectory()" is null -> [Help 1] ... Caused by: java.lang.NullPointerException: Cannot invoke "java.io.File.toPath()" because the return value of "org.apache.maven.model.Model.getProjectDirectory()" is null at io.quarkus.bootstrap.resolver.maven.workspace.LocalProject.<init> (LocalProject.java:172) at io.quarkus.bootstrap.resolver.maven.workspace.WorkspaceLoader.loadAndCacheProject (WorkspaceLoader.java:143) at io.quarkus.bootstrap.resolver.maven.workspace.WorkspaceLoader.project (WorkspaceLoader.java:118) at io.quarkus.bootstrap.resolver.maven.workspace.WorkspaceLoader.loadProject (WorkspaceLoader.java:178) at io.quarkus.bootstrap.resolver.maven.workspace.WorkspaceLoader.load (WorkspaceLoader.java:230) at io.quarkus.bootstrap.resolver.maven.workspace.LocalProject.loadWorkspace (LocalProject.java:118) at io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext.resolveCurrentProject (BootstrapMavenContext.java:321) at io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext.<init> (BootstrapMavenContext.java:173) at io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver.<init> (MavenArtifactResolver.java:91) at io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver$Builder.build (MavenArtifactResolver.java:75) at io.quarkus.maven.QuarkusBootstrapProvider$QuarkusMavenAppBootstrap.artifactResolver (QuarkusBootstrapProvider.java:152) at io.quarkus.maven.QuarkusBootstrapProvider$QuarkusMavenAppBootstrap.doBootstrap (QuarkusBootstrapProvider.java:206) at io.quarkus.maven.QuarkusBootstrapProvider$QuarkusMavenAppBootstrap.bootstrapApplication (QuarkusBootstrapProvider.java:284) at io.quarkus.maven.QuarkusBootstrapProvider.bootstrapApplication (QuarkusBootstrapProvider.java:86) at io.quarkus.maven.QuarkusBootstrapMojo.bootstrapApplication (QuarkusBootstrapMojo.java:272) at io.quarkus.maven.QuarkusBootstrapMojo.bootstrapApplication (QuarkusBootstrapMojo.java:268) at io.quarkus.maven.BuildMojo.doExecute (BuildMojo.java:130) at io.quarkus.maven.QuarkusBootstrapMojo.execute (QuarkusBootstrapMojo.java:154) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo (DefaultBuildPluginManager.java:137) at org.apache.maven.lifecycle.internal.MojoExecutor.doExecute2 (MojoExecutor.java:370) at org.apache.maven.lifecycle.internal.MojoExecutor.doExecute (MojoExecutor.java:351) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:215) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:171) at org.apache.maven.lifecycle.internal.MojoExecutor.execute (MojoExecutor.java:163) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (LifecycleModuleBuilder.java:117) at org.apache.maven.lifecycle.internal.builder.multithreaded.MultiThreadedBuilder$1.call (MultiThreadedBuilder.java:210) at org.apache.maven.lifecycle.internal.builder.multithreaded.MultiThreadedBuilder$1.call (MultiThreadedBuilder.java:195) at java.util.concurrent.FutureTask.run (FutureTask.java:264) at java.util.concurrent.Executors$RunnableAdapter.call (Executors.java:539) at java.util.concurrent.FutureTask.run (FutureTask.java:264) at java.util.concurrent.ThreadPoolExecutor.runWorker (ThreadPoolExecutor.java:1136) at java.util.concurrent.ThreadPoolExecutor$Worker.run (ThreadPoolExecutor.java:635) at java.lang.Thread.run (Thread.java:833) ``` ### Expected behavior No error ### Actual behavior Error during build ### How to Reproduce? n/a at this point ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` 17.0.4 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Maven 3.8.6 ### Additional information Build happens via profile: ```xml <profile> <id>image-build</id> <properties> <!-- switch on early Quarkus workspace discovery for smaller layers --> <quarkus.bootstrap.workspace-discovery>true</quarkus.bootstrap.workspace-discovery> <quarkus.container-image.name>somecomp</quarkus.container-image.name> </properties> <build> <plugins> <plugin> <groupId>io.quarkus</groupId> <artifactId>quarkus-maven-plugin</artifactId> <executions> <execution> <goals> <goal>build</goal> </goals> </execution> </executions> </plugin> </plugins> </build> </profile> ``` Jib plugin is used to build the image (but it doesn't get that far).

5ff6805119c6b63a21996b3b7b58e6f181869f49

99d577733c5994f1eecb1818cadcaa3b430d0f48

https://github.com/quarkusio/quarkus/compare/5ff6805119c6b63a21996b3b7b58e6f181869f49...99d577733c5994f1eecb1818cadcaa3b430d0f48

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 387fcb3a42f..0d300ecc92a 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java @@ -43,7 +43,6 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.model.BuildBase; import org.apache.maven.model.Dependency; -import org.apache.maven.model.Model; import org.apache.maven.model.Plugin; import org.apache.maven.model.PluginExecution; import org.apache.maven.model.Profile; @@ -121,8 +120,6 @@ @Mojo(name = "dev", defaultPhase = LifecyclePhase.PREPARE_PACKAGE, requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true) public class DevMojo extends AbstractMojo { - private static final String EXT_PROPERTIES_PATH = "META-INF/quarkus-extension.properties"; - private static final String KOTLIN_MAVEN_PLUGIN_GA = "org.jetbrains.kotlin:kotlin-maven-plugin"; /** @@ -1105,11 +1102,7 @@ private QuarkusDevModeLauncher newLauncher() throws Exception { mvnConfig.setRepositorySystemSession(repoSession).setRepositorySystem(repoSystem); // there could be Maven extensions manipulating the project versions and models // the ones returned from the Maven API could be different from the original pom.xml files - final Map<Path, Model> projectModels = new HashMap<>(session.getAllProjects().size()); - for (MavenProject mp : session.getAllProjects()) { - projectModels.put(mp.getBasedir().toPath(), mp.getOriginalModel()); - } - mvnConfig.setProjectModelProvider(projectModels::get); + mvnConfig.setProjectModelProvider(QuarkusBootstrapProvider.getProjectMap(session)::get); } final BootstrapMavenContext mvnCtx = new BootstrapMavenContext(mvnConfig); diff --git a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java index f340b2048d4..2c4e876d7e1 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java @@ -16,6 +16,7 @@ import java.util.concurrent.ExecutionException; import org.apache.maven.artifact.Artifact; +import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Model; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; @@ -63,6 +64,16 @@ static ArtifactKey getProjectId(MavenProject project) { return ArtifactKey.ga(project.getGroupId(), project.getArtifactId()); } + static Map<Path, Model> getProjectMap(MavenSession session) { + final List<MavenProject> allProjects = session.getAllProjects(); + final Map<Path, Model> projectModels = new HashMap<>(allProjects.size()); + for (MavenProject mp : allProjects) { + mp.getOriginalModel().setPomFile(mp.getFile()); + projectModels.put(mp.getBasedir().toPath(), mp.getOriginalModel()); + } + return projectModels; + } + public RepositorySystem repositorySystem() { return repoSystem; } @@ -143,11 +154,7 @@ private MavenArtifactResolver artifactResolver(QuarkusBootstrapMojo mojo, Launch .setRemoteRepositories(mojo.remoteRepositories()) .setRemoteRepositoryManager(remoteRepoManager); if (mode == LaunchMode.DEVELOPMENT || mode == LaunchMode.TEST || isWorkspaceDiscovery(mojo)) { - final Map<Path, Model> projectModels = new HashMap<>(mojo.mavenSession().getAllProjects().size()); - for (MavenProject mp : mojo.mavenSession().getAllProjects()) { - projectModels.put(mp.getBasedir().toPath(), mp.getOriginalModel()); - } - builder.setWorkspaceDiscovery(true).setProjectModelProvider(projectModels::get); + builder.setWorkspaceDiscovery(true).setProjectModelProvider(getProjectMap(mojo.mavenSession())::get); } return builder.build(); } catch (BootstrapMavenException e) {

['devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java', 'devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/28565/28460

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/28460

https://github.com/quarkusio/quarkus/pull/28565

https://github.com/quarkusio/quarkus/pull/28565

fix

@Consumes ignored for sub-resource

### Describe the bug I have a main resource and a nested sub-resource which I want to be able PATCH (both of them) with "application/merge-json+patch" request content. Works for the main resource but @Consumes seems ignored in sub-resource. Maybe a bug or maybe something I don't quite understand ... ### Expected behavior Using my minimal-reproducer project : `curl -i -X PATCH -H "Content-Type: application/merge-json+patch" localhost:8080/main/1/sub/1 -d '{"test": true}'` Should return an HTTP 200. `curl -i -X PATCH -H "Content-Type: application/application/json" localhost:8080 -d '{"test": true}'` Should return an HTTP 415. ### Actual behavior Using my minimal-reproducer project : `curl -i -X PATCH -H "Content-Type: application/merge-json+patch" localhost:8080/main/1/sub/1 -d '{"test": true}'` Returns an HTTP 415. `curl -i -X PATCH -H "Content-Type: application/application/json" localhost:8080/main/1/sub/1 -d '{"test": true}'` Returns an HTTP 200. ### How to Reproduce? [minimal-reproducer.zip](https://github.com/quarkusio/quarkus/files/9741898/minimal-reproducer.zip) 1. Run the project with `./mvnw compile quarkus:dev` 2. Make a request with : `curl -i -X PATCH -H "Content-Type: application/merge-json+patch" localhost:8080/main/1/sub/1 -d '{"test": true}'` and `curl -i -X PATCH -H "Content-Type: application/application/json" localhost:8080/main/1/sub/1 -d '{"test": true}'` ### Output of `uname -a` or `ver` Linux myuser 5.15.0-48-generic #54~20.04.1-Ubuntu SMP Thu Sep 1 16:17:26 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` OpenJDK Runtime Environment (build 17+35-2724) OpenJDK 64-Bit Server VM (build 17+35-2724, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.13.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 (84538c9988a25aec085021c365c560670ad80f63) Maven home: /home/myuser/.m2/wrapper/dists/apache-maven-3.8.6-bin/67568434/apache-maven-3.8.6 Java version: 17, vendor: Oracle Corporation, runtime: /usr/lib/jvm/jdk-17 Default locale: en_US, platform encoding: UTF-8 OS name: "linux", version: "5.15.0-48-generic", arch: "amd64", family: "unix" ### Additional information I think @Consumes is ignored because header "application/json" works even if I define @Consumes(MediaType.TEXT_PLAIN) on sub-resource PATCH method. PATCH method for Main Resource is working fine. I am using quarkus-resteasy-reactive and quarkus-resteasy-reactive-jsonb. Maybe this is a JAX-RS/Resteasy issue, I don't know.

542e072afa051f630f6eb711a598c1786943fcb8

bfbfea6c47e3580095978a410e8b165328c76659

https://github.com/quarkusio/quarkus/compare/542e072afa051f630f6eb711a598c1786943fcb8...bfbfea6c47e3580095978a410e8b165328c76659

diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestTestCase.java index 51ef18e647c..9dea4e08961 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestTestCase.java @@ -8,6 +8,7 @@ import java.util.function.Supplier; +import org.apache.http.HttpStatus; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -19,6 +20,7 @@ import io.quarkus.test.QuarkusUnitTest; import io.restassured.RestAssured; +import io.restassured.http.ContentType; import io.restassured.http.Headers; public class SimpleQuarkusRestTestCase { @@ -107,6 +109,12 @@ public void testSubResource() { .then().body(Matchers.equalTo("otherSub")); RestAssured.get("/simple/sub") .then().body(Matchers.equalTo("sub")); + + RestAssured.with() + .contentType(ContentType.JSON) + .body("{\\"test\\": true}") + .patch("/simple/sub/patch/text") + .then().statusCode(HttpStatus.SC_UNSUPPORTED_MEDIA_TYPE); } @Test diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SubResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SubResource.java index 00b37fdf42c..e1546a77d6f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SubResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SubResource.java @@ -1,7 +1,10 @@ package io.quarkus.resteasy.reactive.server.test.simple; +import javax.ws.rs.Consumes; import javax.ws.rs.GET; +import javax.ws.rs.PATCH; import javax.ws.rs.Path; +import javax.ws.rs.core.MediaType; public class SubResource { @@ -15,4 +18,11 @@ public String sub() { public String otherPath() { return "otherSub"; } + + @Path("patch/text") + @PATCH + @Consumes(MediaType.TEXT_PLAIN) + public String patchWithTextPlain(String patch) { + return "test-value: " + patch; + } } diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java index 67118258789..1ca909d8bd1 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java @@ -312,8 +312,8 @@ public RuntimeResource buildResourceMethod(ResourceClass clazz, // we only need to parse the signature and create generic type when the declared type differs from the type genericType = TypeSignatureParser.parse(bodyParameter.signature); } - handlers.add(new RequestDeserializeHandler(typeClass, genericType, - consumesMediaTypes.isEmpty() ? null : consumesMediaTypes.get(0), serialisers, bodyParameterIndex)); + handlers.add(new RequestDeserializeHandler(typeClass, genericType, consumesMediaTypes, serialisers, + bodyParameterIndex)); } // given that we may inject form params in the endpoint we need to make sure we read the body before diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java index 0203a0285b2..701946a95ca 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java @@ -3,6 +3,7 @@ import java.io.IOException; import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.util.Collections; import java.util.List; import javax.ws.rs.BadRequestException; @@ -17,6 +18,7 @@ import javax.ws.rs.ext.ReaderInterceptor; import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.ServerSerialisers; import org.jboss.resteasy.reactive.server.jaxrs.ReaderInterceptorContextImpl; @@ -29,30 +31,40 @@ public class RequestDeserializeHandler implements ServerRestHandler { private final Class<?> type; private final Type genericType; - private final MediaType mediaType; + private final List<MediaType> acceptableMediaTypes; private final ServerSerialisers serialisers; private final int parameterIndex; - public RequestDeserializeHandler(Class<?> type, Type genericType, MediaType mediaType, ServerSerialisers serialisers, + public RequestDeserializeHandler(Class<?> type, Type genericType, List<MediaType> acceptableMediaTypes, + ServerSerialisers serialisers, int parameterIndex) { this.type = type; this.genericType = genericType; - this.mediaType = mediaType; + this.acceptableMediaTypes = acceptableMediaTypes; this.serialisers = serialisers; this.parameterIndex = parameterIndex; } @Override public void handle(ResteasyReactiveRequestContext requestContext) throws Exception { - MediaType effectiveRequestType = mediaType; - String requestTypeString = requestContext.serverRequest().getRequestHeader(HttpHeaders.CONTENT_TYPE); - if (requestTypeString != null) { + MediaType effectiveRequestType = null; + Object requestType = requestContext.getHeader(HttpHeaders.CONTENT_TYPE, true); + if (requestType != null) { try { - effectiveRequestType = MediaType.valueOf(requestTypeString); + effectiveRequestType = MediaType.valueOf((String) requestType); } catch (Exception e) { throw new WebApplicationException(Response.status(Response.Status.BAD_REQUEST).build()); } - } else if (effectiveRequestType == null) { + + // We need to verify media type for sub-resources, this mimics what is done in {@code ClassRoutingHandler} + if (MediaTypeHelper.getFirstMatch( + acceptableMediaTypes, + Collections.singletonList(effectiveRequestType)) == null) { + throw new NotSupportedException("The content-type header value did not match the value in @Consumes"); + } + } else if (!acceptableMediaTypes.isEmpty()) { + effectiveRequestType = acceptableMediaTypes.get(0); + } else { effectiveRequestType = MediaType.APPLICATION_OCTET_STREAM_TYPE; } List<MessageBodyReader<?>> readers = serialisers.findReaders(null, type, effectiveRequestType, RuntimeType.SERVER);

['extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestTestCase.java', 'extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SubResource.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java']

{'.java': 4}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/26570/26504

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/26504

https://github.com/quarkusio/quarkus/pull/26570

https://github.com/quarkusio/quarkus/pull/26570

fix

Container build with JIB do not start in remote-dev mode

### Describe the bug This is follow-up on https://github.com/quarkusio/quarkus/issues/26113 and I'm trying this on `main` as a fix as been provided. But in my case, it doesn't work at all now, the container can't start because of this exception : ```posh Exception in thread "main" java.nio.file.NoSuchFileException: /home/jboss/lib/deployment/deployment-class-path.dat at java.base/sun.nio.fs.UnixException.translateToIOException(UnixException.java:92) at java.base/sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:111) at java.base/sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:116) at java.base/sun.nio.fs.UnixFileSystemProvider.newByteChannel(UnixFileSystemProvider.java:219) at java.base/java.nio.file.Files.newByteChannel(Files.java:371) at java.base/java.nio.file.Files.newByteChannel(Files.java:422) at java.base/java.nio.file.spi.FileSystemProvider.newInputStream(FileSystemProvider.java:420) at java.base/java.nio.file.Files.newInputStream(Files.java:156) at io.quarkus.bootstrap.runner.DevModeMediator.doStart(DevModeMediator.java:39) at io.quarkus.bootstrap.runner.DevModeMediator.doDevMode(DevModeMediator.java:29) at io.quarkus.bootstrap.runner.QuarkusEntryPoint.doRun(QuarkusEntryPoint.java:45) at io.quarkus.bootstrap.runner.QuarkusEntryPoint.main(QuarkusEntryPoint.java:31) ``` ### Expected behavior remote-dev should work with images built with the JIB extension ### Actual behavior stacktrace provided above ### How to Reproduce? Create new app using 999-SNAPSHOT (main) with `quarkus-container-image-jib` extension and using this properties : ``` quarkus.package.type=mutable-jar quarkus.live-reload.password=secret ``` build the image and push it to a registry, then try to deploy it on a cluster with setting env var `QUARKUS_LAUNCH_DEVMODE=true` ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev main ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) mvn ### Additional information _No response_

63b93bf5de76135d7ec6d9d661419d62f0078458

485938f8650d8d580d6a39b9deb24bdcdeb9af54

https://github.com/quarkusio/quarkus/compare/63b93bf5de76135d7ec6d9d661419d62f0078458...485938f8650d8d580d6a39b9deb24bdcdeb9af54

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 e54c923cafd..3e56a0aea0f 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 @@ -485,8 +485,7 @@ private JibContainerBuilder createContainerBuilderFromFastJar(String baseJvmImag Path deploymentPath = componentsPath.resolve(JarResultBuildStep.LIB) .resolve(JarResultBuildStep.DEPLOYMENT_LIB); addLayer(jibContainerBuilder, Collections.singletonList(deploymentPath), - workDirInContainer.resolve(JarResultBuildStep.LIB) - .resolve(JarResultBuildStep.DEPLOYMENT_LIB), + workDirInContainer.resolve(JarResultBuildStep.LIB), "fast-jar-deployment-libs", true, now); }

['extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/26511/26502

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/26502

https://github.com/quarkusio/quarkus/pull/26511

https://github.com/quarkusio/quarkus/pull/26511

fix

Dependency Graph Walk leads to StackOverflowError

### Describe the bug Our `ConsumerPactTest` throws `java.lang.StackOverflowError`. I tracked this issue down to the #26411. ### Expected behavior No stack issues. ### Actual behavior _No response_ ### How to Reproduce? Reproducer: Steps to reproduce the behavior: 1. `git clone https://github.com/quarkus-qe/quarkus-test-suite` 2. `cd quarkus-test-suite/test-tooling/pact` 3. `mvn clean verify` ### Output of `uname -a` or `ver` Linux fedora 5.18.5-200.fc36.x86_64 #1 SMP PREEMPT_DYNAMIC Thu Jun 16 14:51:11 UTC 2022 x86_64 x86_64 x86_64 GNU/Lin ### Output of `java -version` openjdk version "17.0.3" 2022-04-19 OpenJDK Runtime Environment GraalVM CE 22.1.0 (build 17.0.3+7-jvmci-22.1-b06) OpenJDK 64-Bit Server VM GraalVM CE 22.1.0 (build 17.0.3+7-jvmci-22.1-b06, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 999-SNAPSHOT; HEAD d94c5a1d0a55787a2349cbb103a1f42771d23c0a ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 (84538c9988a25aec085021c365c560670ad80f63) ### Additional information _No response_

3bba499cd898cf966756e44fa96d2b5e40778b88

46fcb638ad063384e946b84f01233c99c9fc75fa

https://github.com/quarkusio/quarkus/compare/3bba499cd898cf966756e44fa96d2b5e40778b88...46fcb638ad063384e946b84f01233c99c9fc75fa

diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/ApplicationDependencyTreeResolver.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/ApplicationDependencyTreeResolver.java index 3f830e35f70..6a5121dee0e 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/ApplicationDependencyTreeResolver.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/ApplicationDependencyTreeResolver.java @@ -286,13 +286,14 @@ private DependencyNode resolveRuntimeDeps(CollectRequest request) throws AppMode @Override public DependencyNode transformGraph(DependencyNode node, DependencyGraphTransformationContext context) throws RepositoryException { + final Set<ArtifactKey> visited = new HashSet<>(); for (DependencyNode c : node.getChildren()) { - walk(c); + walk(c, visited); } return resolver.getSession().getDependencyGraphTransformer().transformGraph(node, context); } - private void walk(DependencyNode node) { + private void walk(DependencyNode node, Set<ArtifactKey> visited) { if (node.getChildren().isEmpty()) { return; } @@ -300,8 +301,13 @@ private void walk(DependencyNode node) { .computeIfAbsent(DependencyUtils.getCoords(node.getArtifact()), k -> new HashSet<>(node.getChildren().size())); for (DependencyNode c : node.getChildren()) { - deps.add(getKey(c.getArtifact())); - walk(c); + final ArtifactKey key = getKey(c.getArtifact()); + if (!visited.add(key)) { + continue; + } + deps.add(key); + walk(c, visited); + visited.remove(key); } } });

['independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/ApplicationDependencyTreeResolver.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/31472/31469

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/31469

https://github.com/quarkusio/quarkus/pull/31472

https://github.com/quarkusio/quarkus/pull/31472

fixes

Warnings about lack of "Hibernate Validator", despite no validation annotations being used

### Describe the bug I have an application, which uses `quartz`,`agroal` and `hibernate-panache` and saves data into DB on regular intervals. After update to the latest 999-SNAPSHOT(1d45952917c72a12eed6b9351f6ecdca813637a8) it now shows multiple warnings about `jakarta.validation.NoProviderFoundException` being thrown. The application doesn't use any code from `javax.validation` or `jakarta.validation` packages. Adding `quarkus-hibernate-validator` solves this problem. Nothing of sorts is mentioned in the migration guide[1]. [1] https://docs.jboss.org/hibernate/orm/6.0/migration-guide/migration-guide.html ### Expected behavior The application should work without warnings, and should not require `quarkus-hibernate-validator` ### Actual behavior ``` (JPA Startup Thread) Error calling `jakarta.validation.Validation#buildDefaultValidatorFactory`: jakarta.validation.NoProviderFoundException: Unable to create a Configuration, because no Jakarta Bean Validation provider could be found. Add a provider like Hibernate Validator (RI) to your classpath. at jakarta.validation.Validation$GenericBootstrapImpl.configure(Validation.java:291) at jakarta.validation.Validation.buildDefaultValidatorFactory(Validation.java:103) at org.hibernate.boot.beanvalidation.TypeSafeActivator.getValidatorFactory(TypeSafeActivator.java:483) at org.hibernate.boot.beanvalidation.TypeSafeActivator.activate(TypeSafeActivator.java:83) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at org.hibernate.boot.beanvalidation.BeanValidationIntegrator.integrate(BeanValidationIntegrator.java:140) at org.hibernate.internal.SessionFactoryImpl.integrate(SessionFactoryImpl.java:451) at org.hibernate.internal.SessionFactoryImpl.<init>(SessionFactoryImpl.java:247) at org.hibernate.internal.SessionFactoryImpl.<init>(SessionFactoryImpl.java:200) at io.quarkus.hibernate.orm.runtime.boot.FastBootEntityManagerFactoryBuilder.build(FastBootEntityManagerFactoryBuilder.java:78) at io.quarkus.hibernate.orm.runtime.FastBootHibernatePersistenceProvider.createEntityManagerFactory(FastBootHibernatePersistenceProvider.java:73) at jakarta.persistence.Persistence.createEntityManagerFactory(Persistence.java:80) at jakarta.persistence.Persistence.createEntityManagerFactory(Persistence.java:55) at io.quarkus.hibernate.orm.runtime.JPAConfig$LazyPersistenceUnit.get(JPAConfig.java:167) at io.quarkus.hibernate.orm.runtime.JPAConfig$1.run(JPAConfig.java:68) at java.base/java.lang.Thread.run(Thread.java:833) ``` ### How to Reproduce? 1. ` git clone git@github.com:fedinskiy/beefy-scenarios.git -b reproducer/hibernate-6` 2. `beefy-scenarios/017-quartz-cluster` 3. `mvn clean verify #exceptions in logs` 4. add ``` <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-hibernate-validator</artifactId> </dependency>``` to pom.xml 5. Run `mvn clean verify # no exceptions in app logs ` 6. If command in step 3 uses ` -Dquarkus.platform.version=3.0.0.Alpha4`, then the app works even without `hibernate-validator` The app doesn't use any validation: `find src/ | xargs grep 'validation'` ### Output of `uname -a` or `ver` 6.0.18-300.fc37.x86_64 ### Output of `java -version` 17.0.5, vendor: GraalVM Community ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 1d45952917c72a12eed6b9351f6ecdca813637a8 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 (84538c9988a25aec085021c365c560670ad80f63) ### Additional information Probably related to https://github.com/quarkusio/quarkus/pull/31235

cf9223e422079664a79e570bbb1e5d2e7b86ba83

bc142cafa61977994c732fed4f9068d3cb8c0758

https://github.com/quarkusio/quarkus/compare/cf9223e422079664a79e570bbb1e5d2e7b86ba83...bc142cafa61977994c732fed4f9068d3cb8c0758

diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java index b5549222fa7..9014034a299 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java @@ -27,5 +27,12 @@ void setupLogFilters(BuildProducer<LogCleanupFilterBuildItem> filters) { filters.produce(new LogCleanupFilterBuildItem("org.hibernate.jpa.internal.util.LogHelper", "HHH000204")); filters.produce(new LogCleanupFilterBuildItem("SQL dialect", "HHH000400")); filters.produce(new LogCleanupFilterBuildItem("org.hibernate.orm.beans", "HHH10005002", "HHH10005004")); + // Disable info logging for Bean Validation implementation not being present: + // it is perfectly valid when set to auto. The error is logged in the caller if it has to be logged. + filters.produce(new LogCleanupFilterBuildItem("org.hibernate.boot.beanvalidation.TypeSafeActivator", + "Error calling ")); + // Silence incubating settings warnings as we will use some for compatibility + filters.produce(new LogCleanupFilterBuildItem("org.hibernate.orm.incubating", + "HHH90006001")); } }

['extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java']

{'.java': 1}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/31436/31406

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/31406

https://github.com/quarkusio/quarkus/pull/31436

https://github.com/quarkusio/quarkus/pull/31436

fix

@ServerExceptionMapper doesn't support multiple exception types

### Describe the bug ``` @ServerExceptionMapper(value = {MyExceptionOne.class, MyExceptionTwo.class}) public Uni<Response> mapException(RuntimeException e) { return Uni.createFrom().item(() -> Response.status(Response.Status.CONFLICT) .entity(Map.of(MESSAGE, message)) .build();); } ``` ### Expected behavior multiple exception classes are supported ### Actual behavior ``` java.lang.RuntimeException: java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveScanningProcessor#handleCustomAnnotatedMethods threw an exception: java.lang.RuntimeException: Parameter 'e' of method 'mapException of class '...' is not allowed ``` ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` Darwin RDU-W4HVVTY7VT 21.4.0 Darwin Kernel Version 21.4.0 ### Output of `java -version` openjdk version "17.0.5" 2022-10-18 OpenJDK Runtime Environment GraalVM CE 22.3.0 (build 17.0.5+8-jvmci-22.3-b08) OpenJDK 64-Bit Server VM GraalVM CE 22.3.0 (build 17.0.5+8-jvmci-22.3-b08, mixed mode, sharing) ### GraalVM version (if different from Java) openjdk version "17.0.5" 2022-10-18 OpenJDK Runtime Environment GraalVM CE 22.3.0 (build 17.0.5+8-jvmci-22.3-b08) OpenJDK 64-Bit Server VM GraalVM CE 22.3.0 (build 17.0.5+8-jvmci-22.3-b08, mixed mode, sharing) ### Quarkus version or git rev 2.16.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) maven ### Additional information I see that this issue was fixed in https://github.com/quarkusio/quarkus/issues/20202, but it appeared again

4bee348b17430345c927e9c3e8eeec5ed08b5f4e

efa3e58fee290f226978a67e9e9ba8c3ab5eb670

https://github.com/quarkusio/quarkus/compare/4bee348b17430345c927e9c3e8eeec5ed08b5f4e...efa3e58fee290f226978a67e9e9ba8c3ab5eb670

diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java index ee5f1e771f5..d86e45824db 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java @@ -9,7 +9,7 @@ public class UniExceptionMapper { @ServerExceptionMapper({ UniException.class, OtherUniException.class }) - Uni<Response> handleUni(Throwable t) { + Uni<Response> handleUni(UniException t) { return Uni.createFrom().deferred(() -> Uni.createFrom().item(Response.status(413).build())); } diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java index 878d38bfada..2782c62bcbe 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java @@ -18,8 +18,8 @@ import static org.jboss.resteasy.reactive.server.processor.util.ResteasyReactiveServerDotNames.SIMPLIFIED_RESOURCE_INFO; import java.lang.reflect.Modifier; -import java.util.Arrays; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -123,7 +123,7 @@ public static Map<String, String> generatePerClassMapper(MethodInfo targetMethod Map<String, String> result = new HashMap<>(); boolean handlesMultipleExceptions = handledExceptionTypes.length > 1; - boolean handledContainsThrowable = Arrays.stream(handledExceptionTypes).anyMatch(t -> t.name().equals(THROWABLE)); + Set<String> commonHierarchyOfExceptions = getCommonHierarchyOfExceptions(handledExceptionTypes); for (Type handledExceptionType : handledExceptionTypes) { String generatedClassName = getGeneratedClassName(targetMethod, handledExceptionType); @@ -155,7 +155,7 @@ public static Map<String, String> generatePerClassMapper(MethodInfo targetMethod // RESTEasy Reactive toResponse(...) method generateRRResponse(targetMethod, targetClass, handledExceptionType, cc, rrToResponseDescriptor, - returnType, handlesMultipleExceptions, handledContainsThrowable, + returnType, handlesMultipleExceptions, commonHierarchyOfExceptions, (method, contextHandle) -> { ResultHandle endpointInstanceHandle = method.invokeVirtualMethod( ofMethod(ResteasyReactiveRequestContext.class, "getEndpointInstance", Object.class), @@ -173,7 +173,7 @@ public static Map<String, String> generatePerClassMapper(MethodInfo targetMethod // RESTEasy Reactive asyncResponse(...) method generateRRUniResponse(targetMethod, targetClass, handledExceptionType, cc, rrAsyncResponseDescriptor, - returnType, handlesMultipleExceptions, handledContainsThrowable, + returnType, handlesMultipleExceptions, commonHierarchyOfExceptions, (method, contextHandle) -> { ResultHandle endpointInstanceHandle = method.invokeVirtualMethod( ofMethod(ResteasyReactiveRequestContext.class, "getEndpointInstance", Object.class), @@ -251,7 +251,7 @@ public static Map<String, String> generateGlobalMapper(MethodInfo targetMethod, Map<String, String> result = new HashMap<>(); boolean handlesMultipleExceptions = handledExceptionTypes.length > 1; - boolean handledContainsThrowable = Arrays.stream(handledExceptionTypes).anyMatch(t -> t.name().equals(THROWABLE)); + Set<String> commonHierarchyOfExceptions = getCommonHierarchyOfExceptions(handledExceptionTypes); for (Type handledExceptionType : handledExceptionTypes) { String generatedClassName = getGeneratedClassName(targetMethod, handledExceptionType); @@ -311,7 +311,7 @@ public static Map<String, String> generateGlobalMapper(MethodInfo targetMethod, // RESTEasy Reactive toResponse(...) method generateRRResponse(targetMethod, targetClass, handledExceptionType, cc, rrToResponseDescriptor, - returnType, handlesMultipleExceptions, handledContainsThrowable, + returnType, handlesMultipleExceptions, commonHierarchyOfExceptions, (method, contextHandle) -> method.readInstanceField(delegateField, method.getThis()), unwrappableTypes); } else if (returnType == ReturnType.UNI_RESPONSE || returnType == ReturnType.UNI_REST_RESPONSE) { @@ -325,7 +325,7 @@ public static Map<String, String> generateGlobalMapper(MethodInfo targetMethod, // RESTEasy Reactive asyncResponse(...) method generateRRUniResponse(targetMethod, targetClass, handledExceptionType, cc, rrAsyncResponseDescriptor, - returnType, handlesMultipleExceptions, handledContainsThrowable, + returnType, handlesMultipleExceptions, commonHierarchyOfExceptions, (method, contextHandle) -> method.readInstanceField(delegateField, method.getThis()), unwrappableTypes); } else { @@ -352,20 +352,15 @@ private static Type[] getHandledExceptionTypes(MethodInfo targetMethod) { List<Type> methodParameters = targetMethod.parameterTypes(); for (Type methodParameter : methodParameters) { if (methodParameter.kind() == Type.Kind.CLASS) { - try { - Class<?> methodParameterClass = Class.forName(methodParameter.name().toString(), false, - Thread.currentThread().getContextClassLoader()); - if (Throwable.class.isAssignableFrom(methodParameterClass)) { - if (deducedHandledExceptionType != null) { - throw new IllegalArgumentException( - "Multiple method parameters found that extend 'Throwable'. When using '@ServerExceptionMapper', only one parameter can be of type 'Throwable'. Offending method is '" - + targetMethod.name() + "' of class '" - + targetMethod.declaringClass().name().toString() + "'"); - } - deducedHandledExceptionType = methodParameter; + Class<?> methodParameterClass = getClassByName(methodParameter.name().toString()); + if (methodParameterClass != null && Throwable.class.isAssignableFrom(methodParameterClass)) { + if (deducedHandledExceptionType != null) { + throw new IllegalArgumentException( + "Multiple method parameters found that extend 'Throwable'. When using '@ServerExceptionMapper', only one parameter can be of type 'Throwable'. Offending method is '" + + targetMethod.name() + "' of class '" + + targetMethod.declaringClass().name().toString() + "'"); } - } catch (ClassNotFoundException ignored) { - + deducedHandledExceptionType = methodParameter; } } } @@ -377,6 +372,36 @@ private static Type[] getHandledExceptionTypes(MethodInfo targetMethod) { return new Type[] { deducedHandledExceptionType }; } + private static Set<String> getCommonHierarchyOfExceptions(Type[] handledExceptions) { + Set<String> commonHierarchy = new HashSet<>(); + boolean first = true; + for (Type handledException : handledExceptions) { + Class<?> handledExceptionClass = getClassByName(handledException.name().toString()); + while (handledExceptionClass != null && !handledExceptionClass.equals(Throwable.class)) { + String handledExceptionClassName = handledExceptionClass.getName(); + if (first) { + commonHierarchy.add(handledExceptionClassName); + } else if (!commonHierarchy.contains(handledExceptionClassName)) { + commonHierarchy.remove(handledExceptionClassName); + } + + handledExceptionClass = handledExceptionClass.getSuperclass(); + } + + first = false; + } + + return commonHierarchy; + } + + private static Class<?> getClassByName(String className) { + try { + return Class.forName(className, false, Thread.currentThread().getContextClassLoader()); + } catch (ClassNotFoundException ignored) { + return null; + } + } + private static MethodDescriptor toResponseDescriptor(Type handledExceptionType, String generatedClassName) { return ofMethod(generatedClassName, "toResponse", Response.class.getName(), @@ -432,7 +457,7 @@ private static void generateRRResponseBridge(Type handledExceptionType, ClassCre private static void generateRRResponse(MethodInfo targetMethod, ClassInfo targetClass, Type handledExceptionType, ClassCreator cc, MethodDescriptor rrToResponseDescriptor, - ReturnType returnType, boolean handlesMultipleExceptions, boolean handledContainsThrowable, + ReturnType returnType, boolean handlesMultipleExceptions, Set<String> commonHierarchyOfExceptions, BiFunction<MethodCreator, ResultHandle, ResultHandle> targetInstanceHandleCreator, Set<DotName> unwrappableTypes) { MethodCreator mc = cc.getMethodCreator(rrToResponseDescriptor); ResultHandle exceptionHandle = mc.getMethodParam(0); @@ -452,7 +477,7 @@ private static void generateRRResponse(MethodInfo targetMethod, ClassInfo target } else { TargetMethodParamsInfo targetMethodParamsInfo = getTargetMethodParamsInfo(targetMethod, targetClass, handledExceptionType, mc, exceptionHandle, contextHandle, handlesMultipleExceptions, - handledContainsThrowable, unwrappableTypes); + commonHierarchyOfExceptions, unwrappableTypes); ResultHandle resultHandle = mc.invokeVirtualMethod( ofMethod(targetClass.name().toString(), targetMethod.name(), targetMethod.returnType().name().toString(), targetMethodParamsInfo.getTypes()), @@ -479,7 +504,7 @@ private static void generateRRUniResponseBridge(Type handledExceptionType, Class private static void generateRRUniResponse(MethodInfo targetMethod, ClassInfo targetClass, Type handledExceptionType, ClassCreator cc, MethodDescriptor rrAsyncResponseDescriptor, - ReturnType returnType, boolean handlesMultipleExceptions, boolean handledContainsThrowable, + ReturnType returnType, boolean handlesMultipleExceptions, Set<String> commonHierarchyOfExceptions, BiFunction<MethodCreator, ResultHandle, ResultHandle> targetInstanceHandleCreator, Set<DotName> unwrappableTypes) { MethodCreator mc = cc.getMethodCreator(rrAsyncResponseDescriptor); ResultHandle exceptionHandle = mc.getMethodParam(0); @@ -498,7 +523,7 @@ private static void generateRRUniResponse(MethodInfo targetMethod, ClassInfo tar } else { TargetMethodParamsInfo targetMethodParamsInfo = getTargetMethodParamsInfo(targetMethod, targetClass, handledExceptionType, mc, exceptionHandle, contextHandle, handlesMultipleExceptions, - handledContainsThrowable, unwrappableTypes); + commonHierarchyOfExceptions, unwrappableTypes); uniHandle = mc.invokeVirtualMethod( ofMethod(targetClass.name().toString(), targetMethod.name(), Uni.class.getName(), targetMethodParamsInfo.getTypes()), @@ -512,7 +537,7 @@ private static void generateRRUniResponse(MethodInfo targetMethod, ClassInfo tar private static TargetMethodParamsInfo getTargetMethodParamsInfo(MethodInfo targetMethod, ClassInfo targetClass, Type handledExceptionType, MethodCreator mc, ResultHandle exceptionHandle, ResultHandle contextHandle, - boolean handlesMultipleExceptions, boolean handledContainsThrowable, Set<DotName> unwrappableTypes) { + boolean handlesMultipleExceptions, Set<String> commonHierarchyOfExceptions, Set<DotName> unwrappableTypes) { List<Type> parameters = targetMethod.parameterTypes(); ResultHandle[] targetMethodParamHandles = new ResultHandle[parameters.size()]; String[] parameterTypes = new String[parameters.size()]; @@ -522,39 +547,19 @@ private static TargetMethodParamsInfo getTargetMethodParamsInfo(MethodInfo targe DotName paramDotName = parameter.name(); parameterTypes[i] = paramDotName.toString(); String parameterName = targetMethod.parameterName(i); - if (paramDotName.equals(handledExceptionType.name())) { - if (handlesMultipleExceptions) { + if (paramDotName.equals(THROWABLE)) { + targetMethodParamHandles[i] = exceptionHandle; + } else if (paramDotName.equals(handledExceptionType.name())) { + if (handlesMultipleExceptions && !commonHierarchyOfExceptions.contains(paramDotName.toString())) { throw new RuntimeException("Parameter '" + parameterName + "' of method '" + targetMethod.name() + " of class '" + targetClass.name() + "' cannot be of type '" + handledExceptionType.name() + "' because the method handles multiple exceptions. You can use '" - + (handledContainsThrowable ? Throwable.class.getName() : Exception.class.getName()) - + "' instead."); + + Throwable.class.getName() + "' instead."); } else { targetMethodParamHandles[i] = exceptionHandle; } - } else if (paramDotName.equals(THROWABLE)) { + } else if (commonHierarchyOfExceptions.contains(paramDotName.toString())) { targetMethodParamHandles[i] = exceptionHandle; - } else if (paramDotName.equals(EXCEPTION)) { - if (handlesMultipleExceptions) { - if (handledContainsThrowable) { - throw new RuntimeException("Parameter '" + parameterName + "' of method '" + targetMethod.name() - + " of class '" + targetClass.name() - + "' cannot be of type '" + handledExceptionType.name() - + "' because the method handles multiple exceptions. You can use '" + Exception.class.getName() - + "' instead."); - } else { - targetMethodParamHandles[i] = exceptionHandle; - } - } else { - if (handledContainsThrowable) { - throw new RuntimeException("Parameter '" + parameterName + "' of method '" + targetMethod.name() - + " of class '" + targetClass.name() - + "' cannot be of type '" + handledExceptionType.name() + "'. You can use '" - + Throwable.class.getName() + "' instead."); - } else { - targetMethodParamHandles[i] = exceptionHandle; - } - } } else if (paramDotName.equals(handledExceptionType.name())) { targetMethodParamHandles[i] = exceptionHandle; } else if (CONTAINER_REQUEST_CONTEXT.equals(paramDotName)

['independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java', 'extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java']

{'.java': 2}

Java

{'Java': 45174846, 'HTML': 1260641, 'Kotlin': 726044, 'JavaScript': 519044, 'Shell': 51146, 'Groovy': 25140, 'ANTLR': 23342, 'Batchfile': 13971, 'Mustache': 13199, 'Scala': 9778, 'FreeMarker': 8106, 'CSS': 5346, 'Dockerfile': 660, 'PLpgSQL': 109}

Apache License 2.0

quarkusio/quarkus/31422/26152

quarkusio

quarkus

https://github.com/quarkusio/quarkus/issues/26152

https://github.com/quarkusio/quarkus/pull/31422

https://github.com/quarkusio/quarkus/pull/31422

fix

Resteasy Reactive: ContextResolver<ObjectMapper> not used

### Describe the bug When creating a RestClient with a `ContextResolver<ObjectMapper>` registered, this ContextResolver is never used and thus the wrong ObjectMapper (via CDI) is used. Other implementation approaches would be fine as well, but nothing seems to get this behaviour working. Multiple different ObjectMappers in the application do not seem to be supported. ### Expected behavior The ObjectMapper returned by a class that implements `ContextResolver<ObjectMapper>` used via `RestClientBuilder#register(Object)` is used in the given RestClient and only there. Multiple RestClients can use multiple different ObjectMappers. ### Actual behavior The ObjectMapper of the registered `ContextResolver` is not used at all. Instead an application scoped ObjectMapper bean is used in all RestClients. ### How to Reproduce? Run the following test class. The test should pass if matching the expected behaviour. ```java @QuarkusTest class MyClientTest { MyClient clientAllowsUnknown; MyClient clientDisallowsUnknown; WireMockServer wireMockServer = getWireMockServer(); @BeforeEach void setUp() throws MalformedURLException { wireMockServer.resetAll(); clientAllowsUnknown = RestClientBuilder.newBuilder() .baseUrl(new URL(wireMockServer.baseUrl())) .register(ClientObjectMapperUnknown.class) .build(MyClient.class); clientDisallowsUnknown = RestClientBuilder.newBuilder() .baseUrl(new URL(wireMockServer.baseUrl())) .register(ClientObjectMapperNoUnknown.class) .build(MyClient.class); } @Test void something_withAdditionalIgnoredProperties() { var json = "{ \\"value\\": \\"someValue\\", \\"secondValue\\": \\"toBeIgnored\\" }"; wireMockServer.stubFor( WireMock.get(WireMock.urlMatching("/something")) .willReturn(okJson(json))); var result = clientAllowsUnknown.something().await().indefinitely(); // FAIL_ON_UNKNOWN_PROPERTIES disabled assertThatCode(() -> new ClientObjectMapperUnknown().getContext(ObjectMapper.class).readValue(json, Something.class)) .doesNotThrowAnyException(); assertThat(result).isEqualTo(Something.builder().withValue("someValue").build()); // FAIL_ON_UNKNOWN_PROPERTIES enabled assertThatThrownBy(() -> new ClientObjectMapperNoUnknown().getContext(ObjectMapper.class).readValue(json, Something.class)) .isInstanceOf(JsonProcessingException.class); assertThatThrownBy(() -> clientDisallowsUnknown.something().await().indefinitely()) .isInstanceOf(JsonProcessingException.class); } @Path("/something") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public interface MyClient { @GET Uni<Something> something(); } @Value @Builder(toBuilder = true, setterPrefix = "with") @Jacksonized public static class Something { String value; } public static class ClientObjectMapperUnknown implements ContextResolver<ObjectMapper> { @Override public ObjectMapper getContext(Class<?> type) { return new ObjectMapper() .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); } } public static class ClientObjectMapperNoUnknown implements ContextResolver<ObjectMapper> { @Override public ObjectMapper getContext(Class<?> type) { return new ObjectMapper() .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) .enable(SerializationFeature.FAIL_ON_EMPTY_BEANS); } } public static WireMockServer getWireMockServer() { var wireMockServer = new WireMockServer(options().port(getAvailableTcpPort(20000, 22000))); wireMockServer.start(); return wireMockServer; } public static int getAvailableTcpPort(int min, int max) { var ports = IntStream.range(min, max).boxed().collect(Collectors.toList()); Collections.shuffle(ports); // shuffle to get a random order and reduce the probability a port is already in use for (var port : ports) { try (ServerSocket serverSocket = new ServerSocket(port)) { return serverSocket.getLocalPort(); } catch (IOException e) { // try next } } throw new IllegalStateException(MessageFormat.format("Could not find a free TCP port in range {0}:{1}.", min, max)); } } ``` With ```xml <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-rest-client-reactive-jackson</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-resteasy-reactive</artifactId> </dependency> <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> <version>1.18.22</version> </dependency> ``` ### Output of `uname -a` or `ver` Darwin M042112251A.local 20.6.0 Darwin Kernel Version 20.6.0: Wed Nov 10 22:23:07 PST 2021; root:xnu-7195.141.14~1/RELEASE_X86_64 x86_64 ### Output of `java -version` openjdk version "11.0.14.1" 2022-02-08 OpenJDK Runtime Environment Temurin-11.0.14.1+1 (build 11.0.14.1+1) OpenJDK 64-Bit Server VM Temurin-11.0.14.1+1 (build 11.0.14.1+1, mixed mode) ### GraalVM version (if different from Java) not used ### Quarkus version or git rev 2.8.0.Final, 2.9.2.Final, 2.10.0.CR1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) ### Additional information _No response_

88cfc7d6df4daf9a658fb723ea262a88285996bb

e05af28364c3bea101a8a8ee16e33d3321d2470f

https://github.com/quarkusio/quarkus/compare/88cfc7d6df4daf9a658fb723ea262a88285996bb...e05af28364c3bea101a8a8ee16e33d3321d2470f

diff --git a/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.java b/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.java index 1ba281fc8c3..98a52d39391 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.java @@ -49,7 +49,7 @@ public void writeTo(Object o, Class<?> type, Type genericType, Annotation[] anno @Override public void handle(RestClientRequestContext requestContext) throws Exception { - this.context = context; + this.context = requestContext; } protected ObjectWriter getEffectiveWriter() { diff --git a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java index b4a80c3a955..f925704718c 100644 --- a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java +++ b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java @@ -1,5 +1,6 @@ package io.quarkus.it.rest.client; +import static com.github.tomakehurst.wiremock.client.WireMock.ok; import static com.github.tomakehurst.wiremock.client.WireMock.okJson; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; import static org.assertj.core.api.Assertions.assertThat; @@ -8,9 +9,11 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Objects; +import java.util.concurrent.atomic.AtomicBoolean; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; @@ -40,6 +43,8 @@ public class ClientWithCustomObjectMapperTest { @BeforeEach public void setUp() throws MalformedURLException { + ClientObjectMapperUnknown.USED.set(false); + ClientObjectMapperNoUnknown.USED.set(false); wireMockServer = new WireMockServer(options().port(20001)); wireMockServer.start(); @@ -60,10 +65,10 @@ public void tearDown() { } @Test - void testCustomObjectMappersShouldBeUsed() { + void testCustomObjectMappersShouldBeUsedInReader() { var json = "{ \\"value\\": \\"someValue\\", \\"secondValue\\": \\"toBeIgnored\\" }"; wireMockServer.stubFor( - WireMock.get(WireMock.urlMatching("/get")) + WireMock.get(WireMock.urlMatching("/client")) .willReturn(okJson(json))); // FAIL_ON_UNKNOWN_PROPERTIES disabled @@ -75,12 +80,25 @@ void testCustomObjectMappersShouldBeUsed() { .isInstanceOf(ClientWebApplicationException.class); } - @Path("/get") + @Test + void testCustomObjectMappersShouldBeUsedInWriter() { + wireMockServer.stubFor( + WireMock.post(WireMock.urlMatching("/client")) + .willReturn(ok())); + + clientDisallowsUnknown.post(new Request()); + assertThat(ClientObjectMapperNoUnknown.USED.get()).isTrue(); + } + + @Path("/client") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public interface MyClient { @GET Uni<Request> get(); + + @POST + void post(Request request); } public static class Request { @@ -119,8 +137,11 @@ public int hashCode() { } public static class ClientObjectMapperUnknown implements ContextResolver<ObjectMapper> { + static final AtomicBoolean USED = new AtomicBoolean(false); + @Override public ObjectMapper getContext(Class<?> type) { + USED.set(true); return new ObjectMapper() .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); @@ -128,8 +149,12 @@ public ObjectMapper getContext(Class<?> type) { } public static class ClientObjectMapperNoUnknown implements ContextResolver<ObjectMapper> { + + static final AtomicBoolean USED = new AtomicBoolean(false); + @Override public ObjectMapper getContext(Class<?> type) { + USED.set(true); return new ObjectMapper() .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) .enable(SerializationFeature.FAIL_ON_EMPTY_BEANS);

['extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.java', 'integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java']

{'.java': 2}