Datasets:

tiginamaria

/

bug-localization

like 2

quarkusio/quarkus/17651/17628

quarkusio

quarkus

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

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

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

fixes

Hot reload fails when using custom beans validator and MP Rest Client

## Describe the bug When running in dev mode, hot reload always fails when having a MP Rest Client injected in a custom beans validator. Even if code is changed outside the validator, the reload fails. ### Expected behavior Changes to code in dev mode should reload without any failure. ### Actual behavior Getting the following stack trace: ``` java.lang.IllegalStateException: Container not running: ArcContainerImpl [id=1, running=false, beans=0, observers=0, scopes=[]] at io.quarkus.arc.impl.ArcContainerImpl.requireRunning(ArcContainerImpl.java:797) at io.quarkus.arc.impl.ArcContainerImpl.instanceSupplier(ArcContainerImpl.java:240) at io.quarkus.arc.runtime.BeanContainerImpl.instanceFactory(BeanContainerImpl.java:25) at io.quarkus.resteasy.common.runtime.QuarkusConstructorInjector.construct(QuarkusConstructorInjector.java:34) at org.jboss.resteasy.core.providerfactory.ResteasyProviderFactoryImpl.injectedInstance(ResteasyProviderFactoryImpl.java:1399) at org.jboss.resteasy.microprofile.client.RestClientBuilderImpl.newInstanceOf(RestClientBuilderImpl.java:477) at org.jboss.resteasy.microprofile.client.RestClientBuilderImpl.register(RestClientBuilderImpl.java:489) at org.jboss.resteasy.microprofile.client.RestClientBuilderImpl.build(RestClientBuilderImpl.java:190) at io.quarkus.restclient.runtime.RestClientBase.create(RestClientBase.java:79) at org.acme.AgeLookupService_e9fbd2155c92de4d28b8270959d49ea60024644c_Synthetic_Bean.create(AgeLookupService_e9fbd2155c92de4d28b8270959d49ea60024644c_Synthetic_Bean.zig:189) at org.acme.AgeLookupService_e9fbd2155c92de4d28b8270959d49ea60024644c_Synthetic_Bean.get(AgeLookupService_e9fbd2155c92de4d28b8270959d49ea60024644c_Synthetic_Bean.zig:220) at org.acme.AgeLookupService_e9fbd2155c92de4d28b8270959d49ea60024644c_Synthetic_Bean.get(AgeLookupService_e9fbd2155c92de4d28b8270959d49ea60024644c_Synthetic_Bean.zig:243) at io.quarkus.arc.impl.CurrentInjectionPointProvider.get(CurrentInjectionPointProvider.java:52) at org.acme.CustomAgeValidator_Bean.create(CustomAgeValidator_Bean.zig:252) at org.acme.CustomAgeValidator_Bean.create(CustomAgeValidator_Bean.zig:292) at io.quarkus.arc.impl.AbstractSharedContext.createInstanceHandle(AbstractSharedContext.java:96) at io.quarkus.arc.impl.AbstractSharedContext.access$000(AbstractSharedContext.java:14) at io.quarkus.arc.impl.AbstractSharedContext$1.get(AbstractSharedContext.java:29) at io.quarkus.arc.impl.AbstractSharedContext$1.get(AbstractSharedContext.java:26) 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:26) at org.acme.CustomAgeValidator_Bean.get(CustomAgeValidator_Bean.zig:324) at org.acme.CustomAgeValidator_Bean.get(CustomAgeValidator_Bean.zig:340) at io.quarkus.arc.impl.ArcContainerImpl.beanInstanceHandle(ArcContainerImpl.java:430) at io.quarkus.arc.impl.ArcContainerImpl.beanInstanceHandle(ArcContainerImpl.java:443) at io.quarkus.arc.impl.ArcContainerImpl.instanceHandle(ArcContainerImpl.java:413) at io.quarkus.arc.impl.ArcContainerImpl.instance(ArcContainerImpl.java:222) at io.quarkus.hibernate.validator.runtime.ArcConstraintValidatorFactoryImpl.getInstance(ArcConstraintValidatorFactoryImpl.java:29) at org.hibernate.validator.internal.engine.constraintvalidation.ClassBasedValidatorDescriptor.newInstance(ClassBasedValidatorDescriptor.java:84) at org.hibernate.validator.internal.engine.constraintvalidation.AbstractConstraintValidatorManagerImpl.createAndInitializeValidator(AbstractConstraintValidatorManagerImpl.java:89) at org.hibernate.validator.internal.engine.constraintvalidation.PredefinedScopeConstraintValidatorManagerImpl.getInitializedValidator(PredefinedScopeConstraintValidatorManagerImpl.java:60) at org.hibernate.validator.internal.engine.constraintvalidation.ConstraintTree.<init>(ConstraintTree.java:56) at org.hibernate.validator.internal.engine.constraintvalidation.SimpleConstraintTree.<init>(SimpleConstraintTree.java:37) at org.hibernate.validator.internal.engine.constraintvalidation.ConstraintTree.of(ConstraintTree.java:66) at org.hibernate.validator.internal.metadata.core.MetaConstraint.<init>(MetaConstraint.java:75) at org.hibernate.validator.internal.metadata.core.MetaConstraints.create(MetaConstraints.java:74) at org.hibernate.validator.internal.metadata.provider.AnnotationMetaDataProvider.getParameterMetaData(AnnotationMetaDataProvider.java:421) at org.hibernate.validator.internal.metadata.provider.AnnotationMetaDataProvider.findExecutableMetaData(AnnotationMetaDataProvider.java:308) at org.hibernate.validator.internal.metadata.provider.AnnotationMetaDataProvider.getMetaData(AnnotationMetaDataProvider.java:292) at org.hibernate.validator.internal.metadata.provider.AnnotationMetaDataProvider.getMethodMetaData(AnnotationMetaDataProvider.java:279) at org.hibernate.validator.internal.metadata.provider.AnnotationMetaDataProvider.retrieveBeanConfiguration(AnnotationMetaDataProvider.java:130) at org.hibernate.validator.internal.metadata.provider.AnnotationMetaDataProvider.getBeanConfiguration(AnnotationMetaDataProvider.java:120) at org.hibernate.validator.internal.metadata.PredefinedScopeBeanMetaDataManager.getBeanConfigurationForHierarchy(PredefinedScopeBeanMetaDataManager.java:183) at org.hibernate.validator.internal.metadata.PredefinedScopeBeanMetaDataManager.createBeanMetaData(PredefinedScopeBeanMetaDataManager.java:150) at org.hibernate.validator.internal.metadata.PredefinedScopeBeanMetaDataManager.<init>(PredefinedScopeBeanMetaDataManager.java:100) at org.hibernate.validator.internal.engine.PredefinedScopeValidatorFactoryImpl.<init>(PredefinedScopeValidatorFactoryImpl.java:180) at org.hibernate.validator.PredefinedScopeHibernateValidator.buildValidatorFactory(PredefinedScopeHibernateValidator.java:42) at org.hibernate.validator.internal.engine.AbstractConfigurationImpl.buildValidatorFactory(AbstractConfigurationImpl.java:433) at io.quarkus.hibernate.validator.runtime.HibernateValidatorRecorder$1.created(HibernateValidatorRecorder.java:132) at io.quarkus.arc.runtime.ArcRecorder.initBeanContainer(ArcRecorder.java:70) at io.quarkus.deployment.steps.ArcProcessor$generateResources-1025303321.deploy_0(ArcProcessor$generateResources-1025303321.zig:138) at io.quarkus.deployment.steps.ArcProcessor$generateResources-1025303321.deploy(ArcProcessor$generateResources-1025303321.zig:40) at io.quarkus.runner.ApplicationImpl.<clinit>(ApplicationImpl.zig:259) at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:490) at java.base/java.lang.Class.newInstance(Class.java:584) at io.quarkus.runtime.Quarkus.run(Quarkus.java:65) at io.quarkus.runtime.Quarkus.run(Quarkus.java:42) at io.quarkus.runtime.Quarkus.run(Quarkus.java:119) at io.quarkus.runner.GeneratedMain.main(GeneratedMain.zig:29) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at io.quarkus.runner.bootstrap.StartupActionImpl$3.run(StartupActionImpl.java:134) at java.base/java.lang.Thread.run(Thread.java:834) Resulted in: java.lang.RuntimeException: Error injecting org.acme.AgeLookupService org.acme.CustomAgeValidator.ageLookupService at org.acme.CustomAgeValidator_Bean.create(CustomAgeValidator_Bean.zig:269) ... 55 more Resulted in: java.lang.RuntimeException: java.lang.RuntimeException: Error injecting org.acme.AgeLookupService org.acme.CustomAgeValidator.ageLookupService at io.quarkus.dev.appstate.ApplicationStateNotification.waitForApplicationStart(ApplicationStateNotification.java:51) at io.quarkus.runner.bootstrap.StartupActionImpl.runMainClass(StartupActionImpl.java:145) at io.quarkus.deployment.dev.IsolatedDevModeMain.restartApp(IsolatedDevModeMain.java:191) at io.quarkus.deployment.dev.IsolatedDevModeMain.restartCallback(IsolatedDevModeMain.java:175) at io.quarkus.deployment.dev.RuntimeUpdatesProcessor.doScan(RuntimeUpdatesProcessor.java:254) at io.quarkus.vertx.http.runtime.devmode.VertxHttpHotReplacementSetup$2.handle(VertxHttpHotReplacementSetup.java:64) at io.quarkus.vertx.http.runtime.devmode.VertxHttpHotReplacementSetup$2.handle(VertxHttpHotReplacementSetup.java:54) at io.vertx.core.impl.ContextImpl.lambda$executeBlocking$2(ContextImpl.java:313) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) ... 1 more ``` ## To Reproduce Steps to reproduce the behavior: 1. clone https://github.com/enbohm/code-with-hotreload 2. start in dev-mode 3. open http://127.0.0.1:8080/validate?age=11 4. make a small change in the code 5. reload http://127.0.0.1:8080/validate?age=11 ### Configuration https://github.com/enbohm/code-with-hotreload/blob/master/src/main/resources/application.properties ## Environment (please complete the following information): ### Output of `uname -a` or `ver` Darwin MacBook-Pro.local 20.5.0 Darwin Kernel Version 20.5.0: Sat May 8 05:10:33 PDT 2021; root:xnu-7195.121.3~9/RELEASE_X86_64 x86_64 ### Output of `java -version` openjdk version "11" 2018-09-25 OpenJDK Runtime Environment 18.9 (build 11+28) OpenJDK 64-Bit Server VM 18.9 (build 11+28, mixed mode) ### Quarkus version or git rev 1.13.6 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) maven 3.8 ## Additional context If adding an @ApplicationScoped annotation on the MP Rest client the reload works

cc94f11e1a1412ae4d4e883e533789190015c080

7abd7dec92271da5bdffe8aee0fca9f8707b7ba2

https://github.com/quarkusio/quarkus/compare/cc94f11e1a1412ae4d4e883e533789190015c080...7abd7dec92271da5bdffe8aee0fca9f8707b7ba2

diff --git a/extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java b/extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java index 4d0c9e6baee..bf4654c1a36 100644 --- a/extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java +++ b/extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java @@ -49,10 +49,10 @@ import io.quarkus.deployment.Capability; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Consume; import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.AdditionalStaticInitConfigSourceProviderBuildItem; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.ProxyUnwrapperBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.util.ServiceUtil; import io.quarkus.resteasy.common.runtime.ResteasyInjectorFactoryRecorder; @@ -148,16 +148,11 @@ void setupGzipProviders(BuildProducer<ResteasyJaxrsProviderBuildItem> providers) } @Record(STATIC_INIT) + @Consume(BeanContainerBuildItem.class) @BuildStep - ResteasyInjectionReadyBuildItem setupResteasyInjection(List<ProxyUnwrapperBuildItem> proxyUnwrappers, - BeanContainerBuildItem beanContainerBuildItem, - Capabilities capabilities, + ResteasyInjectionReadyBuildItem setupResteasyInjection( ResteasyInjectorFactoryRecorder recorder) { - List<Function<Object, Object>> unwrappers = new ArrayList<>(); - for (ProxyUnwrapperBuildItem i : proxyUnwrappers) { - unwrappers.add(i.getUnwrapper()); - } - RuntimeValue<InjectorFactory> injectorFactory = recorder.setup(beanContainerBuildItem.getValue(), unwrappers); + RuntimeValue<InjectorFactory> injectorFactory = recorder.setup(); return new ResteasyInjectionReadyBuildItem(injectorFactory); } diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusConstructorInjector.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusConstructorInjector.java index 88723b3295d..218b5e6a3d6 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusConstructorInjector.java +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusConstructorInjector.java @@ -1,6 +1,7 @@ package io.quarkus.resteasy.common.runtime; import java.lang.reflect.Constructor; +import java.util.function.Supplier; import javax.ws.rs.WebApplicationException; @@ -10,11 +11,12 @@ import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.HttpResponse; -import io.quarkus.arc.runtime.BeanContainer; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; public class QuarkusConstructorInjector implements ConstructorInjector { - private volatile BeanContainer.Factory<?> factory; + private volatile Supplier<? extends InstanceHandle<?>> factory; private final ConstructorInjector delegate; @@ -27,31 +29,27 @@ public QuarkusConstructorInjector(Constructor<?> ctor, ConstructorInjector deleg @Override public Object construct(boolean unwrapAsync) { - if (QuarkusInjectorFactory.CONTAINER == null) { - return this.delegate.construct(unwrapAsync); - } - if (factory == null) { - factory = QuarkusInjectorFactory.CONTAINER.instanceFactory(this.ctor.getDeclaringClass()); + if (factory != null) { + return factory.get().get(); } + factory = Arc.container().instanceSupplier(this.ctor.getDeclaringClass()); if (factory == null) { return delegate.construct(unwrapAsync); } - return factory.create().get(); + return factory.get().get(); } @Override public Object construct(HttpRequest request, HttpResponse response, boolean unwrapAsync) throws Failure, WebApplicationException, ApplicationException { - if (QuarkusInjectorFactory.CONTAINER == null) { - return delegate.construct(request, response, unwrapAsync); - } - if (factory == null) { - factory = QuarkusInjectorFactory.CONTAINER.instanceFactory(this.ctor.getDeclaringClass()); + if (factory != null) { + return factory.get().get(); } + factory = Arc.container().instanceSupplier(this.ctor.getDeclaringClass()); if (factory == null) { return delegate.construct(request, response, unwrapAsync); } - return factory.create().get(); + return factory.get().get(); } @Override diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java index fb97f717713..cc4bf240826 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java @@ -18,13 +18,12 @@ import org.jboss.resteasy.spi.metadata.ResourceClass; import org.jboss.resteasy.spi.metadata.ResourceConstructor; -import io.quarkus.arc.runtime.BeanContainer; +import io.quarkus.arc.runtime.ClientProxyUnwrapper; public class QuarkusInjectorFactory extends InjectorFactoryImpl { private static final Logger log = Logger.getLogger("io.quarkus.resteasy.runtime"); - static volatile BeanContainer CONTAINER = null; - static volatile Function<Object, Object> PROXY_UNWRAPPER; + static final Function<Object, Object> PROXY_UNWRAPPER = new ClientProxyUnwrapper(); @SuppressWarnings("rawtypes") @Override diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/ResteasyInjectorFactoryRecorder.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/ResteasyInjectorFactoryRecorder.java index f3c56f7068d..a8552f9f4ea 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/ResteasyInjectorFactoryRecorder.java +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/ResteasyInjectorFactoryRecorder.java @@ -1,29 +1,14 @@ package io.quarkus.resteasy.common.runtime; -import java.util.List; -import java.util.function.Function; - import org.jboss.resteasy.spi.InjectorFactory; -import io.quarkus.arc.runtime.BeanContainer; import io.quarkus.runtime.RuntimeValue; import io.quarkus.runtime.annotations.Recorder; @Recorder public class ResteasyInjectorFactoryRecorder { - public RuntimeValue<InjectorFactory> setup(BeanContainer container, List<Function<Object, Object>> propertyUnwrappers) { - QuarkusInjectorFactory.CONTAINER = container; - QuarkusInjectorFactory.PROXY_UNWRAPPER = new Function<Object, Object>() { - @Override - public Object apply(Object o) { - Object res = o; - for (Function<Object, Object> i : propertyUnwrappers) { - res = i.apply(res); - } - return res; - } - }; + public RuntimeValue<InjectorFactory> setup() { return new RuntimeValue<>(new QuarkusInjectorFactory()); } }

['extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java', 'extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/ResteasyInjectorFactoryRecorder.java', 'extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java', 'extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusConstructorInjector.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/17632/17571

quarkusio

quarkus

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

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

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

fixes

Option quarkus.websocket.dispatch-to-worker=true doesn't work anymore in Quarkus 1.13

## Describe the bug Setting the value of `quarkus.websocket.dispatch-to-worker` to `true` doesn't change anything. WebSockets remain on vert.x-eventloop threads. ### Expected behavior WebSockets should be executed on executor threads (like in Quarkus 1.11). ### Actual behavior WebSockets are executed on vert.x-eventloop threads instead of executor ones. ## To Reproduce 1. Start with Quarkus 1.13 WebSockets example code. 2. Add a log line in `SupersonicChatSocket#onOpen` like `LOG.info("I am a WebSocket!");` 3. Launch the program, go to http://localhost:8080, and connect with a username. 4. See in the console `2021-06-01 01:32:50,570 INFO [org.acm.und.SupersonicChatSocket] (vert.x-eventloop-thread-11) I'm a WebSocket!` notice `vert.x-eventloop-thread-11` 5. Now, set the property `quarkus.websocket.dispatch-to-worker=true` in application.properties 6. Redo step 3 and 4 and observe that it still logs a `vert.x-eventloop-thread-X` thread. You can do the same thing with Quarkus 1.11.3.Final, after setting the option to true you will see WebSocket is executed on an executor thread like it should be: `2021-06-01 01:30:27,083 INFO [org.acm.und.SupersonicChatSocket] (executor-thread-198) I am a WebSocket!`

128988b95595ab41ed6a35f5b30caf863c09a1f2

01ba4c0f9a012e7f4974b7809dcb7fbd92c5119c

https://github.com/quarkusio/quarkus/compare/128988b95595ab41ed6a35f5b30caf863c09a1f2...01ba4c0f9a012e7f4974b7809dcb7fbd92c5119c

diff --git a/extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/WebsocketRecorder.java b/extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/WebsocketRecorder.java index 65085d860b3..a09af85f95c 100644 --- a/extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/WebsocketRecorder.java +++ b/extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/WebsocketRecorder.java @@ -17,7 +17,6 @@ import io.quarkus.arc.Arc; import io.quarkus.arc.ManagedContext; import io.quarkus.arc.runtime.BeanContainer; -import io.quarkus.runtime.ExecutorRecorder; import io.quarkus.runtime.annotations.Recorder; import io.undertow.websockets.UndertowContainerProvider; import io.undertow.websockets.WebSocketDeploymentInfo; @@ -160,15 +159,10 @@ public T call(C context) throws Exception { }; } }), - false, + info.isDispatchToWorkerThread(), null, null, - new Supplier<Executor>() { - @Override - public Executor get() { - return ExecutorRecorder.getCurrent(); - } - }, + info.getExecutor(), Collections.emptyList(), info.getMaxFrameSize()); for (Class<?> i : info.getAnnotatedEndpoints()) {

['extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/WebsocketRecorder.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/17605/17206

quarkusio

quarkus

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

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

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

fixes

maxFramePayloadLength seems to be hardcoded when using WebSocketClient

## Describe the bug We are occasionally hitting an exception (shown below) caused due to the payload in a websocket frame being larger than 1280000 bytes while trying to read log messages from a websocket. Had tried the instructions on setting max-frame-size described in https://github.com/quarkusio/quarkus/issues/7172 without much luck. Looks like io.undertow.websockets.jsr.WebsocketConnectionBuilder has this value hardcoded as 1280000. 2021-05-13 18:41:24,350 WARN [io.net.cha.DefaultChannelPipeline] (nioEventLoopGroup-2-3) An exceptionCaught() event was fired, and it reached at the tail of the pipeline. It usually means the last handler in the pipeline did not handle the exception.: io.netty.handler.codec.http.websocketx.CorruptedWebSocketFrameException: Max frame length of 1280000 has been exceeded. at io.netty.handler.codec.http.websocketx.WebSocket08FrameDecoder.protocolViolation(WebSocket08FrameDecoder.java:426) at io.netty.handler.codec.http.websocketx.WebSocket08FrameDecoder.decode(WebSocket08FrameDecoder.java:286) at io.netty.handler.codec.ByteToMessageDecoder.decodeRemovalReentryProtection(ByteToMessageDecoder.java:501) at io.netty.handler.codec.ByteToMessageDecoder.callDecode(ByteToMessageDecoder.java:440) at io.netty.handler.codec.ByteToMessageDecoder.channelRead(ByteToMessageDecoder.java:276) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:379) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:365) at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:357) at io.netty.channel.DefaultChannelPipeline$HeadContext.channelRead(DefaultChannelPipeline.java:1410) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:379) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:365) at io.netty.channel.DefaultChannelPipeline.fireChannelRead(DefaultChannelPipeline.java:919) at io.netty.channel.nio.AbstractNioByteChannel$NioByteUnsafe.read(AbstractNioByteChannel.java:163) at io.netty.channel.nio.NioEventLoop.processSelectedKey(NioEventLoop.java:714) at io.netty.channel.nio.NioEventLoop.processSelectedKeysOptimized(NioEventLoop.java:650) at io.netty.channel.nio.NioEventLoop.processSelectedKeys(NioEventLoop.java:576) at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:493) at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:989) 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:834) ### Expected behavior The maxFramePayloadLength setting should ideally be configurable. Any workaround would be much appreciated. ### Actual behavior This setting/value is hardcoded ## To Reproduce A client connecting to a websocket that sends frames with payload larger than 1280000 bytes Steps to reproduce the behavior: A client connecting to a websocket that sends frames with payload larger than 1280000 bytes ### Configuration ```properties No Specific properties required to reproduce this issue ``` ### Screenshots ## Environment (please complete the following information): ### Output of `uname -a` or `ver` ### Output of `java -version` ### GraalVM version (if different from Java) ### Quarkus version or git rev ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) ## Additional context (Add any other context about the problem here.)

13fb194d4f3cf25495758f325aee5977a80d91a4

d7a0508759f167023747f64f6a6388e23367038c

https://github.com/quarkusio/quarkus/compare/13fb194d4f3cf25495758f325aee5977a80d91a4...d7a0508759f167023747f64f6a6388e23367038c

diff --git a/extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/WebsocketRecorder.java b/extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/WebsocketRecorder.java index f0f16c3f1e4..65085d860b3 100644 --- a/extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/WebsocketRecorder.java +++ b/extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/WebsocketRecorder.java @@ -159,13 +159,18 @@ public T call(C context) throws Exception { } }; } - }), false, + }), + false, + null, + null, new Supplier<Executor>() { @Override public Executor get() { return ExecutorRecorder.getCurrent(); } - }); + }, + Collections.emptyList(), + info.getMaxFrameSize()); for (Class<?> i : info.getAnnotatedEndpoints()) { container.addEndpoint(i); }

['extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/WebsocketRecorder.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/17495/17492

quarkusio

quarkus

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

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

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

resolves

IllegalAccessError invoking non-public @Scheduled method

## Describe the bug An IllegalAccessError is thrown when invoking a non-public @Scheduled method, e.g: @Scheduled(every = "PT10S", concurrentExecution = ConcurrentExecution.SKIP) void myMethod() {...} All is fine if the method is public. Call stack looks like so: 2021-05-27 15:58:27,006 ERROR (executor-thread-2) [SimpleScheduler] Error occured while executing task for trigger IntervalTrigger [id=1_my.redacted.Service_ScheduledInvoker_myMethod_8d0ea617bdcf7cab33987d918fbaeabfd51940d4, interval=10000] java.lang.IllegalAccessError: class my.redacted.Service_ScheduledInvoker_myMethod_8d0ea617bdcf7cab33987d918fbaeabfd51940d4 tried to access method my.redacted.Service.myMethod()V (my.redacted.Service_ScheduledInvoker_myMethod_8d0ea617bdcf7cab33987d918fbaeabfd51940d4 is in unnamed module of loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @451b1c01; my.redacted.Service is in unnamed module of loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @6f45da6b) at my.redacted.Service_ScheduledInvoker_myMethod_8d0ea617bdcf7cab33987d918fbaeabfd51940d4.invokeBean(Service_ScheduledInvoker_myMethod_8d0ea617bdcf7cab33987d918fbaeabfd51940d4.zig:46) at io.quarkus.arc.runtime.BeanInvoker.invoke(BeanInvoker.java:20) at io.quarkus.scheduler.runtime.SkipConcurrentExecutionInvoker.invoke(SkipConcurrentExecutionInvoker.java:37) at io.quarkus.scheduler.runtime.SkipConcurrentExecutionInvoker.invoke(SkipConcurrentExecutionInvoker.java:19) at io.quarkus.scheduler.runtime.SimpleScheduler$ScheduledTask$1.run(SimpleScheduler.java:251) at io.quarkus.vertx.core.runtime.VertxCoreRecorder$14.runWith(VertxCoreRecorder.java:486) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2442) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1450) at org.jboss.threads.DelegatingRunnable.run(DelegatingRunnable.java:29) at org.jboss.threads.ThreadLocalResettingRunnable.run(ThreadLocalResettingRunnable.java:29) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.base/java.lang.Thread.run(Thread.java:834) ### Expected behavior Expect it to work ok with default access per other Quarkus/CDI methods. ### Actual behavior Fails with IllegalAccessError. ### Quarkus version or git rev 2.0.0.CR1

fe07bc0e65757c206779f9184e89cdd20737e1d8

a5acdc95fd5e1415c224003abe2008aea5a652b8

https://github.com/quarkusio/quarkus/compare/fe07bc0e65757c206779f9184e89cdd20737e1d8...a5acdc95fd5e1415c224003abe2008aea5a652b8

diff --git a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java b/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java index 5f85c176a1a..ad34c15f837 100644 --- a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java +++ b/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java @@ -3,6 +3,7 @@ import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT; import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; +import java.lang.reflect.Modifier; import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; @@ -10,6 +11,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Function; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; @@ -88,6 +90,7 @@ public class SchedulerProcessor { Kind.CLASS); static final String INVOKER_SUFFIX = "_ScheduledInvoker"; + static final String NESTED_SEPARATOR = "$_"; @BuildStep void beans(Capabilities capabilities, BuildProducer<AdditionalBeanBuildItem> additionalBeans) { @@ -159,6 +162,12 @@ void validateScheduledBusinessMethods(SchedulerConfig config, List<ScheduledBusi for (ScheduledBusinessMethodItem scheduledMethod : scheduledMethods) { MethodInfo method = scheduledMethod.getMethod(); + if (Modifier.isPrivate(method.flags()) || Modifier.isStatic(method.flags())) { + errors.add(new IllegalStateException("@Scheduled method must be non-private and non-static: " + + method.declaringClass().name() + "#" + method.name() + "()")); + continue; + } + // Validate method params and return type List<Type> params = method.parameters(); if (params.size() > 1 @@ -198,11 +207,24 @@ public List<UnremovableBeanBuildItem> unremovableBeans() { @Record(RUNTIME_INIT) public FeatureBuildItem build(SchedulerConfig config, BuildProducer<SyntheticBeanBuildItem> syntheticBeans, SchedulerRecorder recorder, List<ScheduledBusinessMethodItem> scheduledMethods, - BuildProducer<GeneratedClassBuildItem> generatedClass, BuildProducer<ReflectiveClassBuildItem> reflectiveClass, + BuildProducer<GeneratedClassBuildItem> generatedClasses, BuildProducer<ReflectiveClassBuildItem> reflectiveClass, AnnotationProxyBuildItem annotationProxy, ExecutorBuildItem executor) { List<ScheduledMethodMetadata> scheduledMetadata = new ArrayList<>(); - ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClass, true); + ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClasses, new Function<String, String>() { + @Override + public String apply(String name) { + // org/acme/Foo_ScheduledInvoker_run_0000 -> org.acme.Foo + int idx = name.indexOf(INVOKER_SUFFIX); + if (idx != -1) { + name = name.substring(0, idx); + } + if (name.contains(NESTED_SEPARATOR)) { + name = name.replace(NESTED_SEPARATOR, "$"); + } + return name; + } + }); for (ScheduledBusinessMethodItem scheduledMethod : scheduledMethods) { ScheduledMethodMetadata metadata = new ScheduledMethodMetadata(); @@ -247,8 +269,8 @@ private String generateInvoker(ScheduledBusinessMethodItem scheduledMethod, Clas String baseName; if (bean.getImplClazz().enclosingClass() != null) { - baseName = DotNames.simpleName(bean.getImplClazz().enclosingClass()) + "_" - + DotNames.simpleName(bean.getImplClazz().name()); + baseName = DotNames.simpleName(bean.getImplClazz().enclosingClass()) + NESTED_SEPARATOR + + DotNames.simpleName(bean.getImplClazz()); } else { baseName = DotNames.simpleName(bean.getImplClazz().name()); } diff --git a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/Scheduled.java b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/Scheduled.java index 1bfff45c537..e3d6873b99c 100644 --- a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/Scheduled.java +++ b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/Scheduled.java @@ -15,6 +15,8 @@ /** * Marks a business method to be automatically scheduled and invoked by the container. * <p> + * The target business method must be non-private and non-static. + * <p> * The schedule is defined either by {@link #cron()} or by {@link #every()} attribute. If both are specified, the cron * expression takes precedence. *

['extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/Scheduled.java', 'extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.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/17394/17367

quarkusio

quarkus

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

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

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

close

NPE in QuarkusModelBuilder for Gradle composite builds

## Describe the bug On a project using Gradle composite build, dev mode fails to start. The project layout is the following: - composite - composite-subproject - project - utilities - my-artifactId - my-artifactId depends on utilities - utilities depends on composite-subproject - project is including composite as a Gradle composite build ### Expected behavior Quarkus dev mode should start. ### Actual behavior Quarkus dev mode fails with: ``` Caused by: java.lang.NullPointerException at io.quarkus.gradle.builder.QuarkusModelBuilder.addDevModePaths(QuarkusModelBuilder.java:402) at io.quarkus.gradle.builder.QuarkusModelBuilder.collectDependencies(QuarkusModelBuilder.java:360) at io.quarkus.gradle.builder.QuarkusModelBuilder.buildAll(QuarkusModelBuilder.java:112) at io.quarkus.gradle.extension.QuarkusPluginExtension.create(QuarkusPluginExtension.java:229) at io.quarkus.gradle.extension.QuarkusPluginExtension.getQuarkusModel(QuarkusPluginExtension.java:222) at io.quarkus.gradle.extension.QuarkusPluginExtension.getAppModelResolver(QuarkusPluginExtension.java:214) at io.quarkus.gradle.tasks.QuarkusDev.newLauncher(QuarkusDev.java:224) at io.quarkus.gradle.tasks.QuarkusDev.startDev(QuarkusDev.java:180) ... 122 more ``` Debugging shows that in `io.quarkus.gradle.builder.QuarkusModelBuilder#addDevModePaths` the project is null when it is referencing the composite module. It looks like with this setup: `IncludedBuild includedBuild = includedBuild(project, a.getName());` fails to detect the composite build. In my case `project.getGradle().includedBuild(projectName)` is checking if project _project_ is including _composite-subproject_ where it is including _composite_. ## To Reproduce Checkout https://github.com/symphony-youri/quarkus-composite Steps to reproduce the behavior: 1. Go to project/my-artifactId folder 2. Run `gradle quarkusDev --info --stacktrace` ## Environment (please complete the following information): ### Output of `uname -a` or `ver` Darwin xxx-mbp 20.4.0 Darwin Kernel Version 20.4.0: Thu Apr 22 21:46:47 PDT 2021; root:xnu-7195.101.2~1/RELEASE_X86_64 x86_64 i386 MacBookPro16,1 Darwin ### Output of `java -version` openjdk version "11.0.11" 2021-04-20 OpenJDK Runtime Environment GraalVM CE 21.1.0 (build 11.0.11+8-jvmci-21.1-b05) OpenJDK 64-Bit Server VM GraalVM CE 21.1.0 (build 11.0.11+8-jvmci-21.1-b05, mixed mode, sharing) ### GraalVM version (if different from Java) ### Quarkus version or git rev 1.13 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 7.0.2 ## Additional context (Add any other context about the problem here.)

6fd054d65730e38d865e4cdc3b3eebee8fea66cd

99deb151e3321613475b15e5b1713b7b9e93a5e1

https://github.com/quarkusio/quarkus/compare/6fd054d65730e38d865e4cdc3b3eebee8fea66cd...99deb151e3321613475b15e5b1713b7b9e93a5e1

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/builder/QuarkusModelBuilder.java b/devtools/gradle/src/main/java/io/quarkus/gradle/builder/QuarkusModelBuilder.java index 8b56fd43364..ff549e1b432 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/builder/QuarkusModelBuilder.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/builder/QuarkusModelBuilder.java @@ -321,18 +321,22 @@ private void collectDependencies(ResolvedConfiguration configuration, final DependencyImpl dep = initDependency(a); if ((LaunchMode.DEVELOPMENT.equals(mode) || LaunchMode.TEST.equals(mode)) && a.getId().getComponentIdentifier() instanceof ProjectComponentIdentifier) { - IncludedBuild includedBuild = includedBuild(project, a.getName()); if ("test-fixtures".equals(a.getClassifier()) || "test".equals(a.getClassifier())) { //TODO: test-fixtures are broken under the new ClassLoading model dep.addPath(a.getFile()); } else { + IncludedBuild includedBuild = includedBuild(project.getRootProject(), a.getName()); if (includedBuild != null) { addSubstitutedProject(dep, includedBuild.getProjectDir()); } else { Project projectDep = project.getRootProject() .findProject( ((ProjectComponentIdentifier) a.getId().getComponentIdentifier()).getProjectPath()); - addDevModePaths(dep, a, projectDep); + if (projectDep != null) { + addDevModePaths(dep, a, projectDep); + } else { + dep.addPath(a.getFile()); + } } } } else {

['devtools/gradle/src/main/java/io/quarkus/gradle/builder/QuarkusModelBuilder.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/18061/17878

quarkusio

quarkus

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

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

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

fixes

Quarkus Mongodb change stream resume token always null in native

## Describe the bug I'm building a quarkus app that uses the mongodb change streams functionality with the reactive client. If I start the application locally from Intellij everything works fine but when I build the native app and try to save the resume token it's always null. I use this command to build the native app since I need to build it locally on windows and delpoy it on heroku: mvn package -Pnative -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:21.0.0-java11 This is the class and method where I initialize the change stream and start the watch on the collection @Inject ReactiveMongoClient mongoClient; private void initOrderStream() { ReactiveMongoDatabase database = mongoClient.getDatabase("database"); ReactiveMongoCollection<Order> dataCollection = database.getCollection("order", Order.class); ChangeStreamOptions options = new ChangeStreamOptions().fullDocument(FullDocument.UPDATE_LOOKUP); List<Bson> pipeline = Collections.singletonList( Aggregates.match( Filters.and( Filters.eq("operationType", "insert") ) ) ); Multi<ChangeStreamDocument<Order>> publisher = dataCollection.watch(pipeline, Order.class, options); publisher.subscribe().with(eventListener.getOrderListener()); } And this is the listener method public Consumer<ChangeStreamDocument<Order>> getOrderListener() { return message -> { logger.info("Saving resume token for message " + message); EventConfig eventConfig = new EventConfig(); eventConfig.setType(eventType); eventConfig.setResumeToken(message.getResumeToken().getString("_data")); EventConfig.persistOrUpdate(eventConfig); Order order = message.getFullDocument(); saveEvent(order); }; } The problem is in the message.getResumeToken() method, if I start the application non native than the resume token is present and I can save it without problems, but when I build it native and put it in a container the resume token is always null. Without resume token the change streams are almost useless since Iit's not possible to recover missing events if a problem occurs or appplication needs to be restarted. ### Expected behavior The resume token using the _getResumeToken_ method of the ChangeStreamDocument class should not return null in native mode. ### Actual behavior The resume token using the _getResumeToken_ method of the ChangeStreamDocument class is always null in native mode. ## To Reproduce Steps to reproduce the behavior: 1. Create a quarkus app 2. Connect it to mongodb 3. Initialize change stream on a collection using the code mentioned above 4. Package the application in native mode using the maven command above 5. Start the application 4. Insert a document in the collection attached to the watcher and receive a null pointer exception because the resume token is null ## Environment (please complete the following information): ### Output of `java -version` openjdk version "11.0.10" 2021-01-19 OpenJDK Runtime Environment GraalVM CE 21.0.0 (build 11.0.10+8-jvmci-21.0-b06) OpenJDK 64-Bit Server VM GraalVM CE 21.0.0 (build 11.0.10+8-jvmci-21.0-b06, mixed mode, sharing) ### Quarkus version or git rev 1.13.6.Final

65e3aa05e088355b014d20b197086eac83ec888d

732b2a781b1659715905b9c2121be2a6f050d84f

https://github.com/quarkusio/quarkus/compare/65e3aa05e088355b014d20b197086eac83ec888d...732b2a781b1659715905b9c2121be2a6f050d84f

diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java index 8e39a69b417..3eb4fd9546e 100644 --- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java +++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java @@ -135,11 +135,13 @@ List<ReflectiveClassBuildItem> addExtensionPointsToNative(CodecProviderBuildItem reflectiveClassNames.addAll(propertyCodecProviders.getPropertyCodecProviderClassNames()); reflectiveClassNames.addAll(bsonDiscriminators.getBsonDiscriminatorClassNames()); reflectiveClassNames.addAll(commandListeners.getCommandListenerClassNames()); - reflectiveClassNames.add(ChangeStreamDocument.class.getName()); - return reflectiveClassNames.stream() + List<ReflectiveClassBuildItem> reflectiveClass = reflectiveClassNames.stream() .map(s -> new ReflectiveClassBuildItem(true, true, false, s)) - .collect(Collectors.toList()); + .collect(Collectors.toCollection(() -> new ArrayList<>())); + // ChangeStreamDocument needs to be registered for reflection with its fields. + reflectiveClass.add(new ReflectiveClassBuildItem(true, true, true, ChangeStreamDocument.class.getName())); + return reflectiveClass; } @BuildStep

['extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.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/18138/18026

quarkusio

quarkus

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

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

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

fixes

ClassNotFound using SCRAM SHA 256 with Kafka extension

## Describe the bug Using the quarkus Kafka extension and using the following Kafka config: ``` kafka: bootstrap: servers: ... security: protocol: SASL_SSL sasl: mechanism: SCRAM-SHA-256 jaas: config: org.apache.kafka.common.security.scram.ScramLoginModule required username="${kafka.username}" password="${kafka.password}"; ``` Works fine in JVM mode, but when compiling to native it does not work: Caused by: java.lang.ClassNotFoundException: org.apache.kafka.common.security.scram.internals.ScramSaslClient$ScramSaslClientFactory at com.oracle.svm.core.hub.ClassForNameSupport.forName(ClassForNameSupport.java:64) at java.lang.ClassLoader.loadClass(ClassLoader.java:290) at java.security.Provider$Service.getImplClass(Provider.java:1920) ... 43 more ### Expected behavior Being able to use SCAM SHA 256 authentication with Kafka in Quarkus. ### Actual behavior From what I can see, some underlying Kafka client library classes are not included by GraalVM, and some may to work around that needs to be applied. ## To Reproduce Use Kafka client with SCRAM SHA 256 auth against a Kafka cluster. ### Configuration Relevant parts: ```properties kafka: bootstrap: servers: ... security: protocol: SASL_SSL sasl: mechanism: SCRAM-SHA-256 jaas: config: org.apache.kafka.common.security.scram.ScramLoginModule required username="${kafka.username}" password="${kafka.password}"; ``` ## Environment (please complete the following information): ### Output of `uname -a` or `ver` Linux pteppic 5.12.10-300.fc34.x86_64 #1 SMP Thu Jun 10 14:21:36 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` OpenJDK 64-Bit Server VM 18.9 (build 11.0.11+9, mixed mode, sharing) ### GraalVM version (if different from Java) graalvm-ce-java11-21.1.0 ### Quarkus version or git rev 2.0.0.CR3 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) ## Additional context Full stack trace: ``` 2021-06-20 19:00:25,119 INFO [org.apa.kaf.com.net.SaslChannelBuilder] (smallrye-kafka-consumer-thread-0) [Consumer clientId=kafka-consumer-telemetry-inbound, groupId=plantmonitor] Failed to create channel due to : org.apache.kafka.common.errors.SaslAuthenticationException: Failed to configure SaslClientAuthenticator Caused by: org.apache.kafka.common.errors.SaslAuthenticationException: Failed to create SaslClient with mechanism SCRAM-SHA-256 Caused by: javax.security.sasl.SaslException: Cannot instantiate service SASL/SCRAM Client Provider: SaslClientFactory.SCRAM-SHA-256 -> org.apache.kafka.common.security.scram.internals.ScramSaslClient$ScramSaslClientFactory [Caused by java.security.NoSuchAlgorithmException: class configured for SaslClientFactory (provider: SASL/SCRAM Client Provider) cannot be found.] at javax.security.sasl.Sasl.loadFactory(Sasl.java:460) at javax.security.sasl.Sasl.createSaslClient(Sasl.java:431) at org.apache.kafka.common.security.authenticator.SaslClientAuthenticator.lambda$createSaslClient$0(SaslClientAuthenticator.java:219) at java.security.AccessController.doPrivileged(AccessController.java:145) at javax.security.auth.Subject.doAs(Subject.java:36) at org.apache.kafka.common.security.authenticator.SaslClientAuthenticator.createSaslClient(SaslClientAuthenticator.java:215) at org.apache.kafka.common.security.authenticator.SaslClientAuthenticator.<init>(SaslClientAuthenticator.java:206) at org.apache.kafka.common.network.SaslChannelBuilder.buildClientAuthenticator(SaslChannelBuilder.java:287) at org.apache.kafka.common.network.SaslChannelBuilder.lambda$buildChannel$1(SaslChannelBuilder.java:228) at org.apache.kafka.common.network.KafkaChannel.<init>(KafkaChannel.java:143) at org.apache.kafka.common.network.SaslChannelBuilder.buildChannel(SaslChannelBuilder.java:236) at org.apache.kafka.common.network.Selector.buildAndAttachKafkaChannel(Selector.java:338) at org.apache.kafka.common.network.Selector.registerChannel(Selector.java:329) at org.apache.kafka.common.network.Selector.connect(Selector.java:256) at org.apache.kafka.clients.NetworkClient.initiateConnect(NetworkClient.java:987) at org.apache.kafka.clients.NetworkClient.access$600(NetworkClient.java:73) at org.apache.kafka.clients.NetworkClient$DefaultMetadataUpdater.maybeUpdate(NetworkClient.java:1158) at org.apache.kafka.clients.NetworkClient$DefaultMetadataUpdater.maybeUpdate(NetworkClient.java:1046) at org.apache.kafka.clients.NetworkClient.poll(NetworkClient.java:559) at org.apache.kafka.clients.consumer.internals.ConsumerNetworkClient.poll(ConsumerNetworkClient.java:265) at org.apache.kafka.clients.consumer.internals.ConsumerNetworkClient.poll(ConsumerNetworkClient.java:236) at org.apache.kafka.clients.consumer.internals.ConsumerNetworkClient.poll(ConsumerNetworkClient.java:227) at org.apache.kafka.clients.consumer.internals.ConsumerNetworkClient.awaitMetadataUpdate(ConsumerNetworkClient.java:164) at org.apache.kafka.clients.consumer.internals.AbstractCoordinator.ensureCoordinatorReady(AbstractCoordinator.java:257) at org.apache.kafka.clients.consumer.internals.ConsumerCoordinator.poll(ConsumerCoordinator.java:480) at org.apache.kafka.clients.consumer.KafkaConsumer.updateAssignmentMetadataIfNeeded(KafkaConsumer.java:1261) at org.apache.kafka.clients.consumer.KafkaConsumer.poll(KafkaConsumer.java:1230) at org.apache.kafka.clients.consumer.KafkaConsumer.poll(KafkaConsumer.java:1210) at io.smallrye.reactive.messaging.kafka.impl.ReactiveKafkaConsumer.lambda$poll$4(ReactiveKafkaConsumer.java:127) at io.smallrye.reactive.messaging.kafka.impl.ReactiveKafkaConsumer.lambda$runOnPollingThread$0(ReactiveKafkaConsumer.java:96) at io.smallrye.context.impl.wrappers.SlowContextualSupplier.get(SlowContextualSupplier.java:21) at io.smallrye.mutiny.operators.uni.builders.UniCreateFromItemSupplier.subscribe(UniCreateFromItemSupplier.java:28) at io.smallrye.mutiny.operators.AbstractUni.subscribe(AbstractUni.java:36) at io.smallrye.mutiny.operators.uni.UniRunSubscribeOn.lambda$subscribe$0(UniRunSubscribeOn.java:27) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) at java.util.concurrent.FutureTask.run(FutureTask.java:264) at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:304) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) at java.lang.Thread.run(Thread.java:829) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:553) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) Caused by: java.security.NoSuchAlgorithmException: class configured for SaslClientFactory (provider: SASL/SCRAM Client Provider) cannot be found. at java.security.Provider$Service.getImplClass(Provider.java:1933) at java.security.Provider$Service.newInstance(Provider.java:1894) at javax.security.sasl.Sasl.loadFactory(Sasl.java:458) ... 41 more Caused by: java.lang.ClassNotFoundException: org.apache.kafka.common.security.scram.internals.ScramSaslClient$ScramSaslClientFactory at com.oracle.svm.core.hub.ClassForNameSupport.forName(ClassForNameSupport.java:64) at java.lang.ClassLoader.loadClass(ClassLoader.java:290) at java.security.Provider$Service.getImplClass(Provider.java:1920) ... 43 more ```

659ef7abf9ae2cf7ee958f96b34fec3ebf84649c

bb005a577218d59b8bedae74ceadbe4d111de1af

https://github.com/quarkusio/quarkus/compare/659ef7abf9ae2cf7ee958f96b34fec3ebf84649c...bb005a577218d59b8bedae74ceadbe4d111de1af

diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java index 5e797c4b83c..b1be4d68871 100644 --- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java +++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java @@ -18,12 +18,14 @@ import org.apache.kafka.clients.producer.Partitioner; import org.apache.kafka.clients.producer.ProducerInterceptor; import org.apache.kafka.clients.producer.internals.DefaultPartitioner; +import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.common.security.authenticator.AbstractLogin; import org.apache.kafka.common.security.authenticator.DefaultLogin; import org.apache.kafka.common.security.authenticator.SaslClientCallbackHandler; import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken; import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerRefreshingLogin; import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerSaslClient; +import org.apache.kafka.common.security.scram.internals.ScramSaslClient; import org.apache.kafka.common.serialization.ByteArrayDeserializer; import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.common.serialization.ByteBufferDeserializer; @@ -44,6 +46,7 @@ import org.apache.kafka.common.serialization.ShortSerializer; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; +import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.Type; @@ -408,12 +411,21 @@ public AdditionalBeanBuildItem runtimeConfig() { @BuildStep public void withSasl(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, - BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) { + BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy, + BuildProducer<ExtensionSslNativeSupportBuildItem> sslNativeSupport) { reflectiveClass .produce(new ReflectiveClassBuildItem(false, false, AbstractLogin.DefaultLoginCallbackHandler.class)); reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, SaslClientCallbackHandler.class)); reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, DefaultLogin.class)); + reflectiveClass + .produce(new ReflectiveClassBuildItem(true, false, false, ScramSaslClient.ScramSaslClientFactory.class)); + + // Enable SSL support if kafka.security.protocol is set to something other than PLAINTEXT, which is the default + String securityProtocol = ConfigProvider.getConfig().getConfigValue("kafka.security.protocol").getValue(); + if (securityProtocol != null && SecurityProtocol.forName(securityProtocol) != SecurityProtocol.PLAINTEXT) { + sslNativeSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.KAFKA_CLIENT)); + } final Type loginModuleType = Type .create(DotName.createSimple(LoginModule.class.getName()), Kind.CLASS);

['extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.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/18139/18117

quarkusio

quarkus

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

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

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

close

Injecting from another module causes ClassNotFoundException in dev mode

## Describe the bug The class to be injected is located in another module in the project dependency. During the `quarkusDev`, injection fails with `java.lang.ClassNotFoundException`. Both main project and dependency have beans.xml. If the injected class is moved to the main project, injection works. It also works when running the jar directly (`java -jar service1/build/quarkus-app/quarkus-run.jar`).c So this seems to only be a dev mode issue. ### Expected behavior Class should be injected without error. ### Actual behavior `ClassNotFoundException: my.project.plugin.Plugin` ## To Reproduce `service1` in https://github.com/mweber03/quarkus-test Steps to reproduce the behavior: 1. `./gradlew build service1:quarkusDev` ## Environment (please complete the following information): ### Output of `uname -a` or `ver` Ubuntu 20.04 ### Output of `java -version` OpenJDK 11.0.11 ### Quarkus version or git rev Quarkus 1.13.7 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 6.8.3

9ce4a096185e3c9a7553d7541e9670cb06fc095c

36fcef67b772b9e35b144f39144d994ceebab99e

https://github.com/quarkusio/quarkus/compare/9ce4a096185e3c9a7553d7541e9670cb06fc095c...36fcef67b772b9e35b144f39144d994ceebab99e

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java index b8f6e9829a2..5e45d940f74 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java @@ -51,6 +51,7 @@ import io.quarkus.bootstrap.resolver.AppModelResolverException; import io.quarkus.deployment.dev.DevModeContext; import io.quarkus.deployment.dev.QuarkusDevModeLauncher; +import io.quarkus.gradle.QuarkusPlugin; import io.quarkus.runtime.LaunchMode; public class QuarkusDev extends QuarkusTask { @@ -335,7 +336,7 @@ private void addSelfWithLocalDeps(Project project, GradleDevModeLauncher.Builder if (!visited.add(project.getPath())) { return; } - final Configuration compileCp = project.getConfigurations().findByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME); + final Configuration compileCp = project.getConfigurations().findByName(QuarkusPlugin.DEV_MODE_CONFIGURATION_NAME); if (compileCp != null) { compileCp.getIncoming().getDependencies().forEach(d -> { if (d instanceof ProjectDependency) {

['devtools/gradle/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/18551/18521

quarkusio

quarkus

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

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

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

fix

Utf-8 graphql issue with non ascii chars

## Describe the bug Utf-8 chars like german umlauts are not usable. ### Expected behavior Special chars should work like normal chars. ### Actual behavior Special chars like german ä, ö, ü are replaced by things like ü ## To Reproduce Or attach an archive containing the reproducer to the issue. [code-with-quarkus_graphql_utf8.zip](https://github.com/quarkusio/quarkus/files/6783786/code-with-quarkus_graphql_utf8.zip) Steps to reproduce the behavior: 1. Send the example query via dev ui or intellij http request. 2. The response does contain destroyed umlauts. ``` Example Query: query test{ hello(string: "München") } Example response: { "data": { "hello": "München" } } Example Intellij http request: POST http://localhost:8080/graphql Content-Type: application/json {"query":"query test{\\n hello(string: \\"München\\")\\n}\\n","variables":null,"operationName":"test"} ### Output of `uname -a` or `ver` ### 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) ### Quarkus version or git rev 2.0.1.Final Problem could be here: io.quarkus.smallrye.graphql.runtime.SmallRyeGraphQLExecutionHandler#readBody return new String(bytes);

ba955f2a3f65e626a58f251fb9e4c94dd4602b3f

5c9936916e8c9dc6d86655cba62c0de11a7ebfad

https://github.com/quarkusio/quarkus/compare/ba955f2a3f65e626a58f251fb9e4c94dd4602b3f...5c9936916e8c9dc6d86655cba62c0de11a7ebfad

diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/AbstractGraphQLTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/AbstractGraphQLTest.java index fe1f8f6e67c..ba8dd7e1769 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/AbstractGraphQLTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/AbstractGraphQLTest.java @@ -14,12 +14,17 @@ import org.hamcrest.CoreMatchers; import io.restassured.RestAssured; +import io.restassured.parsing.Parser; /** * Some shared methods */ public abstract class AbstractGraphQLTest { + static { + RestAssured.registerParser("application/graphql+json", Parser.JSON); + } + protected void pingTest() { pingPongTest("ping", "pong"); } diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java index 7535660ca60..fed77846f4f 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java @@ -25,7 +25,6 @@ import io.quarkus.test.QuarkusUnitTest; import io.restassured.RestAssured; -import io.restassured.http.ContentType; /** * Testing scenarios which require CDI context propagation to work under the hood. @@ -51,8 +50,8 @@ public void testCdiContextPropagationForBatchSources() { "}"); RestAssured.given().when() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) + .accept(MEDIATYPE_JSON) + .contentType(MEDIATYPE_JSON) .body(pingRequest) .post("/graphql") .then() @@ -74,8 +73,8 @@ public void testCdiContextPropagationForBatchSourcesAsync() { "}"); RestAssured.given().when() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) + .accept(MEDIATYPE_JSON) + .contentType(MEDIATYPE_JSON) .body(pingRequest) .post("/graphql") .then() @@ -98,8 +97,8 @@ public void testManualContextPropagation() { "}"); RestAssured.given().when() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) + .accept(MEDIATYPE_JSON) + .contentType(MEDIATYPE_JSON) .body(pingRequest) .post("/graphql") .then() diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTest.java index b78f7b226a3..d380916f6c9 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTest.java @@ -2,6 +2,7 @@ import static io.quarkus.smallrye.graphql.deployment.AbstractGraphQLTest.MEDIATYPE_JSON; +import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; @@ -106,6 +107,67 @@ public void testSourcePost() { } + @Test + public void testWrongAcceptType() { + String fooRequest = getPayload("{\\n" + + " foo {\\n" + + " message\\n" + + " randomNumber{\\n" + + " value\\n" + + " }\\n" + + " list\\n" + + " }\\n" + + "}"); + + RestAssured.given().when() + .accept(MEDIATYPE_TEXT) + .contentType(MEDIATYPE_JSON) + .body(fooRequest) + .post("/graphql") + .then() + .assertThat() + .statusCode(406); + } + + @Test + public void testUTF8Charset() { + String fooRequest = getPayload("{\\n" + + " testCharset(characters:\\"óôöúüýáâäçéëí\\")\\n" + + "}"); + + byte[] response = RestAssured.given().when() + .body(fooRequest) + .post("/graphql") + .then() + .assertThat() + .statusCode(200) + .and() + .extract().body().asByteArray(); + + String decodedResponse = new String(response, Charset.forName("UTF-8")); + Assertions.assertTrue(decodedResponse.contains("{\\"data\\":{\\"testCharset\\":\\"óôöúüýáâäçéëí\\"}}")); + } + + @Test + public void testCP1250Charset() { + String fooRequest = getPayload("{\\n" + + " testCharset(characters:\\"óôöúüýáâäçéëí\\")\\n" + + "}"); + + byte[] response = RestAssured.given().when() + .accept("application/json;charset=CP1250") + .body(fooRequest) + .post("/graphql") + .then() + .assertThat() + .statusCode(200) + .and() + .extract().body().asByteArray(); + + String decodedResponse = new String(response, Charset.forName("CP1250")); + Assertions.assertTrue(decodedResponse.contains("{\\"data\\":{\\"testCharset\\":\\"óôöúüýáâäçéëí\\"}}")); + } + @Test public void testSourcePost2() { String foosRequest = getPayload("{\\n" + diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java index 0d117b54bb5..2f3acec11fb 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java @@ -26,7 +26,6 @@ import io.quarkus.test.QuarkusUnitTest; import io.restassured.RestAssured; -import io.restassured.http.ContentType; import io.smallrye.graphql.api.Context; public class SmallRyeGraphQLContextTestCase extends AbstractGraphQLTest { @@ -45,8 +44,8 @@ public void testAsyncQuery() { "}"); RestAssured.given().when() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) + .accept(MEDIATYPE_JSON) + .contentType(MEDIATYPE_JSON) .body(request) .post("/graphql") .then() @@ -68,8 +67,8 @@ public void testAsyncQueryWithAsyncSource() { "}"); RestAssured.given().when() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) + .accept(MEDIATYPE_JSON) + .contentType(MEDIATYPE_JSON) .body(request) .post("/graphql") .then() @@ -91,8 +90,8 @@ public void testManualPropagation() { "}"); RestAssured.given().when() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) + .accept(MEDIATYPE_JSON) + .contentType(MEDIATYPE_JSON) .body(request) .post("/graphql") .then() @@ -114,8 +113,8 @@ public void testSourceMethods() { "}"); RestAssured.given().when() - .accept(ContentType.JSON) - .contentType(ContentType.JSON) + .accept(MEDIATYPE_JSON) + .contentType(MEDIATYPE_JSON) .body(request) .post("/graphql") .then() diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestResource.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestResource.java index e260e19c0b3..d33d00a97ea 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestResource.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestResource.java @@ -61,6 +61,11 @@ public TestPojo moo(String name) { return new TestPojo(name); } + @Query + public String testCharset(String characters) { + return characters; + } + // <placeholder> public TestRandom getRandomNumber(@Source TestPojo testPojo) { diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java index 648dfdb1d55..5441b0d7a8d 100644 --- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java +++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java @@ -3,7 +3,6 @@ import java.io.StringReader; import javax.json.Json; -import javax.json.JsonBuilderFactory; import javax.json.JsonObject; import javax.json.JsonReader; import javax.json.JsonReaderFactory; @@ -28,8 +27,7 @@ public abstract class SmallRyeGraphQLAbstractHandler implements Handler<RoutingC private volatile ExecutionService executionService; - private static final JsonBuilderFactory jsonObjectFactory = Json.createBuilderFactory(null); - private static final JsonReaderFactory jsonReaderFactory = Json.createReaderFactory(null); + protected static final JsonReaderFactory jsonReaderFactory = Json.createReaderFactory(null); public SmallRyeGraphQLAbstractHandler( CurrentIdentityAssociation currentIdentityAssociation, diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java index 99af8227e95..3f59874e910 100644 --- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java +++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java @@ -4,14 +4,13 @@ import java.io.StringReader; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.List; import javax.json.Json; -import javax.json.JsonBuilderFactory; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonReader; -import javax.json.JsonReaderFactory; import io.quarkus.security.identity.CurrentIdentityAssociation; import io.quarkus.vertx.http.runtime.CurrentVertxRequest; @@ -34,9 +33,10 @@ public class SmallRyeGraphQLExecutionHandler extends SmallRyeGraphQLAbstractHand private static final String EXTENSIONS = "extensions"; private static final String APPLICATION_GRAPHQL = "application/graphql"; private static final String OK = "OK"; - - private static final JsonBuilderFactory jsonObjectFactory = Json.createBuilderFactory(null); - private static final JsonReaderFactory jsonReaderFactory = Json.createReaderFactory(null); + private static final String DEFAULT_RESPONSE_CONTENT_TYPE = "application/graphql+json; charset=" + + StandardCharsets.UTF_8.name(); + private static final String DEFAULT_REQUEST_CONTENT_TYPE = "application/json; charset=" + + StandardCharsets.UTF_8.name(); public SmallRyeGraphQLExecutionHandler(boolean allowGet, boolean allowPostWithQueryParameters, CurrentIdentityAssociation currentIdentityAssociation, @@ -48,25 +48,33 @@ public SmallRyeGraphQLExecutionHandler(boolean allowGet, boolean allowPostWithQu @Override protected void doHandle(final RoutingContext ctx) { - HttpServerRequest request = ctx.request(); HttpServerResponse response = ctx.response(); - response.headers().set(HttpHeaders.CONTENT_TYPE, "application/json; charset=UTF-8"); + String accept = getRequestAccept(ctx); + String requestedCharset = getCharset(accept); + + boolean isValid = isValidAcceptRequest(accept); - switch (request.method().name()) { - case "OPTIONS": - handleOptions(response); - break; - case "POST": - handlePost(response, ctx); - break; - case "GET": - handleGet(response, ctx); - break; - default: - ctx.next(); - break; + if (!isValid) { + handleInvalidAcceptRequest(response); + } else { + response.headers().set(HttpHeaders.CONTENT_TYPE, accept); + + switch (request.method().name()) { + case "OPTIONS": + handleOptions(response); + break; + case "POST": + handlePost(response, ctx, requestedCharset); + break; + case "GET": + handleGet(response, ctx, requestedCharset); + break; + default: + ctx.next(); + break; + } } } @@ -75,7 +83,7 @@ private void handleOptions(HttpServerResponse response) { response.setStatusCode(200).setStatusMessage(OK).end(); } - private void handlePost(HttpServerResponse response, RoutingContext ctx) { + private void handlePost(HttpServerResponse response, RoutingContext ctx, String requestedCharset) { try { JsonObject jsonObjectFromBody = getJsonObjectFromBody(ctx); String postResponse; @@ -87,13 +95,13 @@ private void handlePost(HttpServerResponse response, RoutingContext ctx) { } else { postResponse = doRequest(jsonObjectFromBody); } - response.setStatusCode(200).setStatusMessage(OK).end(Buffer.buffer(postResponse)); + response.setStatusCode(200).setStatusMessage(OK).end(Buffer.buffer(postResponse, requestedCharset)); } catch (IOException ex) { throw new RuntimeException(ex); } } - private void handleGet(HttpServerResponse response, RoutingContext ctx) { + private void handleGet(HttpServerResponse response, RoutingContext ctx, String requestedCharset) { if (allowGet) { try { JsonObject input = getJsonObjectFromQueryParameters(ctx); @@ -102,7 +110,7 @@ private void handleGet(HttpServerResponse response, RoutingContext ctx) { String getResponse = doRequest(input); response.setStatusCode(200) .setStatusMessage(OK) - .end(Buffer.buffer(getResponse)); + .end(Buffer.buffer(getResponse, requestedCharset)); } else { response.setStatusCode(204).end(); @@ -115,30 +123,34 @@ private void handleGet(HttpServerResponse response, RoutingContext ctx) { } } + private void handleInvalidAcceptRequest(HttpServerResponse response) { + response.setStatusCode(406).end(); + } + private JsonObject getJsonObjectFromQueryParameters(RoutingContext ctx) throws UnsupportedEncodingException { JsonObjectBuilder input = Json.createObjectBuilder(); // Query String query = stripNewlinesAndTabs(readQueryParameter(ctx, QUERY)); if (query != null && !query.isEmpty()) { - input.add(QUERY, URLDecoder.decode(query, "UTF8")); + input.add(QUERY, URLDecoder.decode(query, StandardCharsets.UTF_8.name())); } // OperationName String operationName = readQueryParameter(ctx, OPERATION_NAME); if (operationName != null && !operationName.isEmpty()) { - input.add(OPERATION_NAME, URLDecoder.decode(query, "UTF8")); + input.add(OPERATION_NAME, URLDecoder.decode(query, StandardCharsets.UTF_8.name())); } // Variables String variables = stripNewlinesAndTabs(readQueryParameter(ctx, VARIABLES)); if (variables != null && !variables.isEmpty()) { - JsonObject jsonObject = toJsonObject(URLDecoder.decode(variables, "UTF8")); + JsonObject jsonObject = toJsonObject(URLDecoder.decode(variables, StandardCharsets.UTF_8.name())); input.add(VARIABLES, jsonObject); } // Extensions String extensions = stripNewlinesAndTabs(readQueryParameter(ctx, EXTENSIONS)); if (extensions != null && !extensions.isEmpty()) { - JsonObject jsonObject = toJsonObject(URLDecoder.decode(extensions, "UTF8")); + JsonObject jsonObject = toJsonObject(URLDecoder.decode(extensions, StandardCharsets.UTF_8.name())); input.add(EXTENSIONS, jsonObject); } @@ -147,7 +159,7 @@ private JsonObject getJsonObjectFromQueryParameters(RoutingContext ctx) throws U private JsonObject getJsonObjectFromBody(RoutingContext ctx) throws IOException { - String contentType = readContentType(ctx); + String contentType = getRequestContentType(ctx); String body = stripNewlinesAndTabs(readBody(ctx)); // If the content type is application/graphql, the query is in the body @@ -167,18 +179,43 @@ private JsonObject getJsonObjectFromBody(RoutingContext ctx) throws IOException private String readBody(RoutingContext ctx) { if (ctx.getBody() != null) { - byte[] bytes = ctx.getBody().getBytes(); - return new String(bytes); + return ctx.getBodyAsString(); } return null; } - private String readContentType(RoutingContext ctx) { + private String getRequestContentType(RoutingContext ctx) { String contentType = ctx.request().getHeader("Content-Type"); - if (contentType != null && !contentType.isEmpty()) { + if (contentType != null && !contentType.isEmpty() && !contentType.startsWith("*/*")) { return contentType; } - return null; + return DEFAULT_REQUEST_CONTENT_TYPE; + } + + private String getRequestAccept(RoutingContext ctx) { + String accept = ctx.request().getHeader("Accept"); + if (accept != null && !accept.isEmpty() && !accept.startsWith("*/*")) { + return accept; + } + return DEFAULT_RESPONSE_CONTENT_TYPE; + } + + private String getCharset(String mimeType) { + if (mimeType != null && mimeType.contains(";")) { + String[] parts = mimeType.split(";"); + for (String part : parts) { + if (part.trim().startsWith("charset")) { + return part.split("=")[1]; + } + } + } + return StandardCharsets.UTF_8.name(); + } + + private boolean isValidAcceptRequest(String mimeType) { + // At this point we only accept two + return mimeType.startsWith("application/json") + || mimeType.startsWith("application/graphql+json"); } private String readQueryParameter(RoutingContext ctx, String parameterName) {

['extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestResource.java', 'extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java', 'extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java', 'extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/AbstractGraphQLTest.java', 'extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java', 'extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java', 'extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTest.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/18523/18495

quarkusio

quarkus

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

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

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

fixes

Update to 2.0.1.Final breaks working Kafka deserializer configuration in 1.x

## Describe the bug Changing pom.xml from 1.x to 2.0.1.Final prevents successful Dev Mode startup with exception. ### Expected behavior No errors during startup like before with 1.x ### Actual behavior Exception during startup is thrown: ``` 2021-07-07 17:06:06,364 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.deployment.steps.ConfigGenerationBuildStep#generateConfigClass threw an exception: java.lang.IllegalStateException: More than one default value for mp.messaging.incoming.created.value.deserializer was produced at io.quarkus.deployment.steps.ConfigGenerationBuildStep.generateConfigClass(ConfigGenerationBuildStep.java:64) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at io.quarkus.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:820) at io.quarkus.builder.BuildContext.run(BuildContext.java:277) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2442) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1476) at java.base/java.lang.Thread.run(Thread.java:829) at org.jboss.threads.JBossThread.run(JBossThread.java:501) at io.quarkus.runner.bootstrap.AugmentActionImpl.runAugment(AugmentActionImpl.java:414) at io.quarkus.runner.bootstrap.AugmentActionImpl.createInitialRuntimeApplication(AugmentActionImpl.java:274) at io.quarkus.runner.bootstrap.AugmentActionImpl.createInitialRuntimeApplication(AugmentActionImpl.java:66) at io.quarkus.deployment.dev.IsolatedDevModeMain.firstStart(IsolatedDevModeMain.java:87) at io.quarkus.deployment.dev.IsolatedDevModeMain.accept(IsolatedDevModeMain.java:448) at io.quarkus.deployment.dev.IsolatedDevModeMain.accept(IsolatedDevModeMain.java:61) at io.quarkus.bootstrap.app.CuratedApplication.runInCl(CuratedApplication.java:132) at io.quarkus.bootstrap.app.CuratedApplication.runInAugmentClassLoader(CuratedApplication.java:89) at io.quarkus.deployment.dev.DevModeMain.start(DevModeMain.java:145) at io.quarkus.deployment.dev.DevModeMain.main(DevModeMain.java:63) Caused by: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.deployment.steps.ConfigGenerationBuildStep#generateConfigClass threw an exception: java.lang.IllegalStateException: More than one default value for mp.messaging.incoming.created.value.deserializer was produced at io.quarkus.deployment.steps.ConfigGenerationBuildStep.generateConfigClass(ConfigGenerationBuildStep.java:64) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at io.quarkus.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:820) at io.quarkus.builder.BuildContext.run(BuildContext.java:277) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2442) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1476) at java.base/java.lang.Thread.run(Thread.java:829) at org.jboss.threads.JBossThread.run(JBossThread.java:501) at io.quarkus.builder.Execution.run(Execution.java:116) at io.quarkus.builder.BuildExecutionBuilder.execute(BuildExecutionBuilder.java:79) at io.quarkus.deployment.QuarkusAugmentor.run(QuarkusAugmentor.java:156) at io.quarkus.runner.bootstrap.AugmentActionImpl.runAugment(AugmentActionImpl.java:412) ... 9 more Caused by: java.lang.IllegalStateException: More than one default value for mp.messaging.incoming.created.value.deserializer was produced at io.quarkus.deployment.steps.ConfigGenerationBuildStep.generateConfigClass(ConfigGenerationBuildStep.java:64) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at io.quarkus.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:820) at io.quarkus.builder.BuildContext.run(BuildContext.java:277) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2442) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1476) at java.base/java.lang.Thread.run(Thread.java:829) at org.jboss.threads.JBossThread.run(JBossThread.java:501) ``` ## To Reproduce Could not reproduce with quarkus-quickstarts/kafka-panache-reactive-quickstart, but there isn't any quickstart utilising deserializers. ### Configuration according to [Serializing via JSON-B](https://quarkus.io/guides/kafka#jsonb-serialization) ```properties # Add your application.properties here, if applicable. # Configure the Kafka sink (we write to it) mp.messaging.outgoing.entry-created.connector=smallrye-kafka mp.messaging.outgoing.entry-created.topic=created mp.messaging.outgoing.entry-created.value.serializer=io.quarkus.kafka.client.serialization.JsonbSerializer # Configure the Kafka source (we read from it) mp.messaging.incoming.created.connector=smallrye-kafka mp.messaging.incoming.created.topic=created mp.messaging.incoming.created.broadcast=true mp.messaging.incoming.created.value.deserializer=me.cligg.dto.MyCacheEntryDeserializer ``` ### Screenshots (If applicable, add screenshots to help explain your problem.) ## Environment (please complete the following information): ### Output of `uname -a` or `ver` Linux fedora 5.12.13-300.fc34.x86_64 #1 SMP Wed Jun 23 16:18:11 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "11.0.11" 2021-04-20 OpenJDK Runtime Environment 18.9 (build 11.0.11+9) OpenJDK 64-Bit Server VM 18.9 (build 11.0.11+9, mixed mode, sharing) ### GraalVM version (if different from Java) ### Quarkus version or git rev <quarkus-plugin.version>2.0.1.Final</quarkus-plugin.version> <quarkus.platform.version>2.0.1.Final</quarkus.platform.version> ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.1 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d) Maven home: /home/torben/.m2/wrapper/dists/apache-maven-3.8.1-bin/2l5mhf2pq2clrde7f7qp1rdt5m/apache-maven-3.8.1 Java version: 11.0.11, vendor: Red Hat, Inc., runtime: /usr/lib/jvm/java-11-openjdk-11.0.11.0.9-4.fc34.x86_64 Default locale: en_US, platform encoding: UTF-8 OS name: "linux", version: "5.12.13-300.fc34.x86_64", arch: "amd64", family: "unix" ## Additional context (Add any other context about the problem here.)

61f3f0d1d3b43ae5a06a3f2d074f5ccd03ddb562

366573d2d4517b4442a6aed290e9089bc021e287

https://github.com/quarkusio/quarkus/compare/61f3f0d1d3b43ae5a06a3f2d074f5ccd03ddb562...366573d2d4517b4442a6aed290e9089bc021e287

diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java index f4740fe5924..b6bade7d88c 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java @@ -19,6 +19,7 @@ class DefaultSerdeDiscoveryState { private final IndexView index; private final Map<String, Boolean> isKafkaConnector = new HashMap<>(); + private final Map<String, String> serdeConfigMap = new HashMap<>(); private Boolean hasConfluent; private Boolean hasApicurio1; @@ -40,6 +41,13 @@ boolean isKafkaConnector(boolean incoming, String channelName) { }); } + void runIfConfigIsAbsent(String key, String value, Runnable runnable) { + if (value != null && !serdeConfigMap.containsKey(key)) { + serdeConfigMap.put(key, value); + runnable.run(); + } + } + boolean isAvroGenerated(DotName className) { ClassInfo clazz = index.getClassByName(className); return clazz != null && clazz.classAnnotation(DotNames.AVRO_GENERATED) != null; diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java index 2687f5f4a0f..3fbec6398fe 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java @@ -65,14 +65,10 @@ void discoverDefaultSerdeConfig(DefaultSerdeDiscoveryState discovery, MethodInfo method = annotation.target().asMethod(); processIncomingMethod(discovery, method, (keyDeserializer, valueDeserializer) -> { - if (keyDeserializer != null) { - config.produce(new RunTimeConfigurationDefaultBuildItem( - "mp.messaging.incoming." + channelName + ".key.deserializer", keyDeserializer)); - } - if (valueDeserializer != null) { - config.produce(new RunTimeConfigurationDefaultBuildItem( - "mp.messaging.incoming." + channelName + ".value.deserializer", valueDeserializer)); - } + produceRuntimeConfigurationDefaultBuildItem(discovery, config, + "mp.messaging.incoming." + channelName + ".key.deserializer", keyDeserializer); + produceRuntimeConfigurationDefaultBuildItem(discovery, config, + "mp.messaging.incoming." + channelName + ".value.deserializer", valueDeserializer); }); } @@ -85,14 +81,10 @@ void discoverDefaultSerdeConfig(DefaultSerdeDiscoveryState discovery, MethodInfo method = annotation.target().asMethod(); processOutgoingMethod(discovery, method, (keySerializer, valueSerializer) -> { - if (keySerializer != null) { - config.produce(new RunTimeConfigurationDefaultBuildItem( - "mp.messaging.outgoing." + channelName + ".key.serializer", keySerializer)); - } - if (valueSerializer != null) { - config.produce(new RunTimeConfigurationDefaultBuildItem( - "mp.messaging.outgoing." + channelName + ".value.serializer", valueSerializer)); - } + produceRuntimeConfigurationDefaultBuildItem(discovery, config, + "mp.messaging.outgoing." + channelName + ".key.serializer", keySerializer); + produceRuntimeConfigurationDefaultBuildItem(discovery, config, + "mp.messaging.outgoing." + channelName + ".value.serializer", valueSerializer); }); } @@ -117,29 +109,27 @@ void discoverDefaultSerdeConfig(DefaultSerdeDiscoveryState discovery, } processIncomingChannelInjectionPoint(discovery, injectionPointType, (keyDeserializer, valueDeserializer) -> { - if (keyDeserializer != null) { - config.produce(new RunTimeConfigurationDefaultBuildItem( - "mp.messaging.incoming." + channelName + ".key.deserializer", keyDeserializer)); - } - if (valueDeserializer != null) { - config.produce(new RunTimeConfigurationDefaultBuildItem( - "mp.messaging.incoming." + channelName + ".value.deserializer", valueDeserializer)); - } + produceRuntimeConfigurationDefaultBuildItem(discovery, config, + "mp.messaging.incoming." + channelName + ".key.deserializer", keyDeserializer); + produceRuntimeConfigurationDefaultBuildItem(discovery, config, + "mp.messaging.incoming." + channelName + ".value.deserializer", valueDeserializer); }); processOutgoingChannelInjectionPoint(discovery, injectionPointType, (keySerializer, valueSerializer) -> { - if (keySerializer != null) { - config.produce(new RunTimeConfigurationDefaultBuildItem( - "mp.messaging.outgoing." + channelName + ".key.serializer", keySerializer)); - } - if (valueSerializer != null) { - config.produce(new RunTimeConfigurationDefaultBuildItem( - "mp.messaging.outgoing." + channelName + ".value.serializer", valueSerializer)); - } + produceRuntimeConfigurationDefaultBuildItem(discovery, config, + "mp.messaging.outgoing." + channelName + ".key.serializer", keySerializer); + produceRuntimeConfigurationDefaultBuildItem(discovery, config, + "mp.messaging.outgoing." + channelName + ".value.serializer", valueSerializer); }); } } + void produceRuntimeConfigurationDefaultBuildItem(DefaultSerdeDiscoveryState discovery, + BuildProducer<RunTimeConfigurationDefaultBuildItem> config, String key, String value) { + discovery.runIfConfigIsAbsent(key, value, + () -> config.produce(new RunTimeConfigurationDefaultBuildItem(key, value))); + } + private void processIncomingMethod(DefaultSerdeDiscoveryState discovery, MethodInfo method, BiConsumer<String, String> deserializerAcceptor) { List<Type> parameterTypes = method.parameters(); diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java index b4c3dcfe3c3..69a35ba4c73 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java @@ -55,7 +55,7 @@ boolean isKafkaConnector(boolean incoming, String channelName) { assertThat(configs) .extracting(RunTimeConfigurationDefaultBuildItem::getKey, RunTimeConfigurationDefaultBuildItem::getValue) - .containsOnly(expectations); + .containsExactlyInAnyOrder(expectations); } private static IndexView index(Class<?>... classes) { @@ -1977,4 +1977,62 @@ private static class FloatJsonArrayInShortByteArrayOut { @Channel("channel25") Multi<ConsumerRecord<Float, JsonArray>> consumer25; } + + @Test + void produceDefaultConfigOnce() { + // @formatter:off + Tuple[] expectations = { + tuple("mp.messaging.outgoing.channel1.value.serializer", "io.quarkus.smallrye.reactivemessaging.kafka.deployment.DefaultSerdeConfigTest$JsonbDtoSerializer"), + tuple("mp.messaging.incoming.channel2.value.deserializer", "io.quarkus.smallrye.reactivemessaging.kafka.deployment.DefaultSerdeConfigTest$JacksonDtoDeserializer"), + tuple("mp.messaging.incoming.channel3.key.deserializer", "org.apache.kafka.common.serialization.IntegerDeserializer"), + tuple("mp.messaging.incoming.channel3.value.deserializer", "io.quarkus.smallrye.reactivemessaging.kafka.deployment.DefaultSerdeConfigTest$JacksonDtoDeserializer"), + tuple("mp.messaging.outgoing.channel4.key.serializer", "org.apache.kafka.common.serialization.StringSerializer"), + tuple("mp.messaging.outgoing.channel4.value.serializer", "org.apache.kafka.common.serialization.IntegerSerializer"), + }; + // @formatter:on + + doTest(expectations, JsonbDto.class, JsonbDtoSerializer.class, JacksonDto.class, JacksonDtoDeserializer.class, + MultipleChannels.class); + } + + private static class MultipleChannels { + + @Channel("channel1") + Emitter<JsonbDto> emitter1; + + @Outgoing("channel1") + Publisher<Message<JsonbDto>> method1() { + return null; + } + + @Outgoing("channel1") + Publisher<JsonbDto> method1Duplicate() { + return null; + } + + @Channel("channel2") + Multi<JacksonDto> channel2; + + @Incoming("channel2") + void channel2Duplicate(JacksonDto jacksonDto) { + + } + + @Channel("channel3") + Multi<Record<Integer, JacksonDto>> channel3; + + @Incoming("channel3") + void channel3Duplicate(Record<Integer, JacksonDto> jacksonDto) { + + } + + @Channel("channel4") + Emitter<ProducerRecord<String, Integer>> emitterChannel4; + + @Outgoing("channel4") + ProducerRecord<String, Integer> method4() { + return null; + }; + + } }

['extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java', 'extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java', 'extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.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/18496/18486

quarkusio

quarkus

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

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

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

fixes

Quarkus 2.0.1: Reflective access broken for Jackson (de)serialization / inheritance/polymorphism

## Describe the bug We've bumped Quarkus from 2.0.0.Final to 2.0.1.Final and our integration-tests against a Quarkus native image build fail since Quarkus 2.0.1. [Nessie commit with successful CI run before the Quarkus version bump](https://github.com/projectnessie/nessie/commit/ddde10d8fffdf59ab1000a4c87e2a8cc26adccf8) [Nessie commit with failing CI run for the Quarkus version bump](https://github.com/projectnessie/nessie/commit/ddde10d8fffdf59ab1000a4c87e2a8cc26adccf8) I've bisect'ed the changes and found that 0561a58ad83a42aeaa1695d206ca22558bc4ef33 causes the bug. Since JSON deserialization only fails against a native image but works fine in a "proper JVM", it makes sense that this Quarkus commit breaks something. Jackson does some reflective access to find `builder()` and related methods. Quarkus' `ReflectiveHierarchyStep` provides the reflection-information for native images. Since Jackson cannot find these methods anymore, it errors out. It's related to polymorphism. Nessie's [`IcebergTable`](https://github.com/projectnessie/nessie/blob/main/model/src/main/java/org/projectnessie/model/IcebergTable.java) class is probably the first class being found (it's mentioned 1st in the annotations) and it's reflection-information is correctly added and (de)serialization for that class workds - but other types like [`SqlView`](https://github.com/projectnessie/nessie/blob/main/model/src/main/java/org/projectnessie/model/SqlView.java) seem to be no longer processed since that commit, have no reflection information and therefore cause (de)serialization issues. Both classes extend [`Contents`](https://github.com/projectnessie/nessie/blob/040a2955834b8a263d55c2c32c0fd26d34e639c0/model/src/main/java/org/projectnessie/model/Contents.java). Repro steps (the Quarkus version can be updated in the top-level-pom around line 135: * Clone https://github.com/projectnessie/nessie * `./mvnw clean install -DskipTests && ./mvnw clean install -Pnative -pl servers/quarkus-server/` `git bisect` log: ``` # bad: [e21b905817188d19a76886847409020d0aa6b530] Add missing nexus-staging-maven-plugin.version to bootstrap parent pom # good: [e8ceb2f63ac142ff57448aaa85279fe14ee2ab6d] Fix actionable error message in Quartz scheduling git bisect start 'e21b905817188d19a76886847409020d0aa6b530' 'e8ceb2f63ac142ff57448aaa85279fe14ee2ab6d' # good: [9c7030212f127bdd67f0907b8450d7371e00b97d] Introduce the ability to use deep mocks in @InjectMock git bisect good 9c7030212f127bdd67f0907b8450d7371e00b97d # good: [4c7618177932b16b5aa0e14a431aadb87e74f92a] Update log levels when running mvn quarkus:test git bisect good 4c7618177932b16b5aa0e14a431aadb87e74f92a # bad: [017d4fd71eb3f55d52008e018cf080b35dddbcd3] GraphQL client configuration rework git bisect bad 017d4fd71eb3f55d52008e018cf080b35dddbcd3 # good: [1d1c273de101b9e0cc24dc183054e63c83d2d7f3] Registry client config (de)serialization tests and fixes git bisect good 1d1c273de101b9e0cc24dc183054e63c83d2d7f3 # bad: [c23a65b44917d52edbdd4f7f9bcdd11c63a514ee] Add quarkus config properties for SmallRye GraphQL Client git bisect bad c23a65b44917d52edbdd4f7f9bcdd11c63a514ee # bad: [61b88690dee13bbd5112eeb706d31488865023ba] Fix native error with OTLP exporter for OpenTelemetry git bisect bad 61b88690dee13bbd5112eeb706d31488865023ba # bad: [0561a58ad83a42aeaa1695d206ca22558bc4ef33] Fixed StackOverflowError building reflective hierarchy git bisect bad 0561a58ad83a42aeaa1695d206ca22558bc4ef33 # first bad commit: [0561a58ad83a42aeaa1695d206ca22558bc4ef33] Fixed StackOverflowError building reflective hierarchy ``` /cc @aloubyansky

b6e0754b81a541ff69b0f1f8dec436067c4a5614

093a4a729bfe2ed33e7e224d0af548156982a52f

https://github.com/quarkusio/quarkus/compare/b6e0754b81a541ff69b0f1f8dec436067c4a5614...093a4a729bfe2ed33e7e224d0af548156982a52f

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java index 9bddde0f2df..050e5421b2c 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java @@ -120,8 +120,7 @@ private void addReflectiveHierarchy(CombinedIndexBuildItem combinedIndexBuildIte type instanceof UnresolvedTypeVariable) { return; } else if (type instanceof ClassType) { - if (reflectiveHierarchyBuildItem.getIgnoreTypePredicate().test(type.name()) - || processedReflectiveHierarchies.contains(type.name())) { + if (reflectiveHierarchyBuildItem.getIgnoreTypePredicate().test(type.name())) { return; }

['core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.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/18472/18439

quarkusio

quarkus

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

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

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

fixes

mutable-jar build breaks docker cache

## Describe the bug When the package type is set to `mutable-jar`, the resulting build-system.properties file changes trivially every build. This causes the "COPY lib" Dockerfile command to generate a duplicate layer. This causes very large layers (>150Mi) to be unnecessarily pushed to a docker repository. ### Expected behavior The Dockerfile contains the comment: > \\# We make four distinct layers so if there are application changes the library layers can be re-used This indicates that the docker library layer is intended to be reused if the libraries don't change. ### Actual behavior In the Quarkus gradle build system, while assembling the app for the `mutable-jar` package type, it collects all passed system properties that start with `quarkus.` and write them out to the file `build-system.properties` in the path `build/quarkus-app/lib/deployment/` using the built-in `java.util.Properties#store()` method. This causes a comment line to be added to the file with the current timestamp. There is no way to turn off this behaviour using this mechanism. This causes the `build-system.properties` file to be different each time and therefore defeating the docker layer cache. ## To Reproduce https://github.com/cherrydev/quarkus-docker-layer-demo Steps to reproduce the behavior: * `$ ./mvnw package -Dquarkus.package.type=mutable-jar` * Examine `target/quarkus-app/lib/deployment/built-system.properties` file. * Note the timestamp on the second line of file * re-run `$ ./mvnw package -Dquarkus.package.type=mutable-jar` * Note a different timestamp on the file ## Environment (please complete the following information): ### Output of `uname -a` or `ver` Darwin [redacted] 20.5.0 Darwin Kernel Version 20.5.0: Sat May 8 05:10:33 PDT 2021; root:xnu-7195.121.3~9/RELEASE_X86_64 x86_64 ### Output of `java -version` openjdk version "11.0.11" 2021-04-20 LTS ### GraalVM version (if different from Java) ### Quarkus version or git rev 2.0.0.FInal ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.1 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d) ## Additional context This is trivial to fix, though not very clean without re-implementing `java.util.Properties#store()`. In `JarResultBuildStep` in the `quarkus-core-deployment` project, just pass `Properties#store()` an intermediary `StringWriter`, split up the resulting string by lines and output all the lines other than the second one into the file. In my current project, this is saving 150Mi of duplicated docker layers each time I push them to my repository.

919be8756a77d9438699cfd200ddb58d8d339039

7e50de02215082244b651d607ae82592341bd0ff

https://github.com/quarkusio/quarkus/compare/919be8756a77d9438699cfd200ddb58d8d339039...7e50de02215082244b651d607ae82592341bd0ff

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/mutability/DevModeTask.java b/core/deployment/src/main/java/io/quarkus/deployment/mutability/DevModeTask.java index 28b533153b4..297a94b3752 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/mutability/DevModeTask.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/mutability/DevModeTask.java @@ -3,6 +3,7 @@ import static io.quarkus.deployment.pkg.steps.JarResultBuildStep.BUILD_SYSTEM_PROPERTIES; import static io.quarkus.deployment.pkg.steps.JarResultBuildStep.DEPLOYMENT_LIB; import static io.quarkus.deployment.pkg.steps.JarResultBuildStep.LIB; +import static io.quarkus.deployment.pkg.steps.JarResultBuildStep.QUARKUS; import java.io.Closeable; import java.io.IOException; @@ -42,7 +43,7 @@ public static Closeable main(Path appRoot) throws Exception { Files.newInputStream(appRoot.resolve(LIB).resolve(DEPLOYMENT_LIB).resolve(JarResultBuildStep.APPMODEL_DAT)))) { Properties buildSystemProperties = new Properties(); try (InputStream buildIn = Files - .newInputStream(appRoot.resolve(LIB).resolve(DEPLOYMENT_LIB).resolve(BUILD_SYSTEM_PROPERTIES))) { + .newInputStream(appRoot.resolve(QUARKUS).resolve(BUILD_SYSTEM_PROPERTIES))) { buildSystemProperties.load(buildIn); } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/mutability/ReaugmentTask.java b/core/deployment/src/main/java/io/quarkus/deployment/mutability/ReaugmentTask.java index fca86f6e985..426e711b0db 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/mutability/ReaugmentTask.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/mutability/ReaugmentTask.java @@ -3,6 +3,7 @@ import static io.quarkus.deployment.pkg.steps.JarResultBuildStep.BUILD_SYSTEM_PROPERTIES; import static io.quarkus.deployment.pkg.steps.JarResultBuildStep.DEPLOYMENT_LIB; import static io.quarkus.deployment.pkg.steps.JarResultBuildStep.LIB; +import static io.quarkus.deployment.pkg.steps.JarResultBuildStep.QUARKUS; import java.io.InputStream; import java.io.ObjectInputStream; @@ -26,11 +27,12 @@ public class ReaugmentTask { public static void main(Path appRoot) throws Exception { Path deploymentLib = appRoot.resolve(LIB).resolve(DEPLOYMENT_LIB); + Path buildSystemProps = appRoot.resolve(QUARKUS).resolve(BUILD_SYSTEM_PROPERTIES); try (ObjectInputStream in = new ObjectInputStream( Files.newInputStream(deploymentLib.resolve(JarResultBuildStep.APPMODEL_DAT)))) { Properties buildSystemProperties = new Properties(); try (InputStream buildIn = Files - .newInputStream(deploymentLib.resolve(BUILD_SYSTEM_PROPERTIES))) { + .newInputStream(buildSystemProps)) { buildSystemProperties.load(buildIn); } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java index d9a75305c86..1850c6ab0f8 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java @@ -4,6 +4,7 @@ import java.io.BufferedInputStream; import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -11,6 +12,7 @@ import java.io.OutputStream; import java.io.UncheckedIOException; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.nio.file.FileAlreadyExistsException; import java.nio.file.FileSystem; import java.nio.file.FileVisitOption; @@ -704,6 +706,7 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem, if (packageConfig.type.equalsIgnoreCase(PackageConfig.MUTABLE_JAR)) { Path deploymentLib = libDir.resolve(DEPLOYMENT_LIB); + Path buildSystemProps = quarkus.resolve(BUILD_SYSTEM_PROPERTIES); Files.createDirectories(deploymentLib); for (AppDependency appDep : curateOutcomeBuildItem.getEffectiveModel().getFullDeploymentDeps()) { copyDependency(parentFirstKeys, outputTargetBuildItem, copiedArtifacts, deploymentLib, baseLib, jars, @@ -747,9 +750,17 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem, obj.writeObject(paths); obj.close(); } - Path buildSystemProps = deploymentLib.resolve(BUILD_SYSTEM_PROPERTIES); - try (OutputStream out = Files.newOutputStream(buildSystemProps)) { - outputTargetBuildItem.getBuildSystemProperties().store(out, "The original build properties"); + //we output the properties in a reproducible manner, so we remove the date comment + //and sort them + //we still use Properties to get the escaping right though, so basically we write out the lines + //to memory, split them, discard comments, sort them, then write them to disk + ByteArrayOutputStream out = new ByteArrayOutputStream(); + outputTargetBuildItem.getBuildSystemProperties().store(out, null); + List<String> lines = Arrays.stream(new String(out.toByteArray(), StandardCharsets.UTF_8).split("\\n")) + .filter(s -> !s.startsWith("#")).sorted().collect(Collectors.toList()); + + try (OutputStream fileOutput = Files.newOutputStream(buildSystemProps)) { + fileOutput.write(String.join("\\n", lines).getBytes(StandardCharsets.UTF_8)); } }

['core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java', 'core/deployment/src/main/java/io/quarkus/deployment/mutability/DevModeTask.java', 'core/deployment/src/main/java/io/quarkus/deployment/mutability/ReaugmentTask.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/18470/18445

quarkusio

quarkus

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

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

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

fixes

Quarkus Resteasy Reactive does not respect keep-alive when using Multi<>s

## Describe the bug Quarkus Resteasy Reactive kills connections even if Connection: keep-alive is specified and acknowledged by the server. The problem only occurs when returning Multi<>s, not when returning Uni<>s or synchronous results. A simple method such as ``` @GET public Multi<String> async(){ return Multi.createFrom().item("async"); } ``` and then calling `curl http://localhost:8080 http://localhost:8080 -v -H "Connection: keep-alive` reproduces the problem. ### Expected behavior Quarkus Resteasy Reactive should behave like non-reactive and keep the connection alive. ### Actual behavior The connection is dead after the first request. ## To Reproduce Small project based on the Quarkus Reactive quick-start. https://github.com/rasmusfaber/quarkus-resteasy-reactive-connection-drop Steps to reproduce the behavior: 1. Run the included tests and notice that `testHelloEndpointAsyncMulti` fails. Or 1. Build and start the application 2. Run `curl http://localhost:8081/hello/async http://localhost:8081/hello/async -v -H "Connection: keep-alive"` 3. Notice that the second connection fails and curl needs to create a new connection (compare with `curl http://localhost:8081/hello/sync http://localhost:8081/hello/sync -v -H "Connection: keep-alive"`) ## Environment (please complete the following information): ### Output of `uname -a` or `ver` Linux xxx 5.4.0-73-generic #82~18.04.1-Ubuntu SMP Fri Apr 16 15:10:02 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "15.0.2" 2021-01-19 OpenJDK Runtime Environment AdoptOpenJDK (build 15.0.2+7) OpenJDK 64-Bit Server VM AdoptOpenJDK (build 15.0.2+7, mixed mode, sharing) ### Quarkus version or git rev 2.0.0.Final (also 1.13.3.Final) ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) apache-maven-3.6.3

bd3cf79e20c1aba1b2c33baf7700bf29616e61bc

26a2506a58d330b5dd01e655f77071988931951f

https://github.com/quarkusio/quarkus/compare/bd3cf79e20c1aba1b2c33baf7700bf29616e61bc...26a2506a58d330b5dd01e655f77071988931951f

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 a4a20751170..ca3de29b2cb 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 @@ -1,9 +1,11 @@ package io.quarkus.resteasy.reactive.server.test.stream; import java.net.URI; +import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.Arrays; import java.util.List; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -28,6 +30,12 @@ import io.restassured.RestAssured; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.subscription.Cancellable; +import io.vertx.core.Handler; +import io.vertx.core.Vertx; +import io.vertx.core.http.HttpClient; +import io.vertx.core.http.HttpClientOptions; +import io.vertx.core.http.HttpClientRequest; +import io.vertx.core.http.HttpMethod; @DisabledOnOs(OS.WINDOWS) public class StreamTestCase { @@ -40,6 +48,56 @@ public class StreamTestCase { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(StreamResource.class)); + @Test + public void testStreamingDoesNotCloseConnection() throws Exception { + Vertx v = Vertx.vertx(); + try { + final CompletableFuture<Object> latch = new CompletableFuture<>(); + HttpClient client = v + .createHttpClient( + new HttpClientOptions().setKeepAlive(true).setIdleTimeout(10).setIdleTimeoutUnit(TimeUnit.SECONDS)); + sendRequest(latch, client, () -> sendRequest(latch, client, () -> latch.complete(null))); + + //should not have been closed + latch.get(); + + } finally { + v.close().toCompletionStage().toCompletableFuture().get(); + } + } + + private void sendRequest(CompletableFuture<Object> latch, HttpClient client, Runnable runnable) { + Handler<Throwable> failure = latch::completeExceptionally; + client.request(HttpMethod.GET, RestAssured.port, "localhost", "/stream/text/stream") + .onFailure(failure) + .onSuccess(new Handler<HttpClientRequest>() { + @Override + public void handle(HttpClientRequest event) { + event.end(); + event.connect().onFailure(failure) + .onSuccess(response -> { + response.request().connection().closeHandler(new Handler<Void>() { + @Override + public void handle(Void event) { + latch.completeExceptionally(new Throwable("Connection was closed")); + } + }); + response.body().onFailure(failure) + .onSuccess(buffer -> { + try { + Assertions.assertEquals("foobar", + buffer.toString(StandardCharsets.US_ASCII)); + } catch (Throwable t) { + latch.completeExceptionally(t); + } + runnable.run(); + }); + }); + + } + }); + } + @Test public void testStreaming() throws Exception { RestAssured.get("/stream/text/stream") 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 0b30d2e2714..edb1625f17b 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 @@ -135,10 +135,6 @@ public void onComplete() { // no need to cancel on complete // FIXME: are we interested in async completion? requestContext.serverResponse().end(); - // so, if I don't also close the connection, the client isn't notified that the request is over - // I guess that's true of chunked responses, but not clear why I need to close the connection - // because it means it can't get reused, right? - requestContext.serverRequest().closeConnection(); requestContext.close(); }

['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']

{'.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/18458/18268

quarkusio

quarkus

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

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

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

fixes

Hibernate Reactive: ReactiveSessionProducer blocks event loop thread

## Describe the bug Most likely since Quarkus 2.0.0.Alpha2 with the introduction of [these changes](https://github.com/quarkusio/quarkus/pull/16923), Hibernate Reactive can sometimes block the event loop thread forever if injecting `Mutiny.Session` via the `ReactiveSessionProducer`, making the entire application unresponsive. ### Expected behavior Hibernate Reactive should properly dispose its sessions without blocking. ### Actual behavior It is actually blocking the event loop thread. See the following thread dump from one of our applications. The thread remains in this state forever. As a consequence, the entire application cannot handle any incoming requests anymore. ``` "vert.x-eventloop-thread-1" #25 prio=5 os_prio=0 cpu=3312.11ms elapsed=815.13s tid=0x00007f778f573000 nid=0x2f waiting on condition [0x00007f772698d000] java.lang.Thread.State: WAITING (parking) at jdk.internal.misc.Unsafe.park([email protected]/Native Method) - parking to wait for <0x00000000ffadedf8> (a java.util.concurrent.CompletableFuture$Signaller) at java.util.concurrent.locks.LockSupport.park([email protected]/LockSupport.java:194) at java.util.concurrent.CompletableFuture$Signaller.block([email protected]/CompletableFuture.java:1796) at java.util.concurrent.ForkJoinPool.managedBlock([email protected]/ForkJoinPool.java:3128) at java.util.concurrent.CompletableFuture.waitingGet([email protected]/CompletableFuture.java:1823) at java.util.concurrent.CompletableFuture.join([email protected]/CompletableFuture.java:2043) at io.smallrye.context.CompletableFutureWrapper.join(CompletableFutureWrapper.java:166) at io.quarkus.hibernate.reactive.runtime.ReactiveSessionProducer.disposeMutinySession(ReactiveSessionProducer.java:54) at io.quarkus.hibernate.reactive.runtime.ReactiveSessionProducer_ProducerMethod_createMutinySession_1321d110ee9e92bda147899150401e0a136779c7_Bean.destroy(ReactiveSessionProducer_ProducerMethod_createMutinySession_1321d110ee9e92bda147899150401e0a136779c7_Bean.zig:180) at io.quarkus.hibernate.reactive.runtime.ReactiveSessionProducer_ProducerMethod_createMutinySession_1321d110ee9e92bda147899150401e0a136779c7_Bean.destroy(ReactiveSessionProducer_ProducerMethod_createMutinySession_1321d110ee9e92bda147899150401e0a136779c7_Bean.zig:212) at io.quarkus.arc.impl.InstanceHandleImpl.destroyInternal(InstanceHandleImpl.java:90) at io.quarkus.arc.impl.ContextInstanceHandleImpl.destroy(ContextInstanceHandleImpl.java:20) at io.quarkus.arc.impl.RequestContext.destroyContextElement(RequestContext.java:184) at io.quarkus.arc.impl.RequestContext$$Lambda$538/0x0000000100730c40.accept(Unknown Source) at java.util.concurrent.ConcurrentHashMap.forEach([email protected]/ConcurrentHashMap.java:1603) at io.quarkus.arc.impl.RequestContext.destroy(RequestContext.java:170) - locked <0x00000000ffa55538> (a java.util.concurrent.ConcurrentHashMap) at io.quarkus.arc.impl.RequestContext.destroy(RequestContext.java:154) at io.quarkus.resteasy.reactive.common.runtime.ArcThreadSetupAction$1.close(ArcThreadSetupAction.java:27) at org.jboss.resteasy.reactive.common.core.AbstractResteasyReactiveContext.close(AbstractResteasyReactiveContext.java:101) at org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext.close(ResteasyReactiveRequestContext.java:358) at org.jboss.resteasy.reactive.common.core.AbstractResteasyReactiveContext.run(AbstractResteasyReactiveContext.java:182) at io.netty.util.concurrent.AbstractEventExecutor.safeExecute(AbstractEventExecutor.java:164) at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:472) at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:500) at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:989) at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.lang.Thread.run([email protected]/Thread.java:829) ``` ## To Reproduce Haven't yet been able to create a reproducer, but most likely happens when some failure happens in a reactive chain where HR was previously used (not necessarily in Hibernate itself). ### Configuration ```properties # Add your application.properties here, if applicable. ``` ### Screenshots (If applicable, add screenshots to help explain your problem.) ## Environment (please complete the following information): ### Output of `uname -a` or `ver` Microsoft Windows [Version 10.0.18363.1556] ### Output of `java -version` OpenJDK 64-Bit Server VM Corretto-11.0.10.9.1 (build 11.0.10+9-LTS, mixed mode) ### GraalVM version (if different from Java) N/A ### Quarkus version or git rev 2.0.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.6.3 ## Additional context (Add any other context about the problem here.)

7b334561acaa30e26a4cb33ae2055b95da84919d

3e1e0a1ee1eafc5d6f3d1465de1641497be72438

https://github.com/quarkusio/quarkus/compare/7b334561acaa30e26a4cb33ae2055b95da84919d...3e1e0a1ee1eafc5d6f3d1465de1641497be72438

diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java index ead36fc3330..804aa5ae6e8 100644 --- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java +++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java @@ -1,5 +1,7 @@ package io.quarkus.hibernate.reactive.runtime; +import java.util.concurrent.CompletableFuture; + import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; @@ -23,13 +25,23 @@ public Mutiny.Session createMutinySession() { public void disposeMutinySession(@Disposes Mutiny.Session reactiveSession) { if (reactiveSession != null) { - //We're ignoring the returned CompletionStage! - //This could certainly done better but it should be effective enough to - //eventually close the session: the connection pool will order the operations - //as it won't be able to return connections to other consumers when it's saturated, - //ensuring close operations are handled. - //N.B. for the Mutiny API we need to make sure to subscribe - reactiveSession.close().subscribe().asCompletionStage().join(); + //N.B. make sure to subscribe as this is a Mutiny based Session: + // operations don't happen at all if there is no subscription. + final CompletableFuture<Void> closeOperation = reactiveSession.close() + .subscribe() + .asCompletionStage(); + if (!io.vertx.core.Context.isOnVertxThread()) { + //When invoked from blocking code, behave as expected and block on the operation + //so to not starve resources with a deferred close. + closeOperation.join(); + } + // [else] no need to block. Worst that can happen is that the opening + // of a new Mutiny.Session needs to wait for an available connection, + // which implicitly orders it as "downstream" from the previous close + // to have actually happened as the connection pool is reactive. + // Also, if connections are available there is no real need to wait for + // it, so this should be good. } } + }

['extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.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/18415/18374

quarkusio

quarkus

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

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

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

fixes

Quarkus OIDC Client unable to retrieve access-token

## Describe the bug I am using quarkus-oidc-client extension to obtain token. The idea is to send client-id, client-secret and grant-type to OpenID connect provider to obtain access token. I am referring to this doc @ https://quarkus.io/guides/security-openid-connect-client I am using annotation "@OidcClientFilter" on a resource annotated using "@RegisterRestClient". The OidcClient is not able to retrieve access-token as it sends only grant_type=client_credentials to the OAuth server. I have configured the extension with following configuration ``` quarkus.oidc-client.auth-server-url=https://openid-provider.org quarkus.oidc-client.discovery-enabled=false quarkus.oidc-client.token-path=/token quarkus.oidc-client.client-id=rf3ScIceRGbm8IShjMUDUY67INhJEGRb quarkus.oidc-client.credentials.secret=************ #quarkus.oidc.authentication.scopes=EMAIL ``` ### Expected behavior OidcClient should sent HTTP post request with form having parameters "client_id", "client_secret", "grant_type" and "scopes". The response should be a HTTP 200 from OAuth server as following: { "access_token": "", "token_type": "", "expires_in": "", "issued_at": "" } Please refer to OAuth2 token response @ https://developer.okta.com/docs/reference/api/oidc/#request-example ### Actual behavior As OidcClient is NOT sending client_id and client_secret, OAuth server is returning following error: Caused by: io.quarkus.oidc.client.OidcClientException: { "error":"invalid_client", "error_description":"missing or invalid client_id or client_secret" } ## To Reproduce Link to a small reproducer (preferably a Maven project if the issue is not Gradle-specific). Or attach an archive containing the reproducer to the issue. Steps to reproduce the behavior: 1. 2. 3. ### Configuration ```properties # Add your application.properties here, if applicable. quarkus.oidc-client.auth-server-url=https://openid-provider.org quarkus.oidc-client.discovery-enabled=false quarkus.oidc-client.token-path=/token quarkus.oidc-client.client-id=rf3ScIceRGbm8IShjMUDUY67INhJEGRb quarkus.oidc-client.credentials.secret=************ quarkus.oidc.authentication.scopes=EMAIL ``` ### Screenshots (If applicable, add screenshots to help explain your problem.) ## Environment (please complete the following information): Ubuntu 18 LTS ### Output of `uname -a` or `ver` Linux inggou18 4.15.0-142-generic #146-Ubuntu SMP Tue Apr 13 01:11:19 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "11.0.7" 2020-04-14 OpenJDK Runtime Environment GraalVM CE 20.1.0 (build 11.0.7+10-jvmci-20.1-b02) OpenJDK 64-Bit Server VM GraalVM CE 20.1.0 (build 11.0.7+10-jvmci-20.1-b02, mixed mode, sharing) ### GraalVM version (if different from Java) ### Quarkus version or git rev 1.13.7 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Maven 3.6.6 ## Additional context (Add any other context about the problem here.)

142da1e8ec0371bc00a5aaeea3df644310a12065

d233b01d6145b034cbfe316aa050f26122ecf9d4

https://github.com/quarkusio/quarkus/compare/142da1e8ec0371bc00a5aaeea3df644310a12065...d233b01d6145b034cbfe316aa050f26122ecf9d4

diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java index de8fa0f2ec8..63bf8b98052 100644 --- a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java +++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java @@ -120,9 +120,11 @@ private Tokens emitGrantTokens(HttpResponse<Buffer> resp, boolean refresh) { JsonObject json = resp.bodyAsJsonObject(); final String accessToken = json.getString(oidcConfig.grant.accessTokenProperty); final String refreshToken = json.getString(oidcConfig.grant.refreshTokenProperty); + final Object expiresInValue = json.getValue(oidcConfig.grant.expiresInProperty); Long accessTokenExpiresAt; - Long accessTokenExpiresIn = json.getLong(oidcConfig.grant.expiresInProperty); - if (accessTokenExpiresIn != null) { + if (expiresInValue != null) { + long accessTokenExpiresIn = expiresInValue instanceof Number ? ((Number) expiresInValue).longValue() + : Long.parseLong(expiresInValue.toString()); accessTokenExpiresAt = Instant.now().getEpochSecond() + accessTokenExpiresIn; } else { accessTokenExpiresAt = getExpiresJwtClaim(accessToken); diff --git a/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java index d239dc5ef7b..a8aef8f8c2f 100644 --- a/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java +++ b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java @@ -41,7 +41,7 @@ public Map<String, String> start() { .aResponse() .withHeader("Content-Type", MediaType.APPLICATION_JSON) .withBody( - "{\\"accessToken\\":\\"access_token_n\\", \\"expiresIn\\":4, \\"refreshToken\\":\\"refresh_token_n\\"}"))); + "{\\"accessToken\\":\\"access_token_n\\", \\"expiresIn\\":\\"4\\", \\"refreshToken\\":\\"refresh_token_n\\"}"))); server.stubFor(WireMock.post("/tokens") .withRequestBody(matching("grant_type=refresh_token&refresh_token=refresh_token_1"))

['extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java', 'integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.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/18403/18349

quarkusio

quarkus

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

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

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

fix

SmallRye GraphQL Client not working in native

`microprofile-graphql-client-quickstart` is failing in native with the following error. Apart from the fact that it needs fixing, I'm very surprised we use Jersey? Shouldn't we use one of our REST Clients? ``` Caused by: java.lang.RuntimeException: java.lang.ClassNotFoundException: org.glassfish.jersey.client.JerseyClientBuilder at javax.ws.rs.client.ClientBuilder.newBuilder(ClientBuilder.java:102) at javax.ws.rs.client.ClientBuilder.newClient(ClientBuilder.java:113) at io.smallrye.graphql.client.typesafe.jaxrs.JaxRsTypesafeGraphQLClientBuilder.client(JaxRsTypesafeGraphQLClientBuilder.java:36) at io.smallrye.graphql.client.typesafe.jaxrs.JaxRsTypesafeGraphQLClientBuilder.build(JaxRsTypesafeGraphQLClientBuilder.java:60) at io.quarkus.smallrye.graphql.client.runtime.SmallRyeGraphQLClientRecorder.lambda$typesafeClientSupplier$0(SmallRyeGraphQLClientRecorder.java:15) at ```

edd218989e40e366bfced10c81d01699d696b5d4

fcef6e7aaeba0da5a58529e7115dd41cf2d350c3

https://github.com/quarkusio/quarkus/compare/edd218989e40e366bfced10c81d01699d696b5d4...fcef6e7aaeba0da5a58529e7115dd41cf2d350c3

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 92f0035c407..aef49426390 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 @@ -28,6 +28,7 @@ import javax.ws.rs.ProcessingException; import javax.ws.rs.RuntimeType; import javax.ws.rs.client.AsyncInvoker; +import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.CompletionStageRxInvoker; import javax.ws.rs.client.Entity; import javax.ws.rs.client.Invocation; @@ -53,6 +54,7 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.handlers.ClientObservabilityHandler; import org.jboss.resteasy.reactive.client.impl.AsyncInvokerImpl; +import org.jboss.resteasy.reactive.client.impl.ClientBuilderImpl; import org.jboss.resteasy.reactive.client.impl.ClientImpl; import org.jboss.resteasy.reactive.client.impl.UniInvoker; import org.jboss.resteasy.reactive.client.impl.WebTargetImpl; @@ -158,6 +160,10 @@ void addFeature(BuildProducer<FeatureBuildItem> features) { void registerClientResponseBuilder(BuildProducer<ServiceProviderBuildItem> serviceProviders) { serviceProviders.produce(new ServiceProviderBuildItem(ResponseBuilderFactory.class.getName(), ClientResponseBuilderFactory.class.getName())); + + serviceProviders.produce(new ServiceProviderBuildItem(ClientBuilder.class.getName(), + ClientBuilderImpl.class.getName())); + } @BuildStep

['extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.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/18379/18018

quarkusio

quarkus

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

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

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

fixes

KafkaStreams UncaughtExceptionHandler can only be set before starting the stream

## Describe the bug It is not possible to use KafkaStreams#setUncaughtExceptionHandler on the injected `KafkaStreams` instance because it is already started by the `KafkaStreamsProducer` managed by kafka-streams Quarkus extension. ### Expected behavior The kafka-streams extension calls setUncaughtExceptionHandler with an instance of `StreamsUncaughtExceptionHandler` discovered in the application the before the start, much like StateListener and StateRestoreListener Reported by @andrerigon

c377d1c517666be1eb5ff485771b83df4a34ddee

2cdafc2f3ead84ed4618f4e9a052c80c4049cc7b

https://github.com/quarkusio/quarkus/compare/c377d1c517666be1eb5ff485771b83df4a34ddee...2cdafc2f3ead84ed4618f4e9a052c80c4049cc7b

diff --git a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.java b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.java index 408fa5d0957..93ca55cbb33 100644 --- a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.java +++ b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.java @@ -39,6 +39,7 @@ import org.apache.kafka.streams.KafkaStreams.StateListener; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.Topology; +import org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler; import org.apache.kafka.streams.processor.StateRestoreListener; import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.logging.Logger; @@ -73,7 +74,8 @@ public class KafkaStreamsProducer { public KafkaStreamsProducer(KafkaStreamsSupport kafkaStreamsSupport, KafkaStreamsRuntimeConfig runtimeConfig, Instance<Topology> topology, Instance<KafkaClientSupplier> kafkaClientSupplier, @Identifier("default-kafka-broker") Instance<Map<String, Object>> defaultConfiguration, - Instance<StateListener> stateListener, Instance<StateRestoreListener> globalStateRestoreListener) { + Instance<StateListener> stateListener, Instance<StateRestoreListener> globalStateRestoreListener, + Instance<StreamsUncaughtExceptionHandler> uncaughtExceptionHandlerListener) { shutdown = false; // No producer for Topology -> nothing to do if (topology.isUnsatisfied()) { @@ -104,7 +106,8 @@ public KafkaStreamsProducer(KafkaStreamsSupport kafkaStreamsSupport, KafkaStream this.executorService = Executors.newSingleThreadExecutor(); this.kafkaStreams = initializeKafkaStreams(kafkaStreamsProperties, runtimeConfig, kafkaAdminClient, topology.get(), - kafkaClientSupplier, stateListener, globalStateRestoreListener, executorService); + kafkaClientSupplier, stateListener, globalStateRestoreListener, uncaughtExceptionHandlerListener, + executorService); this.kafkaStreamsTopologyManager = new KafkaStreamsTopologyManager(kafkaAdminClient); } @@ -149,7 +152,7 @@ private static KafkaStreams initializeKafkaStreams(Properties kafkaStreamsProper KafkaStreamsRuntimeConfig runtimeConfig, Admin adminClient, Topology topology, Instance<KafkaClientSupplier> kafkaClientSupplier, Instance<StateListener> stateListener, Instance<StateRestoreListener> globalStateRestoreListener, - ExecutorService executorService) { + Instance<StreamsUncaughtExceptionHandler> uncaughtExceptionHandlerListener, ExecutorService executorService) { KafkaStreams kafkaStreams; if (kafkaClientSupplier.isUnsatisfied()) { kafkaStreams = new KafkaStreams(topology, kafkaStreamsProperties); @@ -163,6 +166,9 @@ private static KafkaStreams initializeKafkaStreams(Properties kafkaStreamsProper if (!globalStateRestoreListener.isUnsatisfied()) { kafkaStreams.setGlobalStateRestoreListener(globalStateRestoreListener.get()); } + if (!uncaughtExceptionHandlerListener.isUnsatisfied()) { + kafkaStreams.setUncaughtExceptionHandler(uncaughtExceptionHandlerListener.get()); + } executorService.execute(new Runnable() {

['extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.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/18332/18330

quarkusio

quarkus

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

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

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

fixes

Continuous Testing not using updated log level

## Describe the bug Quarkus 2.0.0.Final Continous Testing not applying an updated log level changed in application.properties ### Expected behavior Log level does not change. When app started with default (INFO), and then quarkus.log.level is updated to a higher log level (like TRACE or DEBUG), the logs should include the appropriate logging statements. ### Actual behavior Logging continues to log at INFO log level. ## To Reproduce 1. Clone the [reproducer git repo](https://github.com/jclingan/continuous_testing_logging). 2. `mvn quarkus:dev` 3. Press 'r' to run tests 4. Press 'o' to enable output 5. Press 'r' to run tests again. Should see: ``` FATAL [org.acm.LoggingResource] ***** JBossLogManagerLogger: FATAL ***** ERROR [org.acm.LoggingResource] ***** JBossLogManagerLogger: ERROR ***** WARN [org.acm.LoggingResource] ***** JBossLogManagerLogger: WARN ***** INFO [org.acm.LoggingResource] ***** JBossLogManagerLogger: INFO ***** INFO [io.quarkus] greeting stopped in 0.009s ``` 6. In application.properties, update quarkus.log.level to TRACE. 7. Test will automatically run, and display above text reflecting the log level is still INFO.

4340f64063b9bed8f8e1545034b3342d4921b989

cfbd8f9eeb15ce5de6b0c5c17a30899e87498661

https://github.com/quarkusio/quarkus/compare/4340f64063b9bed8f8e1545034b3342d4921b989...cfbd8f9eeb15ce5de6b0c5c17a30899e87498661

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java b/core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java index edb9880e8f1..0937a796c36 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java @@ -60,6 +60,7 @@ public class QuarkusAugmentor { private final Consumer<ConfigBuilder> configCustomizer; private final boolean rebuild; private final boolean auxiliaryApplication; + private final Optional<DevModeType> auxiliaryDevModeType; QuarkusAugmentor(Builder builder) { this.classLoader = builder.classLoader; @@ -79,6 +80,7 @@ public class QuarkusAugmentor { this.rebuild = builder.rebuild; this.devModeType = builder.devModeType; this.auxiliaryApplication = builder.auxiliaryApplication; + this.auxiliaryDevModeType = Optional.ofNullable(builder.auxiliaryDevModeType); } public BuildResult run() throws Exception { @@ -143,7 +145,8 @@ public BuildResult run() throws Exception { .produce(new ShutdownContextBuildItem()) .produce(new RawCommandLineArgumentsBuildItem()) .produce(new LaunchModeBuildItem(launchMode, - devModeType == null ? Optional.empty() : Optional.of(devModeType), auxiliaryApplication)) + devModeType == null ? Optional.empty() : Optional.of(devModeType), auxiliaryApplication, + auxiliaryDevModeType)) .produce(new BuildSystemTargetBuildItem(targetDir, baseName, rebuild, buildSystemProperties == null ? new Properties() : buildSystemProperties)) .produce(new AppModelProviderBuildItem(effectiveModel)); @@ -180,6 +183,7 @@ public static Builder builder() { public static final class Builder { + public DevModeType auxiliaryDevModeType; boolean rebuild; List<PathsCollection> additionalApplicationArchives = new ArrayList<>(); Collection<Path> excludedFromIndexing = Collections.emptySet(); @@ -223,6 +227,11 @@ public Builder setAuxiliaryApplication(boolean auxiliaryApplication) { return this; } + public Builder setAuxiliaryDevModeType(DevModeType auxiliaryDevModeType) { + this.auxiliaryDevModeType = auxiliaryDevModeType; + return this; + } + public LaunchMode getLaunchMode() { return launchMode; } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/LaunchModeBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/LaunchModeBuildItem.java index b4e39029e80..917d62c1384 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/LaunchModeBuildItem.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/LaunchModeBuildItem.java @@ -16,11 +16,14 @@ public final class LaunchModeBuildItem extends SimpleBuildItem { private final Optional<DevModeType> devModeType; private final boolean auxiliaryApplication; + private final Optional<DevModeType> auxiliaryDevModeType; - public LaunchModeBuildItem(LaunchMode launchMode, Optional<DevModeType> devModeType, boolean auxiliaryApplication) { + public LaunchModeBuildItem(LaunchMode launchMode, Optional<DevModeType> devModeType, boolean auxiliaryApplication, + Optional<DevModeType> auxiliaryDevModeType) { this.launchMode = launchMode; this.devModeType = devModeType; this.auxiliaryApplication = auxiliaryApplication; + this.auxiliaryDevModeType = auxiliaryDevModeType; } public LaunchMode getLaunchMode() { @@ -46,4 +49,12 @@ public Optional<DevModeType> getDevModeType() { public boolean isAuxiliaryApplication() { return auxiliaryApplication; } + + /** + * The dev mode type of the main application. + * + */ + public Optional<DevModeType> getAuxiliaryDevModeType() { + return auxiliaryDevModeType; + } } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java index 3faf23f9ce4..c57713a7d9b 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java @@ -278,7 +278,7 @@ private RuntimeUpdatesProcessor setupRuntimeCompilation(DevModeContext context, QuarkusCompiler compiler = new QuarkusCompiler(curatedApplication, compilationProviders, context); TestSupport testSupport = null; if (devModeType == DevModeType.LOCAL && context.getApplicationRoot().getTest().isPresent()) { - testSupport = new TestSupport(curatedApplication, compilationProviders, context); + testSupport = new TestSupport(curatedApplication, compilationProviders, context, devModeType); } RuntimeUpdatesProcessor processor = new RuntimeUpdatesProcessor(appRoot, context, compiler, diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedTestModeMain.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedTestModeMain.java index 5c6b2ecfcfb..d41a827ab7c 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedTestModeMain.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedTestModeMain.java @@ -56,7 +56,7 @@ private RuntimeUpdatesProcessor setupRuntimeCompilation(DevModeContext context, } catch (Exception e) { throw new RuntimeException("Failed to create compiler", e); } - TestSupport testSupport = new TestSupport(curatedApplication, compilationProviders, context); + TestSupport testSupport = new TestSupport(curatedApplication, compilationProviders, context, DevModeType.TEST_ONLY); RuntimeUpdatesProcessor processor = new RuntimeUpdatesProcessor(applicationRoot, context, compiler, DevModeType.TEST_ONLY, this::regenerateApplication, new BiConsumer<DevModeContext.ModuleInfo, String>() { diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java index 436150fe1b9..4f85ae678fa 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java @@ -19,6 +19,7 @@ import io.quarkus.deployment.dev.DevModeContext; import io.quarkus.deployment.dev.QuarkusCompiler; import io.quarkus.deployment.dev.RuntimeUpdatesProcessor; +import io.quarkus.dev.spi.DevModeType; public class TestSupport implements TestController { @@ -29,6 +30,7 @@ public class TestSupport implements TestController { final DevModeContext context; final List<TestListener> testListeners = new CopyOnWriteArrayList<>(); final TestState testState = new TestState(); + final DevModeType devModeType; volatile CuratedApplication testCuratedApplication; volatile QuarkusCompiler compiler; @@ -45,10 +47,11 @@ public class TestSupport implements TestController { volatile TestType testType = TestType.ALL; public TestSupport(CuratedApplication curatedApplication, List<CompilationProvider> compilationProviders, - DevModeContext context) { + DevModeContext context, DevModeType devModeType) { this.curatedApplication = curatedApplication; this.compilationProviders = compilationProviders; this.context = context; + this.devModeType = devModeType; } public static Optional<TestSupport> instance() { @@ -128,6 +131,7 @@ public void init() { .setBaseClassLoader(getClass().getClassLoader()) .setTest(true) .setAuxiliaryApplication(true) + .setHostApplicationIsTestOnly(devModeType == DevModeType.TEST_ONLY) .setApplicationRoot(PathsCollection.from(paths)) .build() .bootstrap(); diff --git a/core/deployment/src/main/java/io/quarkus/deployment/jbang/JBangAugmentorImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/jbang/JBangAugmentorImpl.java index 07f9a21f9ce..c5e18a7f8f9 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/jbang/JBangAugmentorImpl.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/jbang/JBangAugmentorImpl.java @@ -27,6 +27,7 @@ import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem; import io.quarkus.deployment.pkg.builditem.NativeImageBuildItem; import io.quarkus.deployment.pkg.builditem.ProcessInheritIODisabled; +import io.quarkus.dev.spi.DevModeType; import io.quarkus.runtime.LaunchMode; public class JBangAugmentorImpl implements BiConsumer<CuratedApplication, Map<String, Object>> { @@ -49,7 +50,11 @@ public void accept(CuratedApplication curatedApplication, Map<String, Object> re builder.setBaseName(quarkusBootstrap.getBaseName()); } - builder.setAuxiliaryApplication(curatedApplication.getQuarkusBootstrap().isAuxiliaryApplication()); + boolean auxiliaryApplication = curatedApplication.getQuarkusBootstrap().isAuxiliaryApplication(); + builder.setAuxiliaryApplication(auxiliaryApplication); + builder.setAuxiliaryDevModeType( + curatedApplication.getQuarkusBootstrap().isHostApplicationIsTestOnly() ? DevModeType.TEST_ONLY + : (auxiliaryApplication ? DevModeType.LOCAL : null)); builder.setLaunchMode(LaunchMode.NORMAL); builder.setRebuild(quarkusBootstrap.isRebuild()); builder.setLiveReloadState( diff --git a/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java index adbdc7aeb64..b386c6b6ade 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java @@ -36,6 +36,7 @@ import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem; import io.quarkus.deployment.metrics.MetricsFactoryConsumerBuildItem; import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; +import io.quarkus.dev.spi.DevModeType; import io.quarkus.gizmo.AnnotationCreator; import io.quarkus.gizmo.BranchResult; import io.quarkus.gizmo.BytecodeCreator; @@ -132,7 +133,8 @@ LoggingSetupBuildItem setupLoggingRuntimeInit(LoggingSetupRecorder recorder, Log Optional<ConsoleFormatterBannerBuildItem> possibleBannerBuildItem, LaunchModeBuildItem launchModeBuildItem, List<LogCleanupFilterBuildItem> logCleanupFilters) { - if (!launchModeBuildItem.isAuxiliaryApplication()) { + if (!launchModeBuildItem.isAuxiliaryApplication() + || launchModeBuildItem.getAuxiliaryDevModeType().orElse(null) == DevModeType.TEST_ONLY) { final List<RuntimeValue<Optional<Handler>>> handlers = handlerBuildItems.stream() .map(LogHandlerBuildItem::getHandlerValue) .collect(Collectors.toList()); diff --git a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java index c4c6ce571e4..61712cc6096 100644 --- a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java +++ b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java @@ -326,10 +326,14 @@ public BuildResult runCustomAction(Consumer<BuildChainBuilder> chainBuild, Consu BuildChain chain = chainBuilder .build(); + boolean auxiliaryApplication = curatedApplication.getQuarkusBootstrap().isAuxiliaryApplication(); BuildExecutionBuilder execBuilder = chain.createExecutionBuilder("main") .produce(new LaunchModeBuildItem(launchMode, devModeType == null ? Optional.empty() : Optional.of(devModeType), - curatedApplication.getQuarkusBootstrap().isAuxiliaryApplication())) + auxiliaryApplication, + Optional.ofNullable(curatedApplication.getQuarkusBootstrap().isHostApplicationIsTestOnly() + ? DevModeType.TEST_ONLY + : (auxiliaryApplication ? DevModeType.LOCAL : null)))) .produce(new ShutdownContextBuildItem()) .produce(new RawCommandLineArgumentsBuildItem()) .produce(new LiveReloadBuildItem()); @@ -373,7 +377,11 @@ private BuildResult runAugment(boolean firstRun, Set<String> changedResources, builder.setBaseName(quarkusBootstrap.getBaseName()); } - builder.setAuxiliaryApplication(curatedApplication.getQuarkusBootstrap().isAuxiliaryApplication()); + boolean auxiliaryApplication = curatedApplication.getQuarkusBootstrap().isAuxiliaryApplication(); + builder.setAuxiliaryApplication(auxiliaryApplication); + builder.setAuxiliaryDevModeType( + curatedApplication.getQuarkusBootstrap().isHostApplicationIsTestOnly() ? DevModeType.TEST_ONLY + : (auxiliaryApplication ? DevModeType.LOCAL : null)); builder.setLaunchMode(launchMode); builder.setDevModeType(devModeType); builder.setRebuild(quarkusBootstrap.isRebuild()); diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java index 76ea85a96be..13688fa8f34 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java @@ -90,6 +90,7 @@ public class QuarkusBootstrap implements Serializable { private final Set<AppArtifactKey> localArtifacts; private final List<ClassLoaderEventListener> classLoadListeners; private final boolean auxiliaryApplication; + private final boolean hostApplicationIsTestOnly; private final boolean flatClassPath; private final ConfiguredClassLoading classLoadingConfig; @@ -124,6 +125,7 @@ private QuarkusBootstrap(Builder builder, ConfiguredClassLoading classLoadingCon this.auxiliaryApplication = builder.auxiliaryApplication; this.flatClassPath = builder.flatClassPath; this.classLoadingConfig = classLoadingConfig; + this.hostApplicationIsTestOnly = builder.hostApplicationIsTestOnly; } public CuratedApplication bootstrap() throws BootstrapException { @@ -248,6 +250,10 @@ public boolean isAuxiliaryApplication() { return auxiliaryApplication; } + public boolean isHostApplicationIsTestOnly() { + return hostApplicationIsTestOnly; + } + public static Builder builder() { return new Builder(); } @@ -323,6 +329,7 @@ public boolean isFlatClassPath() { public static class Builder { public List<ClassLoaderEventListener> classLoadListeners = new ArrayList<>(); + public boolean hostApplicationIsTestOnly; boolean flatClassPath; boolean rebuild; PathsCollection applicationRoot; @@ -421,6 +428,11 @@ public Builder setMode(Mode mode) { return this; } + public Builder setHostApplicationIsTestOnly(boolean hostApplicationIsTestOnly) { + this.hostApplicationIsTestOnly = hostApplicationIsTestOnly; + return this; + } + public Builder setAuxiliaryApplication(boolean auxiliaryApplication) { this.auxiliaryApplication = auxiliaryApplication; return this;

['core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java', 'core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedTestModeMain.java', 'core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java', 'core/deployment/src/main/java/io/quarkus/deployment/builditem/LaunchModeBuildItem.java', 'core/deployment/src/main/java/io/quarkus/deployment/jbang/JBangAugmentorImpl.java', 'core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java', 'core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java', 'independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java', 'core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java']

{'.java': 9}

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/18291/18290

quarkusio

quarkus

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

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

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

fixes

Continuous testing test count index off by 1

NOTE: Quarkus 2.0.0.Final ## Describe the bug When a test class has more than one test, the test count starts with a zero instead of 1, making it feel as if not all tests are run. For example, it feels ike only 2 of 3 tests are run and 3/3 will never be reached: ``` 2021-06-30 20:20:22,574 INFO [io.qua.test] (Test runner thread) Running 0/3. Running: org.acme.GreetingResourceTest#testRandomEndpoint() 2021-06-30 20:20:22,585 INFO [io.qua.test] (Test runner thread) Running 1/3. Running: org.acme.GreetingResourceTest#testListGreetingsEndpoint() 2021-06-30 20:20:22,624 INFO [io.qua.test] (Test runner thread) Running 2/3. Running: org.acme.GreetingResourceTest#testHelloEndpoint() ``` ### Expected behavior The output should look like the following, with 1/3, 2/3, and 3/3; ``` 2021-06-30 20:20:22,574 INFO [io.qua.test] (Test runner thread) Running 1/3. Running: org.acme.GreetingResourceTest#testRandomEndpoint() 2021-06-30 20:20:22,585 INFO [io.qua.test] (Test runner thread) Running 2/3. Running: org.acme.GreetingResourceTest#testListGreetingsEndpoint() 2021-06-30 20:20:22,624 INFO [io.qua.test] (Test runner thread) Running 3/3. Running: org.acme.GreetingResourceTest#testHelloEndpoint() ``` ## To Reproduce [Clone reproducer](https://github.com/jclingan/continuous_testing_counter_reproducer), run `mvn quarkus:dev`, then: 1. Press 'r' to resume and run all tests 2. Press 'o' to enable test output 3. Press 'r' to re-run all tests and see above output

c364ea4e28149eff4c5ba9c73c3b5130b8d83fa8

6731d59c245b30881e589571f3771e983f8ff70d

https://github.com/quarkusio/quarkus/compare/c364ea4e28149eff4c5ba9c73c3b5130b8d83fa8...6731d59c245b30881e589571f3771e983f8ff70d

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConsoleHandler.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConsoleHandler.java index dc1cae84831..e510c360010 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConsoleHandler.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConsoleHandler.java @@ -210,7 +210,7 @@ public void testRunStarted(Consumer<TestRunListener> listenerConsumer) { @Override public void runStarted(long toRun) { totalNoTests.set(toRun); - promptHandler.setStatus("Running 0/" + toRun + "."); + promptHandler.setStatus("Starting test run, " + toRun + " tests to run."); } @Override @@ -310,7 +310,7 @@ public void runAborted() { @Override public void testStarted(TestIdentifier testIdentifier, String className) { - String status = "Running " + methodCount.get() + "/" + totalNoTests + String status = "Running " + (methodCount.get() + 1) + "/" + totalNoTests + (failureCount.get() == 0 ? "." : ". " + failureCount + " " + pluralize("failure", "failures", failureCount) + " so far.") + " Running: "

['core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConsoleHandler.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/18262/14812

quarkusio

quarkus

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

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

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

fixes

Hibernate Reactive with Stage API throws ContextNotActiveException on flush

**Describe the bug** The code below throws a `ContextNotActiveException` (see also reproducer below). Switching to the Mutiny API makes the problem disappear. ```java @Inject Stage.Session session; @Test @ActivateRequestContext public void test() { DefaultEntity entity = new DefaultEntity("default"); DefaultEntity retrievedEntity = session.withTransaction(tx -> session.persist(entity)) .thenCompose($ -> session.withTransaction(tx -> session.clear().find(DefaultEntity.class, entity.getId()))) .toCompletableFuture().join(); assertThat(retrievedEntity) .isNotSameAs(entity) .returns(entity.getName(), DefaultEntity::getName); } ``` Stack trace: ``` java.util.concurrent.CompletionException: javax.enterprise.context.ContextNotActiveException at java.base/java.util.concurrent.CompletableFuture.encodeThrowable(CompletableFuture.java:314) at java.base/java.util.concurrent.CompletableFuture.completeThrowable(CompletableFuture.java:319) at java.base/java.util.concurrent.CompletableFuture$UniCompose.tryFire(CompletableFuture.java:1081) at java.base/java.util.concurrent.CompletableFuture.postComplete(CompletableFuture.java:506) at java.base/java.util.concurrent.CompletableFuture.complete(CompletableFuture.java:2073) at org.hibernate.reactive.pool.impl.Handlers.lambda$toCompletionStage$0(Handlers.java:26) at io.vertx.sqlclient.impl.SqlResultHandler.complete(SqlResultHandler.java:98) at io.vertx.sqlclient.impl.SqlResultHandler.handle(SqlResultHandler.java:87) at io.vertx.sqlclient.impl.SqlResultHandler.handle(SqlResultHandler.java:33) at io.vertx.sqlclient.impl.SocketConnectionBase.handleMessage(SocketConnectionBase.java:241) at io.vertx.sqlclient.impl.SocketConnectionBase.lambda$init$0(SocketConnectionBase.java:88) at io.vertx.core.net.impl.NetSocketImpl.lambda$new$2(NetSocketImpl.java:101) at io.vertx.core.streams.impl.InboundBuffer.handleEvent(InboundBuffer.java:237) at io.vertx.core.streams.impl.InboundBuffer.write(InboundBuffer.java:127) at io.vertx.core.net.impl.NetSocketImpl.handleMessage(NetSocketImpl.java:357) at io.vertx.core.impl.ContextImpl.executeTask(ContextImpl.java:366) at io.vertx.core.impl.EventLoopContext.execute(EventLoopContext.java:43) at io.vertx.core.impl.ContextImpl.executeFromIO(ContextImpl.java:229) at io.vertx.core.net.impl.VertxHandler.channelRead(VertxHandler.java:163) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:379) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:365) at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:357) at io.netty.channel.CombinedChannelDuplexHandler$DelegatingChannelHandlerContext.fireChannelRead(CombinedChannelDuplexHandler.java:436) at io.vertx.pgclient.impl.codec.PgEncoder.lambda$write$0(PgEncoder.java:78) at io.vertx.pgclient.impl.codec.PgCommandCodec.handleReadyForQuery(PgCommandCodec.java:138) at io.vertx.pgclient.impl.codec.PgDecoder.decodeReadyForQuery(PgDecoder.java:226) at io.vertx.pgclient.impl.codec.PgDecoder.channelRead(PgDecoder.java:86) at io.netty.channel.CombinedChannelDuplexHandler.channelRead(CombinedChannelDuplexHandler.java:251) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:379) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:365) at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:357) at io.netty.channel.DefaultChannelPipeline$HeadContext.channelRead(DefaultChannelPipeline.java:1410) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:379) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:365) at io.netty.channel.DefaultChannelPipeline.fireChannelRead(DefaultChannelPipeline.java:919) at io.netty.channel.nio.AbstractNioByteChannel$NioByteUnsafe.read(AbstractNioByteChannel.java:163) at io.netty.channel.nio.NioEventLoop.processSelectedKey(NioEventLoop.java:714) at io.netty.channel.nio.NioEventLoop.processSelectedKeysOptimized(NioEventLoop.java:650) at io.netty.channel.nio.NioEventLoop.processSelectedKeys(NioEventLoop.java:576) at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:493) at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:989) 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:834) Caused by: javax.enterprise.context.ContextNotActiveException at io.quarkus.arc.impl.ClientProxies.getDelegate(ClientProxies.java:40) at io.quarkus.hibernate.reactive.runtime.ReactiveSessionProducer_ProducerMethod_createStageSession_f9b8f611ead14dce89da7dfa2d7630a8afb9b0b9_ClientProxy.arc$delegate(ReactiveSessionProducer_ProducerMethod_createStageSession_f9b8f611ead14dce89da7dfa2d7630a8afb9b0b9_ClientProxy.zig:61) at io.quarkus.hibernate.reactive.runtime.ReactiveSessionProducer_ProducerMethod_createStageSession_f9b8f611ead14dce89da7dfa2d7630a8afb9b0b9_ClientProxy.flush(ReactiveSessionProducer_ProducerMethod_createStageSession_f9b8f611ead14dce89da7dfa2d7630a8afb9b0b9_ClientProxy.zig:187) at io.quarkus.hibernate.reactive.singlepersistenceunit.SinglePersistenceUnitCdiStageSessionTest.lambda$test$1(SinglePersistenceUnitCdiStageSessionTest.java:33) at java.base/java.util.concurrent.CompletableFuture$UniCompose.tryFire(CompletableFuture.java:1072) ... 41 more ``` **Expected behavior** I would expect the Mutiny API and the Stage API to behave similarly. Maybe the code is wrong, but in that case both APIs should throw an exception? **Actual behavior** (Describe the actual behavior clearly and concisely.) **To Reproduce** See [this branch](https://github.com/quarkusio/quarkus/compare/master...yrodiere:reactive-context-not-active#diff-c1b22d077ee2c530ae96730f751521016fda503b609ddbc2852ced4e2c95fbcdR32) where I added two tests: one with the Mutiny API and another with the Stage API. The Munity test passes, but the Stage one fails. **Configuration** N/A **Screenshots** N/A **Environment (please complete the following information):** - Output of `uname -a` or `ver`: `Linux yrodiere.redhat 5.10.8-100.fc32.x86_64 #1 SMP Sun Jan 17 19:52:43 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux` - Output of `java -version`: ``` openjdk version "11.0.9" 2020-10-20 OpenJDK Runtime Environment AdoptOpenJDK (build 11.0.9+11) OpenJDK 64-Bit Server VM AdoptOpenJDK (build 11.0.9+11, mixed mode) ``` - GraalVM version (if different from Java): the one built in Quarkus - Quarkus version or git rev: 63db661ad3af4dca1b63a9c9905f911e888dbde1 - Build tool (ie. output of `mvnw --version` or `gradlew --version`): ``` Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) Maven home: /home/yrodiere/.m2/wrapper/dists/apache-maven-3.6.3-bin/1iopthnavndlasol9gbrbg6bf2/apache-maven-3.6.3 Java version: 11.0.9, vendor: AdoptOpenJDK, runtime: /home/yrodiere/tools/java/jdk-11.0.9+11 Default locale: en_US, platform encoding: UTF-8 OS name: "linux", version: "5.10.8-100.fc32.x86_64", arch: "amd64", family: "unix" ``` **Additional context** N/A

90f1b704cb5b3be527a8a7aa1dfd73e5f4094aa7

96a1993ebaeac691d7171125078c012050bbf86e

https://github.com/quarkusio/quarkus/compare/90f1b704cb5b3be527a8a7aa1dfd73e5f4094aa7...96a1993ebaeac691d7171125078c012050bbf86e

diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiStageSessionTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiStageSessionTest.java deleted file mode 100644 index fb4f969c8ee..00000000000 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiStageSessionTest.java +++ /dev/null @@ -1,60 +0,0 @@ -package io.quarkus.hibernate.reactive.singlepersistenceunit; - -import static org.assertj.core.api.Assertions.assertThat; - -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; - -import org.hibernate.reactive.stage.Stage; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; - -import io.quarkus.test.QuarkusUnitTest; - -public class SinglePersistenceUnitCdiStageSessionTest { - - @RegisterExtension - static QuarkusUnitTest runner = new QuarkusUnitTest() - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) - .addClass(DefaultEntity.class) - .addAsResource("application.properties")); - - @Inject - Stage.Session session; - - @Inject - Stage.SessionFactory sessionFactory; - - @Test - @ActivateRequestContext - public void testWithFactory() { - DefaultEntity entity = new DefaultEntity("default"); - - DefaultEntity retrievedEntity = sessionFactory.withTransaction((session, tx) -> session.persist(entity)) - .thenCompose(v -> sessionFactory.withSession(session -> session.find(DefaultEntity.class, entity.getId()))) - .toCompletableFuture().join(); - - assertThat(retrievedEntity) - .isNotSameAs(entity) - .returns(entity.getName(), DefaultEntity::getName); - } - - @Test - @Disabled("#14812: We're getting a ContextNotActiveException for some (unknown) reason") - @ActivateRequestContext - public void test() { - DefaultEntity entity = new DefaultEntity("default"); - - DefaultEntity retrievedEntity = session.withTransaction(tx -> session.persist(entity)) - .thenCompose($ -> session.withTransaction(tx -> session.clear().find(DefaultEntity.class, entity.getId()))) - .toCompletableFuture().join(); - - assertThat(retrievedEntity) - .isNotSameAs(entity) - .returns(entity.getName(), DefaultEntity::getName); - } - -} diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionFactoryProducer.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionFactoryProducer.java index e51781acd70..478f5a60c23 100644 --- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionFactoryProducer.java +++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionFactoryProducer.java @@ -8,7 +8,6 @@ import javax.persistence.PersistenceUnit; import org.hibernate.reactive.mutiny.Mutiny; -import org.hibernate.reactive.stage.Stage; import io.quarkus.arc.DefaultBean; @@ -18,14 +17,6 @@ public class ReactiveSessionFactoryProducer { @PersistenceUnit EntityManagerFactory emf; - @Produces - @Singleton - @DefaultBean - @Typed(Stage.SessionFactory.class) - public Stage.SessionFactory reactiveSessionFactory() { - return emf.unwrap(Stage.SessionFactory.class); - } - @Produces @Singleton @DefaultBean diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java index 709835c3207..ead36fc3330 100644 --- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java +++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java @@ -6,25 +6,14 @@ import javax.inject.Inject; import org.hibernate.reactive.mutiny.Mutiny; -import org.hibernate.reactive.stage.Stage; import io.quarkus.arc.DefaultBean; public class ReactiveSessionProducer { - @Inject - Stage.SessionFactory reactiveSessionFactory; - @Inject Mutiny.SessionFactory mutinySessionFactory; - @Produces - @RequestScoped - @DefaultBean - public Stage.Session createStageSession() { - return reactiveSessionFactory.openSession(); - } - @Produces @RequestScoped @DefaultBean @@ -32,17 +21,6 @@ public Mutiny.Session createMutinySession() { return mutinySessionFactory.openSession(); } - public void disposeStageSession(@Disposes Stage.Session reactiveSession) { - if (reactiveSession != null) { - //We're ignoring the returned CompletionStage! - //This could certainly done better but it should be effective enough to - //eventually close the session: the connection pool will order the operations - //as it won't be able to return connections to other consumers when it's saturated, - //ensuring close operations are handled. - reactiveSession.close().toCompletableFuture().join(); - } - } - public void disposeMutinySession(@Disposes Mutiny.Session reactiveSession) { if (reactiveSession != null) { //We're ignoring the returned CompletionStage! diff --git a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTestEndpoint.java b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTestEndpoint.java index 4ae671275e7..6c6a4ed1364 100644 --- a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTestEndpoint.java +++ b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTestEndpoint.java @@ -1,13 +1,10 @@ package io.quarkus.it.hibernate.reactive.db2; -import java.util.concurrent.CompletionStage; - import javax.inject.Inject; import javax.ws.rs.GET; import javax.ws.rs.Path; import org.hibernate.reactive.mutiny.Mutiny; -import org.hibernate.reactive.stage.Stage; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.db2client.DB2Pool; @@ -18,9 +15,6 @@ @Path("/alternative-tests") public class HibernateReactiveDB2AlternativeTestEndpoint { - @Inject - Stage.Session stageSession; - @Inject Mutiny.Session mutinySession; @@ -29,14 +23,6 @@ public class HibernateReactiveDB2AlternativeTestEndpoint { @Inject DB2Pool db2Pool; - @GET - @Path("/reactiveFind") - public CompletionStage<GuineaPig> reactiveFind() { - final GuineaPig expectedPig = new GuineaPig(5, "Aloi"); - return populateDB().convert().toCompletionStage() - .thenCompose(junk -> stageSession.find(GuineaPig.class, expectedPig.getId())); - } - @GET @Path("/reactiveFindMutiny") public Uni<GuineaPig> reactiveFindMutiny() { diff --git a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java index ac780eef29d..3ca8020f2c8 100644 --- a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java +++ b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java @@ -1,13 +1,10 @@ package io.quarkus.it.hibernate.reactive.db2; -import java.util.concurrent.CompletionStage; - import javax.inject.Inject; import javax.ws.rs.GET; import javax.ws.rs.Path; import org.hibernate.reactive.mutiny.Mutiny; -import org.hibernate.reactive.stage.Stage; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.db2client.DB2Pool; @@ -18,9 +15,6 @@ @Path("/tests") public class HibernateReactiveDB2TestEndpoint { - @Inject - Stage.Session stageSession; - @Inject Mutiny.Session mutinySession; @@ -29,14 +23,6 @@ public class HibernateReactiveDB2TestEndpoint { @Inject DB2Pool db2Pool; - @GET - @Path("/reactiveFind") - public CompletionStage<GuineaPig> reactiveFind() { - final GuineaPig expectedPig = new GuineaPig(5, "Aloi"); - return populateDB().convert().toCompletionStage() - .thenCompose(junk -> stageSession.find(GuineaPig.class, expectedPig.getId())); - } - @GET @Path("/reactiveFindMutiny") public Uni<GuineaPig> reactiveFindMutiny() { diff --git a/integration-tests/hibernate-reactive-db2/src/test/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTest.java b/integration-tests/hibernate-reactive-db2/src/test/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTest.java index 291a5d18d5d..566585f4587 100644 --- a/integration-tests/hibernate-reactive-db2/src/test/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTest.java +++ b/integration-tests/hibernate-reactive-db2/src/test/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTest.java @@ -13,14 +13,6 @@ @QuarkusTest public class HibernateReactiveDB2AlternativeTest { - @Test - public void reactiveFind() { - RestAssured.when() - .get("/alternative-tests/reactiveFind") - .then() - .body(is("{\\"id\\":5,\\"name\\":\\"Aloi\\"}")); - } - @Test public void reactiveFindMutiny() { RestAssured.when() diff --git a/integration-tests/hibernate-reactive-db2/src/test/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2Test.java b/integration-tests/hibernate-reactive-db2/src/test/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2Test.java index 8007e0d770d..29c2bc4c3a1 100644 --- a/integration-tests/hibernate-reactive-db2/src/test/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2Test.java +++ b/integration-tests/hibernate-reactive-db2/src/test/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2Test.java @@ -13,14 +13,6 @@ @QuarkusTest public class HibernateReactiveDB2Test { - @Test - public void reactiveFind() { - RestAssured.when() - .get("/tests/reactiveFind") - .then() - .body(is("{\\"id\\":5,\\"name\\":\\"Aloi\\"}")); - } - @Test public void reactiveFindMutiny() { RestAssured.when() diff --git a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTestEndpoint.java b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTestEndpoint.java index c9048f764b1..1a8b7c51377 100644 --- a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTestEndpoint.java +++ b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTestEndpoint.java @@ -1,13 +1,10 @@ package io.quarkus.it.hibernate.reactive.mysql; -import java.util.concurrent.CompletionStage; - import javax.inject.Inject; import javax.ws.rs.GET; import javax.ws.rs.Path; import org.hibernate.reactive.mutiny.Mutiny; -import org.hibernate.reactive.stage.Stage; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.mysqlclient.MySQLPool; @@ -18,9 +15,6 @@ @Path("/alternative-tests") public class HibernateReactiveMySQLAlternativeTestEndpoint { - @Inject - Stage.Session stageSession; - @Inject Mutiny.Session mutinySession; @@ -29,14 +23,6 @@ public class HibernateReactiveMySQLAlternativeTestEndpoint { @Inject MySQLPool mysqlPool; - @GET - @Path("/reactiveFind") - public CompletionStage<GuineaPig> reactiveFind() { - final GuineaPig expectedPig = new GuineaPig(5, "Aloi"); - return populateDB().convert().toCompletionStage() - .thenCompose(junk -> stageSession.find(GuineaPig.class, expectedPig.getId())); - } - @GET @Path("/reactiveFindMutiny") public Uni<GuineaPig> reactiveFindMutiny() { diff --git a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java index 1c144be731a..84a90a6cd4e 100644 --- a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java +++ b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java @@ -1,13 +1,10 @@ package io.quarkus.it.hibernate.reactive.mysql; -import java.util.concurrent.CompletionStage; - import javax.inject.Inject; import javax.ws.rs.GET; import javax.ws.rs.Path; import org.hibernate.reactive.mutiny.Mutiny; -import org.hibernate.reactive.stage.Stage; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.mysqlclient.MySQLPool; @@ -18,9 +15,6 @@ @Path("/tests") public class HibernateReactiveMySQLTestEndpoint { - @Inject - Stage.Session stageSession; - @Inject Mutiny.Session mutinySession; @@ -29,14 +23,6 @@ public class HibernateReactiveMySQLTestEndpoint { @Inject MySQLPool mysqlPool; - @GET - @Path("/reactiveFind") - public CompletionStage<GuineaPig> reactiveFind() { - final GuineaPig expectedPig = new GuineaPig(5, "Aloi"); - return populateDB().convert().toCompletionStage() - .thenCompose(junk -> stageSession.find(GuineaPig.class, expectedPig.getId())); - } - @GET @Path("/reactiveFindMutiny") public Uni<GuineaPig> reactiveFindMutiny() { diff --git a/integration-tests/hibernate-reactive-mysql/src/test/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTest.java b/integration-tests/hibernate-reactive-mysql/src/test/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTest.java index c98b4377b35..b583e1dc79c 100644 --- a/integration-tests/hibernate-reactive-mysql/src/test/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTest.java +++ b/integration-tests/hibernate-reactive-mysql/src/test/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTest.java @@ -13,14 +13,6 @@ @QuarkusTest public class HibernateReactiveMySQLAlternativeTest { - @Test - public void reactiveFind() { - RestAssured.when() - .get("/alternative-tests/reactiveFind") - .then() - .body(is("{\\"id\\":5,\\"name\\":\\"Aloi\\"}")); - } - @Test public void reactiveFindMutiny() { RestAssured.when() diff --git a/integration-tests/hibernate-reactive-mysql/src/test/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTest.java b/integration-tests/hibernate-reactive-mysql/src/test/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTest.java index d6e2eaee65a..2636432990c 100644 --- a/integration-tests/hibernate-reactive-mysql/src/test/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTest.java +++ b/integration-tests/hibernate-reactive-mysql/src/test/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTest.java @@ -13,14 +13,6 @@ @QuarkusTest public class HibernateReactiveMySQLTest { - @Test - public void reactiveFind() { - RestAssured.when() - .get("/tests/reactiveFind") - .then() - .body(is("{\\"id\\":5,\\"name\\":\\"Aloi\\"}")); - } - @Test public void reactiveFindMutiny() { RestAssured.when() diff --git a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java index e3fa12b9c81..9e2f53d5533 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java +++ b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java @@ -1,13 +1,10 @@ package io.quarkus.it.hibernate.reactive.postgresql; -import java.util.concurrent.CompletionStage; - import javax.inject.Inject; import javax.ws.rs.GET; import javax.ws.rs.Path; import org.hibernate.reactive.mutiny.Mutiny; -import org.hibernate.reactive.stage.Stage; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.pgclient.PgPool; @@ -18,9 +15,6 @@ @Path("/tests") public class HibernateReactiveTestEndpoint { - @Inject - Stage.Session stageSession; - @Inject Mutiny.Session mutinySession; @@ -29,14 +23,6 @@ public class HibernateReactiveTestEndpoint { @Inject PgPool pgPool; - @GET - @Path("/reactiveFind") - public CompletionStage<GuineaPig> reactiveFind() { - final GuineaPig expectedPig = new GuineaPig(5, "Aloi"); - return populateDB().convert().toCompletionStage() - .thenCompose(junk -> stageSession.find(GuineaPig.class, expectedPig.getId())); - } - @GET @Path("/reactiveFindMutiny") public Uni<GuineaPig> reactiveFindMutiny() { diff --git a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointAlternative.java b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointAlternative.java index f0551267f32..ec7542caea5 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointAlternative.java +++ b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointAlternative.java @@ -1,13 +1,10 @@ package io.quarkus.it.hibernate.reactive.postgresql; -import java.util.concurrent.CompletionStage; - import javax.inject.Inject; import javax.ws.rs.GET; import javax.ws.rs.Path; import org.hibernate.reactive.mutiny.Mutiny; -import org.hibernate.reactive.stage.Stage; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.pgclient.PgPool; @@ -18,9 +15,6 @@ @Path("/alternative-tests") public class HibernateReactiveTestEndpointAlternative { - @Inject - Stage.Session stageSession; - @Inject Mutiny.Session mutinySession; @@ -29,14 +23,6 @@ public class HibernateReactiveTestEndpointAlternative { @Inject PgPool pgPool; - @GET - @Path("/reactiveFind") - public CompletionStage<GuineaPig> reactiveFind() { - final GuineaPig expectedPig = new GuineaPig(5, "Aloi"); - return populateDB().convert().toCompletionStage() - .thenCompose(junk -> stageSession.find(GuineaPig.class, expectedPig.getId())); - } - @GET @Path("/reactiveFindMutiny") public Uni<GuineaPig> reactiveFindMutiny() { diff --git a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointFetchLazy.java b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointFetchLazy.java index 8f8fdc87f9f..ff1b103592e 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointFetchLazy.java +++ b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointFetchLazy.java @@ -1,7 +1,6 @@ package io.quarkus.it.hibernate.reactive.postgresql; import java.util.Collection; -import java.util.concurrent.CompletionStage; import javax.inject.Inject; import javax.ws.rs.GET; @@ -10,7 +9,6 @@ import javax.ws.rs.PathParam; import org.hibernate.reactive.mutiny.Mutiny; -import org.hibernate.reactive.stage.Stage; import io.quarkus.it.hibernate.reactive.postgresql.lazy.Author; import io.quarkus.it.hibernate.reactive.postgresql.lazy.Book; @@ -24,11 +22,6 @@ public class HibernateReactiveTestEndpointFetchLazy { @Inject Mutiny.Session mutinySession; - // I'm using the factory because there are some issues with an injected Stage.Session - // See issue https://github.com/quarkusio/quarkus/issues/14812 - @Inject - Stage.SessionFactory stageSessionFactory; - // Injecting a Vert.x Pool is not required, It's used to // independently validate the contents of the database for the test @Inject @@ -41,14 +34,6 @@ public Uni<Collection<Book>> findBooksWithMutiny(@PathParam("authorId") Integer .chain(author -> Mutiny.fetch(author.getBooks())); } - @GET - @Path("/findBooksWithStage/{authorId}") - public CompletionStage<Collection<Book>> findBooksWithStage(@PathParam("authorId") Integer authorId) { - return stageSessionFactory.withTransaction((session, tx) -> session - .find(Author.class, authorId) - .thenCompose(author -> Stage.fetch(author.getBooks()))); - } - @POST @Path("/prepareDb") public Uni<String> prepareDb() { diff --git a/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveAlternativeTest.java b/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveAlternativeTest.java index 9d5e37ada5a..eb795124133 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveAlternativeTest.java +++ b/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveAlternativeTest.java @@ -15,14 +15,6 @@ @TestHTTPEndpoint(HibernateReactiveTestEndpointAlternative.class) public class HibernateReactiveAlternativeTest { - @Test - public void reactiveFind() { - RestAssured.when() - .get("/reactiveFind") - .then() - .body(is("{\\"id\\":5,\\"name\\":\\"Aloi\\"}")); - } - @Test public void reactiveFindMutiny() { RestAssured.when() diff --git a/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveFetchLazyTest.java b/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveFetchLazyTest.java index 38cd5a0e82f..1cb288ff860 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveFetchLazyTest.java +++ b/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveFetchLazyTest.java @@ -32,20 +32,6 @@ public void fetchAfterFindWithMutiny() { assertTitles(response, "Cryptonomicon", "Snow Crash"); } - @Test - public void fetchAfterFindWithWithStage() { - RestAssured.when() - .post("/prepareDb") - .then() - .body(is("Neal Stephenson")); - - Response response = RestAssured.when() - .get("/findBooksWithStage/567") - .then() - .extract().response(); - assertTitles(response, "Cryptonomicon", "Snow Crash"); - } - private void assertTitles(Response response, String... expectedTitles) { List<Object> titles = response.jsonPath().getList("title").stream().sorted().collect(toList()); assertIterableEquals(asList(expectedTitles), titles); diff --git a/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTest.java b/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTest.java index 89fe03fbc06..b489a2ee142 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTest.java +++ b/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTest.java @@ -16,14 +16,6 @@ @TestHTTPEndpoint(HibernateReactiveTestEndpoint.class) public class HibernateReactiveTest { - @Test - public void reactiveFind() { - RestAssured.when() - .get("/reactiveFind") - .then() - .body(is("{\\"id\\":5,\\"name\\":\\"Aloi\\"}")); - } - @Test public void reactiveCowPersist() { RestAssured.when()

['integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java', 'integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveFetchLazyTest.java', 'integration-tests/hibernate-reactive-db2/src/test/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2Test.java', 'integration-tests/hibernate-reactive-db2/src/test/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTest.java', 'extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiStageSessionTest.java', 'integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTestEndpoint.java', 'integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTestEndpoint.java', 'integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointAlternative.java', 'integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java', 'extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java', 'extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionFactoryProducer.java', 'integration-tests/hibernate-reactive-mysql/src/test/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTest.java', 'integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveAlternativeTest.java', 'integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java', 'integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTest.java', 'integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointFetchLazy.java', 'integration-tests/hibernate-reactive-mysql/src/test/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTest.java']

{'.java': 17}

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/18192/18190

quarkusio

quarkus

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

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

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

fixes

Problem starting quarkus app in dev mode with pom dependency

## Describe the bug We do have some quarkus apps that have a pom type dependency on the 'pom.xml' (for example: https://github.com/kiegroup/kogito-apps/blob/master/task-console/pom.xml#L54). Today we started noticing that if we start them in dev mode we get a hot reload error on start up due to a missing target/classes folder in the dependent module. `Failed to run: Hot reloadable dependency org.kie.kogito:kogito-apps-ui-packages::jar:2.0.0-SNAPSHOT has not been compiled yet (the classes directory /development/kogito-apps/ui-packages/target/classes does not exist) -> [Help 1]` We found this check to be hardcoded in your DevMojo (https://github.com/quarkusio/quarkus/blob/main/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java#L663-L666). I think it would be good if this mechanism could be more flexible or at least configurable to avoid this kind of issues. ### Expected behavior The quarkus app should start in dev mode as usual ### Actual behavior The quarkus app doesn't start and shows the Hot reload error message. ## To Reproduce Steps to reproduce the behavior: 1. Git clone Git clone https://github.com/kiegroup/kogito-apps 2. Build kogito-apps 3. on a terminal go to /kogito-apps/task-console 4. try to start the app with command: `mvn clean package quarkus:dev -Dquarkus.http.port=8380 `

928d7327e965097e60ea452ee376364503e4a239

5f59b0704ba7f91eba0f4fcb8cf1143ad9cf716e

https://github.com/quarkusio/quarkus/compare/928d7327e965097e60ea452ee376364503e4a239...5f59b0704ba7f91eba0f4fcb8cf1143ad9cf716e

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/devmode/DependenciesFilter.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/devmode/DependenciesFilter.java index b21dc8a7804..ef000cec228 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/devmode/DependenciesFilter.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/devmode/DependenciesFilter.java @@ -85,7 +85,7 @@ public static List<LocalProject> filterNotReloadableDependencies(LocalProject lo if (project == null) { continue; } - if ("test".equals(a.getScope())) { + if ("test".equals(a.getScope()) || "pom".equals(a.getType())) { continue; } if (!project.getVersion().equals(a.getVersion())) {

['independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/devmode/DependenciesFilter.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/18165/18118

quarkusio

quarkus

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

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

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

fixes

NoSuchElementException when building a project with no source files

## Describe the bug I am trying to plugin libraries via CDI into a service to create a new service. So in my example my original service is `service1`, which I'd like to add `plugin2` to create `service2`. So I made a new project with no source code and only dependencies in `service1` and `plugin2`. I was hoping the REST resources from `service1` would be picked up off the classpath along with `plugin2` through CDI. But when I `quarkusBuild`, I get a `NoSuchElementException`. ### Expected behavior A successful build. ### Actual behavior ``` Caused by: java.util.NoSuchElementException at io.quarkus.deployment.builditem.ArchiveRootBuildItem.<init>(ArchiveRootBuildItem.java:97) at io.quarkus.deployment.builditem.ArchiveRootBuildItem.<init>(ArchiveRootBuildItem.java:17) at io.quarkus.deployment.builditem.ArchiveRootBuildItem$Builder.build(ArchiveRootBuildItem.java:50) at io.quarkus.deployment.QuarkusAugmentor.run(QuarkusAugmentor.java:141) at io.quarkus.runner.bootstrap.AugmentActionImpl.runAugment(AugmentActionImpl.java:394) ... 125 more ``` ## To Reproduce `service2` in https://github.com/mweber03/quarkus-test Steps to reproduce the behavior: 1. Uncomment `service2` from `settings.gradle` 2. `./gradlew service2:build` ## Environment (please complete the following information): ### Output of `uname -a` or `ver` Ubuntu 20.04 ### Output of `java -version` OpenJDK 11.0.11 ### Quarkus version or git rev Quarkus 1.13.7 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 6.8.3

659435d6e0aa7250638d41a9db356a9c39ae8daf

cbf70d66e35eeec93203b4b9f9377c18762a8265

https://github.com/quarkusio/quarkus/compare/659435d6e0aa7250638d41a9db356a9c39ae8daf...cbf70d66e35eeec93203b4b9f9377c18762a8265

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ArchiveRootBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/ArchiveRootBuildItem.java index 38999d1a882..e5040da4d99 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ArchiveRootBuildItem.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/ArchiveRootBuildItem.java @@ -81,20 +81,25 @@ private ArchiveRootBuildItem(Path archiveLocation, Path archiveRoot, Collection< private ArchiveRootBuildItem(Builder builder, QuarkusBuildCloseablesBuildItem buildCloseables) throws IOException { this.excludedFromIndexing = builder.excludedFromIndexing; - final PathsCollection.Builder rootDirs = PathsCollection.builder(); - final PathsCollection.Builder paths = PathsCollection.builder(); - for (Path root : builder.archiveRoots) { - paths.add(root); - if (Files.isDirectory(root)) { - rootDirs.add(root); - } else { - final FileSystem fs = buildCloseables.add(FileSystems.newFileSystem(root, null)); - fs.getRootDirectories().forEach(rootDirs::add); + if (!builder.archiveRoots.isEmpty()) { + final PathsCollection.Builder rootDirs = PathsCollection.builder(); + final PathsCollection.Builder paths = PathsCollection.builder(); + for (Path root : builder.archiveRoots) { + paths.add(root); + if (Files.isDirectory(root)) { + rootDirs.add(root); + } else { + final FileSystem fs = buildCloseables.add(FileSystems.newFileSystem(root, null)); + fs.getRootDirectories().forEach(rootDirs::add); + } } + this.rootDirs = rootDirs.build(); + this.paths = paths.build(); + this.archiveRoot = this.rootDirs.iterator().next(); + } else { + this.paths = this.rootDirs = PathsCollection.of(); + this.archiveRoot = null; } - this.rootDirs = rootDirs.build(); - this.paths = paths.build(); - this.archiveRoot = this.rootDirs.iterator().next(); } /**

['core/deployment/src/main/java/io/quarkus/deployment/builditem/ArchiveRootBuildItem.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/18152/18099

quarkusio

quarkus

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

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

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

fixes

The QuarkusBootstrapProvider caches the AppArtifact causing problems

The `QuarkusBoostrapProvider` has a cache of `QuarkusAppBootstrapProvider` which itself has a field for the `AppArtifact`. This field is initialised with the `initAppArtifact` if not yet initialized. However, this method creates the output build directory if it does not exists. The causes problems if the cache is actually reused in a subsequent built after cleaning the project and leads to problems because the output directory has not been created. ``` ➜ log-sink git:(main) ✗ mvnd clean verify [INFO] Processing build on daemon 887b51d4[INFO] Scanning for projects... [INFO] BuildTimeEventSpy is registered. [INFO] [INFO] Using the SmartBuilder implementation with a thread count of 11 [INFO] Task segments : [clean, verify] [INFO] Build maximum degree of concurrency is 11 [INFO] Total number of projects is 1 [INFO] [INFO] --------------------------< org.bf2:log-sink >-------------------------- [INFO] Building connectors-images :: log-sink 0.1 [INFO] --------------------------------[ jar ]--------------------------------- [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ log-sink --- [INFO] [INFO] --- directory-maven-plugin:0.3.1:highest-basedir (directories) @ log-sink --- [INFO] Highest basedir set to: /Users/gnodet/work/git/cos-fleet-catalog-camel [INFO] [INFO] --- quarkus-maven-plugin:2.0.0.CR3:generate-code (default) @ log-sink --- [INFO] [INFO] --- formatter-maven-plugin:2.14.0:format (format) @ log-sink --- [INFO] Using 'UTF-8' encoding to format source files. [INFO] Number of files to be formatted: 0 [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ log-sink --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:3.8.1:compile (default-compile) @ log-sink --- [INFO] No sources to compile [INFO] [INFO] --- quarkus-maven-plugin:2.0.0.CR3:generate-code-tests (default) @ log-sink --- [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ log-sink --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory /Users/gnodet/work/git/cos-fleet-catalog-camel/cos-fleet-catalog-connectors-images/log-sink/src/test/resources [INFO] [INFO] --- maven-compiler-plugin:3.8.1:testCompile (default-testCompile) @ log-sink --- [INFO] No sources to compile [INFO] [INFO] --- maven-surefire-plugin:2.12.4:test (default-test) @ log-sink --- [INFO] No tests to run. [INFO] [INFO] --- maven-jar-plugin:3.2.0:jar (default-jar) @ log-sink --- [INFO] Building jar: /Users/gnodet/work/git/cos-fleet-catalog-camel/cos-fleet-catalog-connectors-images/log-sink/target/log-sink-0.1.jar [INFO] [INFO] --- quarkus-maven-plugin:2.0.0.CR3:build (default) @ log-sink --- [INFO] [org.jboss.threads] JBoss Threads version 3.4.0.Final [INFO] [io.quarkus.deployment.QuarkusAugmentor] Quarkus augmentation completed in 1103ms [INFO] Segment walltime 2 s, segment projects service time 2 s, effective/maximum degree of concurrency 1.00/11 [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ [INFO] Total time: 3.830 s (Wall Clock) [INFO] Finished at: 2021-06-23T10:33:47+02:00 [INFO] ------------------------------------------------------------------------ ➜ log-sink git:(main) ✗ mvnd clean verify [INFO] Processing build on daemon 887b51d4[INFO] Scanning for projects... [INFO] BuildTimeEventSpy is registered. [INFO] [INFO] Using the SmartBuilder implementation with a thread count of 11 [INFO] Task segments : [clean, verify] [INFO] Build maximum degree of concurrency is 11 [INFO] Total number of projects is 1 [INFO] [INFO] --------------------------< org.bf2:log-sink >-------------------------- [INFO] Building connectors-images :: log-sink 0.1 [INFO] --------------------------------[ jar ]--------------------------------- [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ log-sink --- [INFO] Deleting /Users/gnodet/work/git/cos-fleet-catalog-camel/cos-fleet-catalog-connectors-images/log-sink/target [INFO] [INFO] --- directory-maven-plugin:0.3.1:highest-basedir (directories) @ log-sink --- [INFO] Highest basedir set to: /Users/gnodet/work/git/cos-fleet-catalog-camel [INFO] [INFO] --- quarkus-maven-plugin:2.0.0.CR3:generate-code (default) @ log-sink --- [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 0.724 s (Wall Clock) [INFO] Finished at: 2021-06-23T10:33:49+02:00 [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal io.quarkus:quarkus-maven-plugin:2.0.0.CR3:generate-code (default) on project log-sink: Quarkus code generation phase has failed: Error while reading file as JAR: /Users/gnodet/work/git/cos-fleet-catalog-camel/cos-fleet-catalog-connectors-images/log-sink/target/classes -> [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 ➜ log-sink git:(main) ✗ ```

659435d6e0aa7250638d41a9db356a9c39ae8daf

f6a640667f70393601752cf9af7f34aacaea58f9

https://github.com/quarkusio/quarkus/compare/659435d6e0aa7250638d41a9db356a9c39ae8daf...f6a640667f70393601752cf9af7f34aacaea58f9

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 88a10542bc5..1ce97e18e35 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java @@ -290,6 +290,7 @@ public void close() { curatedApp.close(); curatedApp = null; } + appArtifact = null; quarkusBootstrap = null; } }

['devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.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/18150/18125

quarkusio

quarkus

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

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

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

fixes

Broken dependency when using OpenTelemetry + REST Client on main

## Describe the bug When combining `quarkus-opentelemetry-exporter-otlp` and `rest-client` extensions, Maven is unable to resolve the `io.quarkus:quarkus-opentelemetry-rest-client-deployment` dependency unless it is locally cached. ### Expected behavior Build success ### Actual behavior ``` [ERROR] Failed to execute goal io.quarkus:quarkus-maven-plugin:999-SNAPSHOT:generate-code (default) on project opentelemetry-test: Quarkus code generation phase has failed: Failed to bootstrap the application: Failed to create the application model for org.acme:opentelemetry-test::jar:1.0.0-SNAPSHOT: Failed to resolve artifacts: Could not find artifact io.quarkus:quarkus-opentelemetry-rest-client-deployment:jar:999-SNAPSHOT ``` ## To Reproduce Make sure you do not have `io.quarkus:quarkus-opentelemetry-rest-client-deployment:jar:999-SNAPSHOT` in local Maven repo and a remote repo with Quarkus `999-SNAPSHOT` is available. ``` mvn io.quarkus:quarkus-maven-plugin:999-SNAPSHOT:create \\ -DplatformArtifactId=quarkus-bom \\ -DprojectGroupId=org.acme \\ -DprojectArtifactId=opentelemetry-test \\ -Dextensions="rest-client,quarkus-opentelemetry-exporter-otlp" cd opentelemetry-test mvn clean compile ``` See also https://github.com/quarkusio/quarkus-quickstarts/tree/development/opentelemetry-quickstart, which fails in the same manner when using a remote repository. ## Environment: ``` Apache Maven 3.8.1 Java version: 11.0.10, vendor: AdoptOpenJDK Quarkus main (999-SNAPSHOT) ```

aa4bef3442fa26268f7ca34527e5ffe13b876d5a

fbf177fc9a9298c13d292e3bcf609a2e95e3b814

https://github.com/quarkusio/quarkus/compare/aa4bef3442fa26268f7ca34527e5ffe13b876d5a...fbf177fc9a9298c13d292e3bcf609a2e95e3b814

diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java index 8f1a931bd58..bac243760d0 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java @@ -546,7 +546,8 @@ void activate() throws BootstrapDependencyProcessingException { collectingTopRuntimeNodes = false; final ExtensionDependency extDep = getExtensionDependency(); final DependencyNode originalNode = collectDependencies(info.runtimeArtifact, extDep.exclusions); - final DependencyNode rtNode = extDep.runtimeNode; + final DefaultDependencyNode rtNode = (DefaultDependencyNode) extDep.runtimeNode; + rtNode.setRepositories(originalNode.getRepositories()); // if this node has conditional dependencies on its own, they may have been activated by this time // in which case they would be included into its children List<DependencyNode> currentChildren = rtNode.getChildren();

['independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.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/19795/19701

quarkusio

quarkus

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

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

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

fixes

Fail to redeploy to Kubernetes

### Describe the bug When running `mvn clean package -Dquarkus.kubernetes.deploy=true` to update an existing deployment in Kubernetes, it fails with: ``` Build step io.quarkus.kubernetes.deployment.KubernetesDeployer#deploy threw an exception: io.fabric8.kubernetes.client.KubernetesClientException: Failure executing: POST at: https://192.168.64.75:8443/api/v1/namespaces/default/services. Message: Service "my-app" is invalid: spec.ports[0].nodePort: Invalid value: 31084: provided port is already allocated. ``` Ths previously worked in 1.x ### Expected behavior Image is built and updated deployment rolled out to Kubernetes ### Actual behavior Exception when running `mvn clean package -Dquarkus.kubernetes.deploy=true` if application already deployed ### 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_

008792a1155c994ce2d93538fca346617e2dcc6a

7142e7913f0f476889b7353432d339ca14b2ad12

https://github.com/quarkusio/quarkus/compare/008792a1155c994ce2d93538fca346617e2dcc6a...7142e7913f0f476889b7353432d339ca14b2ad12

diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java index c358fb29ea5..362b63ae063 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java @@ -11,11 +11,12 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Path; -import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -25,6 +26,7 @@ import io.dekorate.utils.Serialization; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.KubernetesList; +import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.openshift.api.model.Route; @@ -42,7 +44,6 @@ import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem; import io.quarkus.kubernetes.client.deployment.KubernetesClientErrorHandler; import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem; -import io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem; public class KubernetesDeployer { @@ -60,7 +61,7 @@ public void selectDeploymentTarget(ContainerImageInfoBuildItem containerImageInf Optional<String> activeContainerImageCapability = ContainerImageCapabilitiesUtil .getActiveContainerImageCapability(capabilities); - if (!activeContainerImageCapability.isPresent()) { + if (activeContainerImageCapability.isEmpty()) { // we can't thrown an exception here, because it could prevent the Kubernetes resources from being generated return; } @@ -85,10 +86,10 @@ public void deploy(KubernetesClientBuildItem kubernetesClient, return; } - if (!selectedDeploymentTarget.isPresent()) { + if (selectedDeploymentTarget.isEmpty()) { - if (!ContainerImageCapabilitiesUtil - .getActiveContainerImageCapability(capabilities).isPresent()) { + if (ContainerImageCapabilitiesUtil + .getActiveContainerImageCapability(capabilities).isEmpty()) { throw new RuntimeException( "A Kubernetes deployment was requested but no extension was found to build a container image. Consider adding one of following extensions: " + CONTAINER_IMAGE_EXTENSIONS_STR + "."); @@ -158,11 +159,6 @@ private DeploymentTargetEntry determineDeploymentTarget( return selectedTarget; } - private Optional<KubernetesDeploymentTargetBuildItem> getOptionalDeploymentTarget( - List<KubernetesDeploymentTargetBuildItem> deploymentTargets, String name) { - return deploymentTargets.stream().filter(d -> name.equals(d.getName())).findFirst(); - } - private DeploymentResultBuildItem deploy(DeploymentTargetEntry deploymentTarget, KubernetesClient client, Path outputDir, OpenshiftConfig openshiftConfig, ApplicationInfoBuildItem applicationInfo) { @@ -174,12 +170,13 @@ private DeploymentResultBuildItem deploy(DeploymentTargetEntry deploymentTarget, try (FileInputStream fis = new FileInputStream(manifest)) { KubernetesList list = Serialization.unmarshalAsList(fis); - distinct(list.getItems()).forEach(i -> { - if (KNATIVE.equals(deploymentTarget.getName().toLowerCase())) { - client.resource(i).inNamespace(namespace).deletingExisting().createOrReplace(); - } else { - client.resource(i).inNamespace(namespace).createOrReplace(); + list.getItems().stream().filter(distinctByResourceKey()).forEach(i -> { + final var r = client.resource(i).inNamespace(namespace); + if (shouldDeleteExisting(deploymentTarget, i)) { + r.delete(); + r.waitUntilCondition(Objects::isNull, 10, TimeUnit.SECONDS); } + r.createOrReplace(); log.info("Applied: " + i.getKind() + " " + i.getMetadata().getName() + "."); }); @@ -221,13 +218,15 @@ private void printExposeInformation(KubernetesClient client, KubernetesList list } } - public static Predicate<HasMetadata> distictByResourceKey() { + private static boolean shouldDeleteExisting(DeploymentTargetEntry deploymentTarget, HasMetadata resource) { + return KNATIVE.equalsIgnoreCase(deploymentTarget.getName()) + || resource instanceof Service + || (Objects.equals("v1", resource.getApiVersion()) && Objects.equals("Service", resource.getKind())); + } + + private static Predicate<HasMetadata> distinctByResourceKey() { Map<Object, Boolean> seen = new ConcurrentHashMap<>(); return t -> seen.putIfAbsent(t.getApiVersion() + "/" + t.getKind() + ":" + t.getMetadata().getName(), Boolean.TRUE) == null; } - - private static Collection<HasMetadata> distinct(Collection<HasMetadata> resources) { - return resources.stream().filter(distictByResourceKey()).collect(Collectors.toList()); - } }

['extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.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/21096/21085

quarkusio

quarkus

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

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

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

fix

SmallRye GraphQL returns multiple content-types in `Content-Type` header when requested with multiple content-types in `Accept` header

### Describe the bug When querying `/graphql` with an `Accept` HTTP-header containing multiple media types, e.g. `application/json, text/plain`, the endpoint mirrors that header's content into the response's `Content-Type` header. `application/json, text/plain` is not a valid `Content-Type` and subsequent parsing fails. ### Expected behavior Only the chosen media type is used in the response's `Content-Type` header, `application/json` in this case. ### Actual behavior The response currently is invalid, and trying to process it throws an exception. See also steps to reproduce. ### How to Reproduce? Have a GraphQL endpoint, e.g.: ```java @GraphQLApi public class GraphQLResource { @Query public String test() { return "test"; } } ``` Then query it with multiple `Accept` media types, e.g.: ```java Client client = ClientBuilder.newClient(); Response response = client .target("http://localhost:8080/graphql") .request(MediaType.APPLICATION_JSON_TYPE) .accept(MediaType.TEXT_PLAIN) // this adds a second `Accept` media type .post(Entity.entity("{\\"query\\":\\"query {test}\\"}", MediaType.APPLICATION_JSON)); return response.readEntity(String.class); // exception thrown here ``` The result is an error: ``` java.lang.IllegalArgumentException: RESTEASY003340: Failure parsing MediaType string: application/json, text/plain at org.jboss.resteasy.plugins.delegates.MediaTypeHeaderDelegate.internalParse(MediaTypeHeaderDelegate.java:118) at org.jboss.resteasy.plugins.delegates.MediaTypeHeaderDelegate.parse(MediaTypeHeaderDelegate.java:69) at org.jboss.resteasy.plugins.delegates.MediaTypeHeaderDelegate.fromString(MediaTypeHeaderDelegate.java:33) at org.jboss.resteasy.plugins.delegates.MediaTypeHeaderDelegate.fromString(MediaTypeHeaderDelegate.java:19) at javax.ws.rs.core.MediaType.valueOf(MediaType.java:172) at org.jboss.resteasy.specimpl.AbstractBuiltResponse.getMediaType(AbstractBuiltResponse.java:342) at org.jboss.resteasy.specimpl.BuiltResponse.readEntity(BuiltResponse.java:90) at org.jboss.resteasy.specimpl.AbstractBuiltResponse.readEntity(AbstractBuiltResponse.java:262) ... ``` ### Output of `java -version` ``` openjdk 17 2021-09-14 OpenJDK Runtime Environment Temurin-17+35 (build 17+35) OpenJDK 64-Bit Server VM Temurin-17+35 (build 17+35, mixed mode, sharing) ``` ### Quarkus version or git rev 2.4.0.Final

76e9b87721641ada41a284d962a53a4fa38d2316

d608a6e24fcbdfe41489e686a74991b85d470cbf

https://github.com/quarkusio/quarkus/compare/76e9b87721641ada41a284d962a53a4fa38d2316...d608a6e24fcbdfe41489e686a74991b85d470cbf

diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLOverHttpTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLOverHttpTest.java index ccf5ddb9ce8..7465817bed3 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLOverHttpTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLOverHttpTest.java @@ -1,6 +1,7 @@ package io.quarkus.smallrye.graphql.deployment; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.hamcrest.CoreMatchers; @@ -77,6 +78,25 @@ public void httpPostWithQueryInQueryParamAndBodyTest() throws Exception { "{\\"data\\":{\\"user\\":{\\"id\\":\\"1\\",\\"name\\":\\"Koos\\",\\"surname\\":\\"van der Merwe\\"}}}"); // query in query parameter win } + @Test + public void httpPostWithMultipleAcceptHeaders() throws Exception { + + Map<String, String> queryparams = new HashMap<>(); + queryparams.put("query", "query ($id: ID!) { user(id:$id) { id name surname}}"); + + String variables = "{\\"id\\": \\"1\\"}"; + + String request = "query ($id: ID!) {\\n" + + " user(id:$id) {\\n" + + " name\\n" + + " }\\n" + + "}"; + + post(request, queryparams, variables, + "{\\"data\\":{\\"user\\":{\\"id\\":\\"1\\",\\"name\\":\\"Koos\\",\\"surname\\":\\"van der Merwe\\"}}}", + List.of(MEDIATYPE_JSON, MEDIATYPE_TEXT)); + } + @Test public void httpPostWithVariablesQueryParamTest() throws Exception { @@ -121,13 +141,18 @@ private static Map<String, String> configuration() { } private void post(String request, Map<String, ?> queryparams, String variables, String expected) { + post(request, queryparams, variables, expected, List.of(MEDIATYPE_JSON)); + } + + private void post(String request, Map<String, ?> queryparams, String variables, String expected, + List<String> acceptHeaders) { RequestSpecification requestSpecification = RestAssured.given(); if (queryparams != null) { requestSpecification = requestSpecification.queryParams(queryparams); } requestSpecification.when() - .accept(MEDIATYPE_JSON) + .accept(String.join(",", acceptHeaders)) .contentType(MEDIATYPE_JSON) .body(getPayload(request, variables)) .post("/graphql") diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java index 161305c4565..df03f1d40b8 100644 --- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java +++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java @@ -20,6 +20,8 @@ import io.vertx.core.http.HttpHeaders; import io.vertx.core.http.HttpServerRequest; import io.vertx.core.http.HttpServerResponse; +import io.vertx.ext.web.MIMEHeader; +import io.vertx.ext.web.ParsedHeaderValues; import io.vertx.ext.web.RoutingContext; /** @@ -211,9 +213,19 @@ private String getRequestContentType(RoutingContext ctx) { } private String getRequestAccept(RoutingContext ctx) { - String accept = ctx.request().getHeader("Accept"); - if (accept != null && !accept.isEmpty() && !accept.startsWith("*/*")) { - return accept; + ParsedHeaderValues parsedHeaders = ctx.parsedHeaders(); + if (parsedHeaders != null && parsedHeaders.accept() != null && !parsedHeaders.accept().isEmpty()) { + List<MIMEHeader> acceptList = parsedHeaders.accept(); + for (MIMEHeader a : acceptList) { + if (isValidAcceptRequest(a.rawValue())) { + return a.rawValue(); + } + } + // Seems like an unknown accept is passed in + String accept = ctx.request().getHeader("Accept"); + if (accept != null && !accept.isEmpty() && !accept.startsWith("*/*")) { + return accept; + } } return DEFAULT_RESPONSE_CONTENT_TYPE; }

['extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLOverHttpTest.java', 'extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.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/21294/21145

quarkusio

quarkus

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

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

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

fixes

Dev mode first hot reload request is 'ignored' if there is no active REST endpoint on the service under Ubuntu

### Describe the bug In the `intellij` terminal the first `s` triggers a manual restart when the Quarkus service has an active REST endpoint. But if it doesn't have one, then the first `s` is ignored and restart only occurs on sending the second one as well. ### Expected behavior Restart on the first request. ### Actual behavior Restarts only on the second request even if minutes pass between the two. ### How to Reproduce? A reproducer can be found at: https://github.com/tlvlp/quarkus-hot-reload-test (Note: it's only an empty, freshly generated project.) 1. Launch the service 2. Wait for the build and dev mode to load and for the service to start. 3. Make any changes to the code. 4. Select intellij's terminal 5. Press 's' and 'enter 6. Nothing happens 7. Repeat step 5. 8. The service hot-reload is triggered. ### Output of `uname -a` or `ver` Linux tux 5.11.0-34-generic #36~20.04.1-Ubuntu SMP Fri Aug 27 08:06:32 UTC 2021 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) n/a ### Quarkus version or git rev 2.3.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Maven 3.8.1 ### Additional information Related to #20809 where the affected code segment is also mentioned. ``` Linux 5.11.0-34-generic Current Desktop: ubuntu:GNOME IntelliJ IDEA 2021.2.3 (Ultimate Edition) Build #IU-212.5457.46, built on October 12, 2021 Runtime version: 11.0.12+7-b1504.40 amd64 VM: OpenJDK 64-Bit Server VM by JetBrains s.r.o. com.redhat.devtools.intellij.quarkus (1.8.0.176) ```

598534257da772dc70b645e5f62fba430751cdf2

c1bdc229616814547d14d714bcf87383b9d60cea

https://github.com/quarkusio/quarkus/compare/598534257da772dc70b645e5f62fba430751cdf2...c1bdc229616814547d14d714bcf87383b9d60cea

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 2381a90dc31..f40fdeb9abb 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java @@ -12,6 +12,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -27,14 +28,13 @@ import java.util.Optional; import java.util.Properties; import java.util.Set; -import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.aesh.readline.tty.terminal.TerminalConnection; +import org.aesh.readline.terminal.impl.ExecPty; +import org.aesh.readline.terminal.impl.Pty; import org.aesh.terminal.Attributes; -import org.aesh.terminal.Connection; import org.aesh.terminal.utils.ANSI; import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.MavenSession; @@ -337,7 +337,7 @@ public class DevMojo extends AbstractMojo { private Attributes attributes; private int windowsAttributes; private boolean windowsAttributesSet; - private Connection connection; + private Pty pty; private boolean windowsColorSupport; @Override @@ -438,21 +438,15 @@ private void saveTerminalState() { } } } catch (Throwable t) { + //this only works with a proper PTY based terminal + //Aesh creates an input pump thread, that will steal + //input from the dev mode process try { - //this does not work on windows - //jansi creates an input pump thread, that will steal - //input from the dev mode process - new TerminalConnection(new Consumer<Connection>() { - @Override - public void accept(Connection connection) { - attributes = connection.getAttributes(); - DevMojo.this.connection = connection; - } - }); - } catch (IOException e) { - getLog().error( - "Failed to setup console restore, console may be left in an inconsistent state if the process is killed", - e); + Pty pty = ExecPty.current(); + attributes = pty.getAttr(); + DevMojo.this.pty = pty; + } catch (Exception e) { + getLog().debug("Failed to get a local tty", e); } } } @@ -461,16 +455,21 @@ private void restoreTerminalState() { if (windowsAttributesSet) { WindowsSupport.setConsoleMode(windowsAttributes); } else { - if (attributes == null || connection == null) { + if (attributes == null || pty == null) { return; } - connection.setAttributes(attributes); - int height = connection.size().getHeight(); - connection.write(ANSI.MAIN_BUFFER); - connection.write(ANSI.CURSOR_SHOW); - connection.write("\\u001B[0m"); - connection.write("\\033[" + height + ";0H"); - connection.close(); + Pty finalPty = pty; + try (finalPty) { + finalPty.setAttr(attributes); + int height = finalPty.getSize().getHeight(); + String sb = ANSI.MAIN_BUFFER + + ANSI.CURSOR_SHOW + + "\\u001B[0m" + + "\\033[" + height + ";0H"; + finalPty.getSlaveOutput().write(sb.getBytes(StandardCharsets.UTF_8)); + } catch (IOException e) { + getLog().error("Error restoring console state", e); + } } }

['devtools/maven/src/main/java/io/quarkus/maven/DevMojo.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/21281/21280

quarkusio

quarkus

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

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

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

resolves

Warnings about `@io.quarkus.arc.runtime.devconsole.Monitored` on private methods

### Describe the bug I see several warnings about `@io.quarkus.arc.runtime.devconsole.Monitored` on private methods of Infinispan classes when using Quarkus main in dev mode. Noticed when looking into https://github.com/quarkusio/quarkus/pull/21267 I think these warnings should be eliminated, it's distraction when using dev mode. ``` 2021-11-08 16:24:34,262 WARN [io.qua.arc.pro.Methods] (build-14) @io.quarkus.arc.runtime.devconsole.Monitored will have no effect on method io.quarkus.infinispan.client.runtime.InfinispanClientProducer.builderFromProperties() because the method is private 2021-11-08 16:24:34,266 WARN [io.qua.arc.pro.Methods] (build-14) @io.quarkus.arc.runtime.devconsole.Monitored will have no effect on method io.quarkus.infinispan.client.runtime.InfinispanClientProducer.getRemoteAnnotation() because the method is private 2021-11-08 16:24:34,267 WARN [io.qua.arc.pro.Methods] (build-14) @io.quarkus.arc.runtime.devconsole.Monitored will have no effect on method io.quarkus.infinispan.client.runtime.InfinispanClientProducer.initialize() because the method is private 2021-11-08 16:24:34,271 WARN [io.qua.arc.pro.Methods] (build-14) @io.quarkus.arc.runtime.devconsole.Monitored will have no effect on method io.smallrye.config.inject.ConfigProducer.lambda$produceSupplierConfigValue$0() because the method is private ``` ### Expected behavior No warnings related to `@io.quarkus.arc.runtime.devconsole.Monitored` ### Actual behavior warnings present: ``` 2021-11-08 16:24:34,262 WARN [io.qua.arc.pro.Methods] (build-14) @io.quarkus.arc.runtime.devconsole.Monitored will have no effect on method io.quarkus.infinispan.client.runtime.InfinispanClientProducer.builderFromProperties() because the method is private 2021-11-08 16:24:34,266 WARN [io.qua.arc.pro.Methods] (build-14) @io.quarkus.arc.runtime.devconsole.Monitored will have no effect on method io.quarkus.infinispan.client.runtime.InfinispanClientProducer.getRemoteAnnotation() because the method is private 2021-11-08 16:24:34,267 WARN [io.qua.arc.pro.Methods] (build-14) @io.quarkus.arc.runtime.devconsole.Monitored will have no effect on method io.quarkus.infinispan.client.runtime.InfinispanClientProducer.initialize() because the method is private 2021-11-08 16:24:34,271 WARN [io.qua.arc.pro.Methods] (build-14) @io.quarkus.arc.runtime.devconsole.Monitored will have no effect on method io.smallrye.config.inject.ConfigProducer.lambda$produceSupplierConfigValue$0() because the method is private ``` ### How to Reproduce? mvn io.quarkus.platform:quarkus-maven-plugin:999-SNAPSHOT:create -DprojectGroupId=my-groupId -DprojectArtifactId=my-app -DprojectVersion=1.0.0-SNAPSHOT -DpackageName=org.my.group -DplatformGroupId=io.quarkus -DplatformArtifactId=quarkus-bom -DplatformVersion=999-SNAPSHOT -DquarkusRegistryClient=false -Dextensions=quarkus-infinispan-client,quarkus-micrometer mvn -f my-app quarkus:dev ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` Java 17 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev main ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

306c342116e83708eb7f4bde1dd705c5f1549c7e

16450533f18d80425bae125834808f5fd55b698f

https://github.com/quarkusio/quarkus/compare/306c342116e83708eb7f4bde1dd705c5f1549c7e...16450533f18d80425bae125834808f5fd55b698f

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java index 63dd492940a..930c8f40668 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java @@ -188,6 +188,20 @@ static Set<MethodInfo> addInterceptedMethodCandidates(BeanDeployment beanDeploym List<AnnotationInstance> methodLevelBindings = methodAnnnotations.stream() .flatMap(a -> beanDeployment.extractInterceptorBindings(a).stream()) .collect(Collectors.toList()); + if (Modifier.isPrivate(method.flags()) + && !methodLevelBindings.isEmpty() + && !Annotations.contains(methodAnnnotations, DotNames.OBSERVES) + && !Annotations.contains(methodAnnnotations, DotNames.OBSERVES_ASYNC)) { + if (merged.size() == 1) { + LOGGER.warnf("%s will have no effect on method %s.%s() because the method is private", + methodLevelBindings.iterator().next(), classInfo.name(), method.name()); + } else { + LOGGER.warnf("Annotations %s will have no effect on method %s.%s() because the method is private", + methodLevelBindings.stream().map(AnnotationInstance::toString).collect(Collectors.joining(",")), + classInfo.name(), method.name()); + } + + } merged.addAll(methodLevelBindings); for (AnnotationInstance classLevelBinding : classLevelBindings) { if (methodLevelBindings.isEmpty() @@ -197,30 +211,18 @@ static Set<MethodInfo> addInterceptedMethodCandidates(BeanDeployment beanDeploym } } if (!merged.isEmpty()) { - if (Modifier.isPrivate(method.flags())) { - if (merged.size() == 1) { - LOGGER.warnf("%s will have no effect on method %s.%s() because the method is private", - merged.iterator().next(), classInfo.name(), method.name()); + boolean addToCandidates = true; + if (Modifier.isFinal(method.flags())) { + if (transformUnproxyableClasses) { + methodsFromWhichToRemoveFinal.add(NameAndDescriptor.fromMethodInfo(method)); } else { - LOGGER.warnf("Annotations %s will have no effect on method %s.%s() because the method is private", - merged.stream().map(AnnotationInstance::toString).collect(Collectors.joining(",")), - classInfo.name(), method.name()); - } - - } else { - boolean addToCandidates = true; - if (Modifier.isFinal(method.flags())) { - if (transformUnproxyableClasses) { - methodsFromWhichToRemoveFinal.add(NameAndDescriptor.fromMethodInfo(method)); - } else { - addToCandidates = false; - finalMethodsFoundAndNotChanged.add(method); - } - } - if (addToCandidates) { - candidates.computeIfAbsent(new Methods.MethodKey(method), key -> merged); + addToCandidates = false; + finalMethodsFoundAndNotChanged.add(method); } } + if (addToCandidates) { + candidates.computeIfAbsent(new Methods.MethodKey(method), key -> merged); + } } } skipPredicate.methodsProcessed();

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.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/21272/21245

quarkusio

quarkus

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

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

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

fix

Quarkus Tests with SmallRye Health Extension Sometimes Fail When Run In Parallel

### Describe the bug After adding extension `io.quarkus:quarkus-smallrye-health` running multiple tests in parallel sometimes causes `NoSuchFileException`. ``` Caused by: java.nio.file.NoSuchFileException: /var/folders/1z/vlh4t0fj7qx8dldd244qst9w0000gp/T/quarkus/com.example/health-ui-no-such-file/io.smallrye/smallrye-health-ui/3.1.2/healthui.js 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.Files.readAllBytes(Files.java:3206) at io.quarkus.smallrye.health.deployment.SmallRyeHealthProcessor.updateApiUrl(SmallRyeHealthProcessor.java:500) at io.quarkus.smallrye.health.deployment.SmallRyeHealthProcessor.registerUiExtension(SmallRyeHealthProcessor.java:436) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at io.quarkus.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:821) ``` Best I can tell digging through the source, ui resources are being extracted from the `smallrye-health-ui` jar and put into a temporary directory, but that location is not unique per test and is being cleaned prior to extraction, so tests running in parallel can cause already extracted files to be deleted and subsequent errors on read. I'm running multiple tests in parallel in gradle with: ``` test { maxParallelForks = 4 } ``` This is still an issue even with the health ui is disabled via `quarkus.smallrye-health.ui.enable = false` ### Expected behavior Tests run in parallel do not fail due to the extension `io.quarkus:quarkus-smallrye-health` being applied. ### Actual behavior Build fails with above exception. ### How to Reproduce? [health-ui-no-such-file.zip](https://github.com/quarkusio/quarkus/files/7489383/health-ui-no-such-file.zip) The above project reproduces the issue pretty consistently for me just running `./gradlew build` ### Output of `uname -a` or `ver` Darwin WMac5205964 20.6.0 Darwin Kernel Version 20.6.0: Tue Oct 12 18:33:42 PDT 2021; root:xnu-7195.141.8~1/RELEASE_X86_64 x86_64 ### Output of `java -version` openjdk version "11.0.11" 2021-04-20 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.4.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 7.2 ### Additional information _No response_

c0d72e6aedee01365d4b1a0f6ae005ae61813b71

fa6d0200cfabab67bc3f6f611d4b322a30b9fc38

https://github.com/quarkusio/quarkus/compare/c0d72e6aedee01365d4b1a0f6ae005ae61813b71...fa6d0200cfabab67bc3f6f611d4b322a30b9fc38

diff --git a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthProcessor.java b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthProcessor.java index cf0bac72245..efa2a2e4045 100644 --- a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthProcessor.java +++ b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthProcessor.java @@ -61,6 +61,7 @@ import io.quarkus.kubernetes.spi.KubernetesHealthReadinessPathBuildItem; import io.quarkus.kubernetes.spi.KubernetesHealthStartupPathBuildItem; import io.quarkus.maven.dependency.ResolvedDependency; +import io.quarkus.runtime.LaunchMode; import io.quarkus.smallrye.health.deployment.spi.HealthBuildItem; import io.quarkus.smallrye.health.runtime.QuarkusAsyncHealthCheckFactory; import io.quarkus.smallrye.health.runtime.ShutdownReadinessListener; @@ -433,8 +434,10 @@ void registerUiExtension( Path tempPath = WebJarUtil.copyResourcesForDevOrTest(liveReloadBuildItem, curateOutcomeBuildItem, launchMode, artifact, HEALTH_UI_WEBJAR_PREFIX); - updateApiUrl(tempPath.resolve(JS_FILE_TO_UPDATE), healthPath); - updateApiUrl(tempPath.resolve(INDEX_FILE_TO_UPDATE), healthPath); + if (launchMode.equals(LaunchMode.DEVELOPMENT)) { + updateApiUrl(tempPath.resolve(JS_FILE_TO_UPDATE), healthPath); + updateApiUrl(tempPath.resolve(INDEX_FILE_TO_UPDATE), healthPath); + } smallRyeHealthBuildProducer .produce(new SmallRyeHealthBuildItem(tempPath.toAbsolutePath().toString(), healthUiPath));

['extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthProcessor.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/21270/21044

quarkusio

quarkus

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

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

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

fix

Reactive routes incorrect json serialization

### Describe the bug Reactive routes resources returning invalid json when using `@RolesAllowed` annotation. Without the annotation its working fine. Its working fine using Quarkus 2.3 version ### Expected behavior API should return below JSON response ```javascript [ { "message": "Hello!" }, { "message": "Hola!" }, { "message": "Bonjour!" }, { "message": "Ciao!" } ] ``` ### Actual behavior Instead its returning ```javascript {"message":"Hello!"}{"message":"Hola!"}{"message":"Bonjour!"}{"message":"Ciao!"} ``` ### How to Reproduce? Reproducer: https://github.com/MM87037/reactive-routes Steps: 1. Run `mvn clean verify` to see the failure ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` OpenJDK Runtime Environment Temurin-17+35 (build 17+35) OpenJDK 64-Bit Server VM Temurin-17+35 (build 17+35, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.4.0 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.1 ### Additional information _No response_

7c09477c193b0571d6ddab8371b99550dd00a1b0

03e4b49e6ab8beb82d3f349e7b661900e266c38f

https://github.com/quarkusio/quarkus/compare/7c09477c193b0571d6ddab8371b99550dd00a1b0...03e4b49e6ab8beb82d3f349e7b661900e266c38f

diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.java index 209d37d1ab4..7d2474d0730 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.java @@ -41,7 +41,9 @@ public Object handle(InvocationContext ic) throws Exception { }).subscribeAsCompletionStage(); } else if (Multi.class.isAssignableFrom(returnType)) { return constrainer.nonBlockingCheck(ic.getMethod(), ic.getParameters()) - .onItem().transformToMulti(new MultiContinuation(ic)); + // Do not use transformToMulti as we want to preserve the type of multi produced by the user method. + // This is required for Reactive Routes to handle custom Multi serialization. + .toMulti().plug(x -> new MultiContinuation(ic).apply(x)); } else { constrainer.check(ic.getMethod(), ic.getParameters()); return ic.proceed();

['extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.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/21143/21106

quarkusio

quarkus

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

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

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

close

Gradle MulitModule Project: quarkusGenerateCodeTests: java.lang.NullPointerException

### Describe the bug on my [project](https://github.com/tower-projects/tower-web-template) use quarkus 2.2.1.Final,can be start success but,when upgrade to 2.4.0.Final to build has exception ``` Caused by: java.lang.NullPointerException at io.quarkus.gradle.builder.GradleApplicationModelBuilder.initProjectModule(GradleApplicationModelBuilder.java:487) at io.quarkus.gradle.builder.GradleApplicationModelBuilder.initProjectModuleAndBuildPaths(GradleApplicationModelBuilder.java:443) at io.quarkus.gradle.builder.GradleApplicationModelBuilder.collectDependencies(GradleApplicationModelBuilder.java:393) at io.quarkus.gradle.builder.GradleApplicationModelBuilder.lambda$collectDependencies$5(GradleApplicationModelBuilder.java:320) at io.quarkus.gradle.builder.GradleApplicationModelBuilder.collectDependencies(GradleApplicationModelBuilder.java:320) at io.quarkus.gradle.builder.GradleApplicationModelBuilder.buildAll(GradleApplicationModelBuilder.java:160) at io.quarkus.gradle.extension.QuarkusPluginExtension.create(QuarkusPluginExtension.java:217) at io.quarkus.gradle.extension.QuarkusPluginExtension.getApplicationModel(QuarkusPluginExtension.java:211) at io.quarkus.gradle.tasks.QuarkusGenerateCode.prepareQuarkus(QuarkusGenerateCode.java:91) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ``` ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? 1.clone my project [email protected]:tower-projects/tower-web-template.git 2. exec: ./gradlew clean quarkusDev -p server --stacktrace -x test ### 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_

ceb133facb9d495b440f4e9a836702fc267198c1

ab48d75165e90c05d281acd0863c579f7c8a7a9f

https://github.com/quarkusio/quarkus/compare/ceb133facb9d495b440f4e9a836702fc267198c1...ab48d75165e90c05d281acd0863c579f7c8a7a9f

diff --git a/devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java b/devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java index 5d4c13ba673..4b4f3a9a742 100644 --- a/devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java +++ b/devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java @@ -178,7 +178,6 @@ public static ResolvedDependency getProjectArtifact(Project project, LaunchMode final DefaultWorkspaceModule mainModule = new DefaultWorkspaceModule( new GAV(appArtifact.getGroupId(), appArtifact.getArtifactId(), appArtifact.getVersion()), project.getProjectDir(), project.getBuildDir()); - initProjectModule(project, mainModule, javaConvention.getSourceSets().findByName(SourceSet.MAIN_SOURCE_SET_NAME), false); if (mode.equals(LaunchMode.TEST)) { @@ -479,12 +478,17 @@ private void processQuarkusDependency(ResolvedDependencyBuilder artifactBuilder, private static void initProjectModule(Project project, DefaultWorkspaceModule module, SourceSet sourceSet, boolean test) { + if (sourceSet == null) { + return; + } + module.setBuildFiles(PathList.of(project.getBuildFile().toPath())); final FileCollection allClassesDirs = sourceSet.getOutput().getClassesDirs(); // some plugins do not add source directories to source sets and they may be missing from sourceSet.getAllJava() // see https://github.com/quarkusio/quarkus/issues/20755 final TaskCollection<AbstractCompile> compileTasks = project.getTasks().withType(AbstractCompile.class); + compileTasks.forEach(t -> { if (!t.getEnabled()) { return;

['devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.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/21121/21120

quarkusio

quarkus

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

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

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

closes

Unpredictable reactive controller behavior.

### Describe the bug I decided to refactor one of my service written in quarkus from blocking io to reactive manner. I have many mock controller which works perfectly before refactor but now some of them throws errors: ``` java.lang.NullPointerException: Cannot invoke "org.jboss.resteasy.reactive.server.mapping.RuntimeResource.getResourceClass()" because the return value of "org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext.getTarget()" is null at org.jboss.resteasy.reactive.server.core.ExceptionMapping.logBlockingErrorIfRequired(ExceptionMapping.java:103) at org.jboss.resteasy.reactive.server.core.ExceptionMapping.mapException(ExceptionMapping.java:95) at org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext.mapExceptionIfPresent(ResteasyReactiveRequestContext.java:340) at org.jboss.resteasy.reactive.server.handlers.ExceptionHandler.handle(ExceptionHandler.java:15) at org.jboss.resteasy.reactive.server.handlers.ExceptionHandler.handle(ExceptionHandler.java:9) at org.jboss.resteasy.reactive.common.core.AbstractResteasyReactiveContext.run(AbstractResteasyReactiveContext.java:141) at org.jboss.resteasy.reactive.server.handlers.RestInitialHandler.beginProcessing(RestInitialHandler.java:47) at org.jboss.resteasy.reactive.server.vertx.ResteasyReactiveVertxHandler.handle(ResteasyReactiveVertxHandler.java:17) at org.jboss.resteasy.reactive.server.vertx.ResteasyReactiveVertxHandler.handle(ResteasyReactiveVertxHandler.java:7) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1127) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:151) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:133) at io.quarkus.vertx.http.runtime.StaticResourcesRecorder.lambda$start$1(StaticResourcesRecorder.java:67) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1127) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:151) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:133) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$5.handle(VertxHttpRecorder.java:351) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$5.handle(VertxHttpRecorder.java:329) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1127) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:151) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:133) at io.vertx.ext.web.impl.RouterImpl.handle(RouterImpl.java:55) at io.vertx.ext.web.impl.RouterImpl.handle(RouterImpl.java:37) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$10.handle(VertxHttpRecorder.java:443) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$10.handle(VertxHttpRecorder.java:440) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$1.handle(VertxHttpRecorder.java:151) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$1.handle(VertxHttpRecorder.java:133) at io.vertx.core.http.impl.Http1xServerRequestHandler.handle(Http1xServerRequestHandler.java:67) at io.vertx.core.http.impl.Http1xServerRequestHandler.handle(Http1xServerRequestHandler.java:30) at io.vertx.core.impl.EventLoopContext.emit(EventLoopContext.java:50) at io.vertx.core.impl.DuplicatedContext.emit(DuplicatedContext.java:168) at io.vertx.core.http.impl.Http1xServerConnection.handleMessage(Http1xServerConnection.java:143) at io.vertx.core.net.impl.ConnectionBase.read(ConnectionBase.java:155) at io.vertx.core.net.impl.VertxHandler.channelRead(VertxHandler.java:154) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:379) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:365) at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:357) at io.netty.channel.ChannelInboundHandlerAdapter.channelRead(ChannelInboundHandlerAdapter.java:93) at io.netty.handler.codec.http.websocketx.extensions.WebSocketServerExtensionHandler.channelRead(WebSocketServerExtensionHandler.java:99) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:379) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:365) at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:357) at io.vertx.core.http.impl.Http1xUpgradeToH2CHandler.channelRead(Http1xUpgradeToH2CHandler.java:116) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:379) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:365) at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:357) at io.netty.handler.timeout.IdleStateHandler.channelRead(IdleStateHandler.java:286) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:379) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:365) at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:357) at io.netty.handler.codec.ByteToMessageDecoder.fireChannelRead(ByteToMessageDecoder.java:324) at io.netty.handler.codec.ByteToMessageDecoder.fireChannelRead(ByteToMessageDecoder.java:311) at io.netty.handler.codec.ByteToMessageDecoder.callDecode(ByteToMessageDecoder.java:432) at io.netty.handler.codec.ByteToMessageDecoder.channelRead(ByteToMessageDecoder.java:276) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:379) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:365) at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:357) at io.vertx.core.http.impl.Http1xOrH2CHandler.end(Http1xOrH2CHandler.java:61) at io.vertx.core.http.impl.Http1xOrH2CHandler.channelRead(Http1xOrH2CHandler.java:38) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:379) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:365) at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:357) at io.netty.handler.timeout.IdleStateHandler.channelRead(IdleStateHandler.java:286) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:379) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:365) at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:357) at io.netty.channel.DefaultChannelPipeline$HeadContext.channelRead(DefaultChannelPipeline.java:1410) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:379) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:365) at io.netty.channel.DefaultChannelPipeline.fireChannelRead(DefaultChannelPipeline.java:919) at io.netty.channel.epoll.AbstractEpollStreamChannel$EpollStreamUnsafe.epollInReady(AbstractEpollStreamChannel.java:795) at io.netty.channel.epoll.EpollEventLoop.processReady(EpollEventLoop.java:480) at io.netty.channel.epoll.EpollEventLoop.run(EpollEventLoop.java:378) at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:986) 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:831) ``` For example this controller doesn't work: ```java package pl.test.rest.recaptcha; import io.smallrye.mutiny.Uni; import pl.test.rest.recaptcha.model.SiteVerifyResponse; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import java.util.Date; @Path("/recaptcha/api/siteverify") public class MockResource { @POST @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_FORM_URLENCODED) public Uni<SiteVerifyResponse> siteVerify(@FormParam("response") String response , @FormParam("secret") String secret, @FormParam("remoteip") String remoteip) { return Uni.createFrom().item(SiteVerifyResponse.builder() .success(true) .score((float) 1.0) .action("ACTION") .hostname("localhost") .challengeTs(new Date()) .build()); } } ``` But this work's: ```java package pl.test.rest.dotpay; import io.smallrye.mutiny.Uni; import lombok.val; import pl.test.rest.dotpay.model.PaymentEntry; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import java.util.Collections; import java.util.List; @Path("/s2/login/api/purchase_history/") public class MockResource { @GET @Produces(MediaType.APPLICATION_JSON) public Uni<List<PaymentEntry>> api(@QueryParam("email") String email) { return Uni.createFrom().item(Collections.singletonList(createPaymentEntry())); } private PaymentEntry createPaymentEntry() { val entry = new PaymentEntry(); entry.setDate("2018-06-09T16:54:15.855823"); entry.setAmount("8.29"); entry.setCurrency("PLN"); entry.setStatus("completed"); entry.setRequestIp("188.146.162.128"); entry.setMcc("4112"); entry.setChannel("73"); entry.setMerchantId("5d51e2dc7bc76cf9841d82ba404d134646bdbd97"); return entry; } } ``` The one thing what I'am done in refactor is change the return type to new one with wrapper Uni. I found on network similar error: https://github.com/quarkusio/quarkus/runs/3204982867 ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` Linux 5.13.0-20-generic #20-Ubuntu SMP Fri Oct 15 14:21:35 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` 16.0.2 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.4.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.6.2 ### Additional information _No response_

5c3ec06e41774c9f47f09ca74bffa8512832dea3

6cd9b08cdf4e5f4889bd7840670af2413ea513a0

https://github.com/quarkusio/quarkus/compare/5c3ec06e41774c9f47f09ca74bffa8512832dea3...6cd9b08cdf4e5f4889bd7840670af2413ea513a0

diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java index 1b08a3ec8c7..adb8f41f953 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java @@ -161,7 +161,7 @@ public void run() { if (t instanceof PreserveTargetException) { handleException(t.getCause(), true); } else { - handleException(t); + handleException(t, true); } if (aborted) { return; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ExceptionMapping.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ExceptionMapping.java index f1d0d44ea47..db68bf80bc7 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ExceptionMapping.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ExceptionMapping.java @@ -22,6 +22,7 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.ResteasyReactiveClientProblem; import org.jboss.resteasy.reactive.common.model.ResourceExceptionMapper; +import org.jboss.resteasy.reactive.server.mapping.RuntimeResource; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveAsyncExceptionMapper; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveExceptionMapper; import org.jboss.resteasy.reactive.spi.BeanFactory; @@ -99,31 +100,46 @@ public void mapException(Throwable throwable, ResteasyReactiveRequestContext con private void logBlockingErrorIfRequired(Throwable throwable, ResteasyReactiveRequestContext context) { if (isBlockingProblem(throwable)) { - log.error("A blocking operation occurred on the IO thread. This likely means you need to annotate " - + context.getTarget().getResourceClass().getName() + "#" + context.getTarget().getJavaMethodName() + "(" - + Arrays.stream(context.getTarget().getParameterTypes()).map(Objects::toString) - .collect(Collectors.joining(", ")) - + ") with @" - + Blocking.class.getName() - + ". Alternatively you can annotate the class " + context.getTarget().getResourceClass().getName() - + " to make every method on the class blocking, or annotate your sub class of the " - + Application.class.getName() + " class to make the whole application blocking"); + RuntimeResource runtimeResource = context.getTarget(); + if (runtimeResource == null) { + log.error("A blocking operation occurred on the IO thread. This likely means you need to use the @" + + Blocking.class.getName() + " annotation on the Resource method, class or " + + Application.class.getName() + " class."); + } else { + log.error("A blocking operation occurred on the IO thread. This likely means you need to annotate " + + runtimeResource.getResourceClass().getName() + "#" + runtimeResource.getJavaMethodName() + "(" + + Arrays.stream(runtimeResource.getParameterTypes()).map(Objects::toString) + .collect(Collectors.joining(", ")) + + ") with @" + + Blocking.class.getName() + + ". Alternatively you can annotate the class " + runtimeResource.getResourceClass().getName() + + " to make every method on the class blocking, or annotate your sub class of the " + + Application.class.getName() + " class to make the whole application blocking"); + } } } private void logNonBlockingErrorIfRequired(Throwable throwable, ResteasyReactiveRequestContext context) { if (isNonBlockingProblem(throwable)) { - log.error( - "An operation that needed be run on a Vert.x EventLoop thread was run on a worker pool thread. This likely means you need to annotate " - + context.getTarget().getResourceClass().getName() + "#" + context.getTarget().getJavaMethodName() - + "(" - + Arrays.stream(context.getTarget().getParameterTypes()).map(Objects::toString) - .collect(Collectors.joining(", ")) - + ") with @" - + NonBlocking.class.getName() - + ". Alternatively you can annotate the class " + context.getTarget().getResourceClass().getName() - + " to make every method on the class run on a Vert.x EventLoop thread, or annotate your sub class of the " - + Application.class.getName() + " class to affect the entire application"); + RuntimeResource runtimeResource = context.getTarget(); + if (runtimeResource == null) { + log.error( + "An operation that needed be run on a Vert.x EventLoop thread was run on a worker pool thread. This likely means you use the @" + + NonBlocking.class.getName() + " annotation on the Resource method, class or " + + Application.class.getName() + " class."); + } else { + log.error( + "An operation that needed be run on a Vert.x EventLoop thread was run on a worker pool thread. This likely means you need to annotate " + + runtimeResource.getResourceClass().getName() + "#" + runtimeResource.getJavaMethodName() + + "(" + + Arrays.stream(runtimeResource.getParameterTypes()).map(Objects::toString) + .collect(Collectors.joining(", ")) + + ") with @" + + NonBlocking.class.getName() + + ". Alternatively you can annotate the class " + runtimeResource.getResourceClass().getName() + + " to make every method on the class run on a Vert.x EventLoop thread, or annotate your sub class of the " + + Application.class.getName() + " class to affect the entire application"); + } } }

['independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ExceptionMapping.java', 'independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.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/21086/21083

quarkusio

quarkus

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

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

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

fixes

Kafka Streams extension fails to compile with Kafka clients 3.0.0

### Describe the bug Quarkus application BOM doesn't have the Kafka client version 3.0.0 yet. When forced to be used with 3.0.0 KafkaStreams extension doesn't compile because of the removal of deprecated classes such as `PartitionAssignor` and `DefaultPartitionGrouper` ### Expected behavior Kafka extensions should continue to work with Kafka clients version 3.0.0 ### Actual behavior _No response_ ### How to Reproduce? 1. In kafka-streams-quickstart/producer, force dependency org.apache.kafka:kafka-clients:3.0.0 2. Compilation fails ### 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_

b2721483f0647b1001667d2a04137733f3ae49ec

9ddd94639f06bdaaa8a2775c3e090daeccfcc654

https://github.com/quarkusio/quarkus/compare/b2721483f0647b1001667d2a04137733f3ae49ec...9ddd94639f06bdaaa8a2775c3e090daeccfcc654

diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java index 6ea3fc40bb4..98915dad001 100644 --- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java +++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java @@ -15,7 +15,6 @@ import org.apache.kafka.clients.consumer.RangeAssignor; import org.apache.kafka.clients.consumer.RoundRobinAssignor; import org.apache.kafka.clients.consumer.StickyAssignor; -import org.apache.kafka.clients.consumer.internals.PartitionAssignor; import org.apache.kafka.clients.producer.Partitioner; import org.apache.kafka.clients.producer.ProducerInterceptor; import org.apache.kafka.clients.producer.internals.DefaultPartitioner; @@ -123,6 +122,9 @@ public class KafkaProcessor { "org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerSaslClientProvider" }).collect(Collectors.toSet()); + static final DotName PARTITION_ASSIGNER = DotName + .createSimple("org.apache.kafka.clients.consumer.internals.PartitionAssignor"); + @BuildStep FeatureBuildItem feature() { return new FeatureBuildItem(Feature.KAFKA_CLIENT); @@ -188,7 +190,7 @@ public void build( collectImplementors(toRegister, indexBuildItem, Deserializer.class); collectImplementors(toRegister, indexBuildItem, Partitioner.class); // PartitionAssignor is now deprecated, replaced by ConsumerPartitionAssignor - collectImplementors(toRegister, indexBuildItem, PartitionAssignor.class); + collectImplementors(toRegister, indexBuildItem, PARTITION_ASSIGNER); collectImplementors(toRegister, indexBuildItem, ConsumerPartitionAssignor.class); collectImplementors(toRegister, indexBuildItem, ConsumerInterceptor.class); collectImplementors(toRegister, indexBuildItem, ProducerInterceptor.class); @@ -467,6 +469,10 @@ private static void collectImplementors(Set<DotName> set, CombinedIndexBuildItem collectClassNames(set, indexBuildItem.getIndex().getAllKnownImplementors(DotName.createSimple(cls.getName()))); } + private static void collectImplementors(Set<DotName> set, CombinedIndexBuildItem indexBuildItem, DotName className) { + collectClassNames(set, indexBuildItem.getIndex().getAllKnownImplementors(className)); + } + private static void collectSubclasses(Set<DotName> set, CombinedIndexBuildItem indexBuildItem, Class<?> cls) { collectClassNames(set, indexBuildItem.getIndex().getAllKnownSubclasses(DotName.createSimple(cls.getName()))); } diff --git a/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java b/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java index 93774a61fbe..00b6d746a29 100644 --- a/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java +++ b/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java @@ -11,7 +11,6 @@ import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.errors.DefaultProductionExceptionHandler; import org.apache.kafka.streams.errors.LogAndFailExceptionHandler; -import org.apache.kafka.streams.processor.DefaultPartitionGrouper; import org.apache.kafka.streams.processor.FailOnInvalidTimestamp; import org.apache.kafka.streams.processor.internals.StreamsPartitionAssignor; import org.rocksdb.RocksDBException; @@ -65,7 +64,9 @@ private void registerClassesThatAreLoadedThroughReflection(BuildProducer<Reflect private void registerCompulsoryClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) { reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, false, StreamsPartitionAssignor.class)); - reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, false, DefaultPartitionGrouper.class)); + // Class DefaultPartitionGrouper deprecated in Kafka 2.8.x and removed in 3.0.0 + reflectiveClasses.produce( + new ReflectiveClassBuildItem(true, false, false, "org.apache.kafka.streams.processor.DefaultPartitionGrouper")); reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, false, DefaultProductionExceptionHandler.class)); reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, false, FailOnInvalidTimestamp.class)); reflectiveClasses.produce(new ReflectiveClassBuildItem(true, true, true,

['extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java', 'extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.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/20965/20934

quarkusio

quarkus

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

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

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

fixes

Error occurred while destroying instance of bean io.quarkus.oidc.client.OidcClients

### Describe the bug Hi! I discovered a problem with the oidc client that occurs when you shut down an application. I am using Quarkus version 2.3.0.Final and the dependency: ``` <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-oidc-client-filter</artifactId> </dependency> ``` The application.properties is the following: ``` quarkus.oidc-client.client-enabled=false quarkus.oidc-client.CITIZEN-MAPPING.auth-server-url=${API_GATEWAY_ORIGIN} quarkus.oidc-client.CITIZEN-MAPPING.token-path=/token quarkus.oidc-client.CITIZEN-MAPPING.discovery-enabled=false quarkus.oidc-client.CITIZEN-MAPPING.client-id=${CONSUMER_KEY} quarkus.oidc-client.CITIZEN-MAPPING.credentials.secret=${CONSUMER_SECRET} ``` The code in the filter-class: ``` @RequestScoped @Priority(Priorities.AUTHENTICATION) public class CitizenMappingOAuth2Filter implements ClientRequestFilter { @Inject @NamedOidcClient("CITIZEN-MAPPING") Tokens tokens; @Override public void filter(final ClientRequestContext requestContext) { requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, "Bearer " + tokens.getAccessToken()); } } ``` The code in the service-class: ``` @Path("/1.0") @RegisterProvider(CitizenMappingOAuth2Filter.class) @RegisterRestClient(configKey = "CITIZEN-MAPPING") @ApplicationScoped public interface CitizenMappingService { @GET @Path("/citizenmapping/{personId}/personalnumber") @Produces(MediaType.TEXT_PLAIN) String getPersonalNumber(@PathParam String personId); } ``` I run my application in a docker-container and starts the container with `docker-compose up` and shutdown the application with `docker-compose down`. The problem that occurs is the following: ``` 2021-10-21 10:15:10,044 ERROR [io.qua.arc.imp.InstanceHandleImpl] (Shutdown thread) Error occurred while destroying instance of bean [io.quarkus.oidc.client.OidcClients_777be49f5563055569a690ceca758ae0746df06b_Synthetic_Bean]: io.quarkus.oidc.client.runtime.DisabledOidcClientException: 'Default' client configuration is disabled ``` The problem only occurs if I start the application, run the code that uses oidc client and then shut it down. It doesn't occurs if I just start the application and then shut it down. ### 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_

856f4bc5ed2b38a0d0ad12af1ca1cd59a78f9123

b2c4566920135d8411f5c91d5983fd67f25f2dd6

https://github.com/quarkusio/quarkus/compare/856f4bc5ed2b38a0d0ad12af1ca1cd59a78f9123...b2c4566920135d8411f5c91d5983fd67f25f2dd6

diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientRecorder.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientRecorder.java index 58c5b1e234d..70a586ce339 100644 --- a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientRecorder.java +++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientRecorder.java @@ -217,7 +217,6 @@ public Uni<Tokens> refreshTokens(String refreshToken) { @Override public void close() throws IOException { - throw new DisabledOidcClientException(message); } } }

['extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientRecorder.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/21071/19086

quarkusio

quarkus

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

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

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

fix

gradle module build execution fails when using composing build

### Describe the bug If I build my module with gradle [composite build](https://docs.gradle.org/current/userguide/composite_builds.html) the task fails. ### Expected behavior build task should complete without errors ### Actual behavior the task fails with the following message: ``` Execution failed for task ':my-module:quarkusGenerateCode'. > Failed to process /Users/...../somelib.jar ``` The file is actually there after the build fails, so I guess the task is looking for that file too soon. ### How to Reproduce? I do apologize, but the two projects are private so I don't have an easy way to create an environment where to reproduce the error ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` OpenJDK Runtime Environment GraalVM CE 21.0.0.2 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.0.3.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 6.8.3 ### Additional information _No response_

05c8824a607ce1bb613d56ae58b9057840a62d9a

55397b78c34efe10ece5721fcc97231f6d9f2876

https://github.com/quarkusio/quarkus/compare/05c8824a607ce1bb613d56ae58b9057840a62d9a...55397b78c34efe10ece5721fcc97231f6d9f2876

diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java index 08cd5ac618d..913565876bf 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java @@ -234,16 +234,6 @@ public void execute(Task test) { testSourceSet.getJava().srcDir( new File(generatedTestSourceSet.getJava().getClassesDirectory().get().getAsFile(), provider)); } - - // enable the Panache annotation processor on the classpath, if it's found among the dependencies - configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME) - .getResolutionStrategy().eachDependency(d -> { - if ("quarkus-panache-common".equals(d.getTarget().getName()) - && "io.quarkus".equals(d.getTarget().getGroup())) { - project.getDependencies().add("annotationProcessor", d.getRequested().getGroup() + ":" - + d.getRequested().getName() + ":" + d.getRequested().getVersion()); - } - }); }); project.getPlugins().withId("org.jetbrains.kotlin.jvm", plugin -> { @@ -266,6 +256,13 @@ private void registerConditionalDependencies(Project project) { .declareConditionalDependencies(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME); deploymentClasspathBuilder.createBuildClasspath(implementationExtensions, JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME); + // enable the Panache annotation processor on the classpath, if it's found among the dependencies + for (ExtensionDependency extension : implementationExtensions) { + if ("quarkus-panache-common".equals(extension.getName()) && "io.quarkus".equals(extension.getGroup())) { + project.getDependencies().add(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME, + extension.asDependencyNotation()); + } + } }); project.getConfigurations().getByName(DEV_MODE_CONFIGURATION_NAME).getIncoming().beforeResolve((devDependencies) -> { Set<ExtensionDependency> devModeExtensions = conditionalDependenciesEnabler diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/dependency/ExtensionDependency.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/dependency/ExtensionDependency.java index 6b81a298736..f454df6c340 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/dependency/ExtensionDependency.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/dependency/ExtensionDependency.java @@ -94,6 +94,14 @@ public String toModuleName() { return String.join(":", this.extensionId.getGroup(), this.extensionId.getName()); } + public String getGroup() { + return extensionId.getGroup(); + } + + public String getName() { + return extensionId.getName(); + } + @Override public boolean equals(Object o) { if (this == o)

['devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/dependency/ExtensionDependency.java', 'devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.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/21064/21025

quarkusio

quarkus

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

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

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

fixes

quarkus.config.locations was 'null' at build time and is now '/mnt/app-config-map'

### Describe the bug As a workaround for https://github.com/quarkusio/quarkus/issues/20830, I've added the following entries to my pom.xml: ```xml <!-- secrets --> <quarkus.kubernetes.secret-volumes.app-secret.secret-name>my-secret</quarkus.kubernetes.secret-volumes.app-secret.secret-name> <quarkus.kubernetes.mounts.app-secret.path>/mnt/app-secret</quarkus.kubernetes.mounts.app-secret.path> <quarkus.kubernetes.env.vars.SMALLRYE_CONFIG_SOURCE_FILE_LOCATIONS>/mnt/app-secret</quarkus.kubernetes.env.vars.SMALLRYE_CONFIG_SOURCE_FILE_LOCATIONS> <!-- config map --> <quarkus.kubernetes.app-config-map>my-config</quarkus.kubernetes.app-config-map> ``` Which the `quarkus-kubernetes` extension turn into the following env var and volumes in the generated `kubernetete.yaml` file: ```yaml apiVersion: "apps/v1" kind: "Deployment" spec: spec: containers: - env: - name: "KUBERNETES_NAMESPACE" valueFrom: fieldRef: fieldPath: "metadata.namespace" - name: "SMALLRYE_CONFIG_SOURCE_FILE_LOCATIONS" value: "/mnt/app-secret" - name: "SMALLRYE_CONFIG_LOCATIONS" value: "/mnt/app-config" volumes: - name: "app-secret" secret: secretName: "my-secret" - name: "app-config" configMap: name: "my-config" ``` When the pods starts, a warning appears: ``` WARN [io.quarkus.runtime.configuration.ConfigRecorder] (main) Build time property cannot be changed at runtime: quarkus.config.locations was 'null' at build time and is now '/mnt/app-config' ``` ### Expected behavior The warning should not appear ### Actual behavior The warning appear ### How to Reproduce? - create a project with quarkus-kubernetes as described in https://quarkus.io/guides/deploying-to-kubernetes (but using 2.4.0.CR1 as platfomr version) - add the maven properties as described to the generated pom - ./mvnw package - export SMALLRYE_CONFIG_SOURCE_FILE_LOCATIONS=/tmp - export SMALLRYE_CONFIG_LOCATIONS=/tmp - java -jar target/quarkus-app/quarkus-run.jar ### Output of `uname -a` or `ver` Linux moon 5.14.10-300.fc35.x86_64 #1 SMP Thu Oct 7 20:48:44 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "11.0.12" 2021-07-20 OpenJDK Runtime Environment 18.9 (build 11.0.12+7) OpenJDK 64-Bit Server VM 18.9 (build 11.0.12+7, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.4.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.1 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d) Maven home: /home/luca/.m2/wrapper/dists/apache-maven-3.8.1-bin/2l5mhf2pq2clrde7f7qp1rdt5m/apache-maven-3.8.1 Java version: 11.0.12, vendor: Red Hat, Inc., runtime: /usr/lib/jvm/java-11-openjdk-11.0.12.0.7-4.fc35.x86_64 Default locale: en_US, platform encoding: UTF-8 OS name: "linux", version: "5.14.10-300.fc35.x86_64", arch: "amd64", family: "unix" ### Additional information _No response_

05c8824a607ce1bb613d56ae58b9057840a62d9a

2e38c967158010e0f00ecd00afb5d12187c92bd4

https://github.com/quarkusio/quarkus/compare/05c8824a607ce1bb613d56ae58b9057840a62d9a...2e38c967158010e0f00ecd00afb5d12187c92bd4

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/DevModeBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/DevModeBuildStep.java index a896fd845ef..ebdaed9d9b0 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/DevModeBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/DevModeBuildStep.java @@ -1,24 +1,30 @@ package io.quarkus.deployment.steps; +import static io.smallrye.config.SmallRyeConfig.SMALLRYE_CONFIG_LOCATIONS; + import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; +import org.eclipse.microprofile.config.ConfigProvider; + import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem; -import io.quarkus.runtime.ConfigConfig; import io.quarkus.runtime.LiveReloadConfig; class DevModeBuildStep { @BuildStep - List<HotDeploymentWatchedFileBuildItem> watchChanges(ConfigConfig config, LiveReloadConfig liveReloadConfig) { + List<HotDeploymentWatchedFileBuildItem> watchChanges(LiveReloadConfig liveReloadConfig) { List<String> names = new ArrayList<>(); names.add("META-INF/microprofile-config.properties"); names.add("application.properties"); names.add(Paths.get(".env").toAbsolutePath().toString()); - config.locations.ifPresent(names::addAll); + Optional<List<String>> locations = ConfigProvider.getConfig().getOptionalValues(SMALLRYE_CONFIG_LOCATIONS, + String.class); + locations.ifPresent(names::addAll); liveReloadConfig.watchedResources.ifPresent(names::addAll); return names.stream().map(HotDeploymentWatchedFileBuildItem::new).collect(Collectors.toList()); } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ProfileBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ProfileBuildStep.java index 79339c9d9ec..20400b34fb2 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ProfileBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ProfileBuildStep.java @@ -1,15 +1,19 @@ package io.quarkus.deployment.steps; +import static io.smallrye.config.SmallRyeConfig.SMALLRYE_CONFIG_LOCATIONS; + import java.nio.file.Paths; +import java.util.List; +import java.util.Optional; import org.apache.commons.io.FilenameUtils; +import org.eclipse.microprofile.config.ConfigProvider; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem; import io.quarkus.deployment.builditem.LaunchModeBuildItem; import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem; -import io.quarkus.runtime.ConfigConfig; import io.quarkus.runtime.LaunchMode; public class ProfileBuildStep { @@ -22,7 +26,6 @@ RunTimeConfigurationDefaultBuildItem defaultProfile(LaunchModeBuildItem launchMo @BuildStep void watchProfileSpecificFile(LaunchModeBuildItem launchModeBuildItem, - ConfigConfig config, BuildProducer<HotDeploymentWatchedFileBuildItem> items) { String activeProfile = getProfileValue(launchModeBuildItem.getLaunchMode()); String suffixedApplicationProperties = String.format("application-%s.properties", activeProfile); @@ -31,8 +34,10 @@ void watchProfileSpecificFile(LaunchModeBuildItem launchModeBuildItem, Paths.get(String.format(".env-%s", activeProfile)).toAbsolutePath().toString())); items.produce(new HotDeploymentWatchedFileBuildItem(Paths .get(System.getProperty("user.dir"), "config", suffixedApplicationProperties).toAbsolutePath().toString())); - if (config.locations.isPresent()) { - for (String location : config.locations.get()) { + Optional<List<String>> locations = ConfigProvider.getConfig().getOptionalValues(SMALLRYE_CONFIG_LOCATIONS, + String.class); + if (locations.isPresent()) { + for (String location : locations.get()) { items.produce(new HotDeploymentWatchedFileBuildItem(appendProfileToFilename(location, activeProfile))); } } diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ConfigConfig.java b/core/runtime/src/main/java/io/quarkus/runtime/ConfigConfig.java index 6ebbd950821..1eca98398de 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/ConfigConfig.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/ConfigConfig.java @@ -14,7 +14,7 @@ * Relocation of the Config configurations to the Quarkus namespace is done in * {@link io.quarkus.runtime.configuration.ConfigUtils#configBuilder}. */ -@ConfigRoot(name = ConfigItem.PARENT, phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED) +@ConfigRoot(name = ConfigItem.PARENT, phase = ConfigPhase.RUN_TIME) public class ConfigConfig { /** * Additional config locations to be loaded with the Config. The configuration support multiple locations

['core/runtime/src/main/java/io/quarkus/runtime/ConfigConfig.java', 'core/deployment/src/main/java/io/quarkus/deployment/steps/DevModeBuildStep.java', 'core/deployment/src/main/java/io/quarkus/deployment/steps/ProfileBuildStep.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/21028/21008

quarkusio

quarkus

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

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

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

resolves

Iterating over a list of enums generated by Qute Namespace Extensions no longer works

### Describe the bug We leverage Qute Namespace extensions to populate a list or dropdown with values from an enum. See https://quarkus.io/version/main/guides/qute-reference#namespace_extension_methods ```java public enum State { OPEN("Open"), CLOSED("Closed"); private final String displayName; State(String displayName) { this.displayName = displayName; } public String getDisplayName() { return displayName; } } ``` ```java @TemplateExtension(namespace = "domain") public static class DomainExtensions { static Set<State> states() { return EnumSet.allOf(State.class); } } ``` ```html <ul> {#for state in domain:states} <li>{state.displayName}</li> {/for} </ul> ``` However this now results in an exception, also when we use checked templates. ``` [1] Incorrect expression found: {state.displayName} - property/method [displayName] not found on class [java.util.Set<nl.wjglerum.SomePage$State>] nor handled by an extension method - at page.qute.html:31 at io.quarkus.qute.deployment.QuteProcessor.processTemplateErrors(QuteProcessor.java:186) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at io.quarkus.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:887) at io.quarkus.builder.BuildContext.run(BuildContext.java:277) 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:829) at org.jboss.threads.JBossThread.run(JBossThread.java:501) Suppressed: io.quarkus.qute.TemplateException: Incorrect expression found: {state.displayName} - property/method [displayName] not found on class [java.util.Set<nl.wjglerum.SomePage$State>] nor handled by an extension method - at page.qute.html:31 at io.quarkus.qute.deployment.QuteProcessor.processTemplateErrors(QuteProcessor.java:166) ... 11 more ``` It does work correctly when you just want to render the enums, but as soon as you call a property from the enum it fails. It looks like Qute incorrectly tries to find this (virtual) method on the Set or List instance instead of the enum in the collection. This used to work up until version 2.4.0.CR1 but just failed on the latest snapshot build from the main branch. ### 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 Sample project: [quarkus-qute-enum.zip](https://github.com/quarkusio/quarkus/files/7417590/quarkus-qute-enum.zip)

fa595c735958a307b0e25563078a258e922c89ed

5a3e0b0f7a7cf8c2ccd82304b2963ca6c7ea9c00

https://github.com/quarkusio/quarkus/compare/fa595c735958a307b0e25563078a258e922c89ed...5a3e0b0f7a7cf8c2ccd82304b2963ca6c7ea9c00

diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java index 796acb8de6c..c9c68d7c169 100644 --- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java +++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java @@ -674,6 +674,15 @@ static Match validateNestedExpressions(TemplateAnalysis templateAnalysis, ClassI ClassInfo returnType = index.getClassByName(method.returnType().name()); if (returnType != null) { match.setValues(returnType, method.returnType()); + if (root.hasHints()) { + // Root is a property with hint + // E.g. 'it<loop#123>' and 'STATUS<when#123>' + if (processHints(templateAnalysis, root.asHintInfo().hints, match, index, expression, + generatedIdsToMatches, incorrectExpressions)) { + // In some cases it's necessary to reset the iterator + iterator = parts.iterator(); + } + } } else { // Return type not available return putResult(match, results, expression); diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java index 4e0525f6f58..35d7d921239 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java @@ -3,10 +3,14 @@ import static io.quarkus.qute.TemplateExtension.ANY; import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.EnumSet; +import java.util.Set; + import javax.enterprise.event.TransactionPhase; import javax.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -20,6 +24,9 @@ public class NamespaceTemplateExtensionTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .addAsResource(new StringAsset( + "{#for state in domain:states}{state.foo}{/for}"), + "templates/foo.html") .addClasses(StringExtensions.class, MyEnum.class, EnumExtensions.class)); @Inject @@ -43,6 +50,8 @@ public void testTemplateExtensions() { engine.parse("{str:quark}").render()); assertEquals("QUARKUS!", engine.parse("{str:quarkus}").render()); + assertEquals("openclosed", + engine.getTemplate("foo").render()); } @TemplateExtension(namespace = "str") @@ -73,9 +82,17 @@ static String quarkAny(String key) { } public enum MyEnum { - ONE, TWO + } + + public enum State { + OPEN, + CLOSED; + + public String getFoo() { + return toString().toLowerCase(); + } } @@ -91,6 +108,11 @@ static TransactionPhase enumValue(String value) { return TransactionPhase.valueOf(value); } + @TemplateExtension(namespace = "domain") + static Set<State> states() { + return EnumSet.allOf(State.class); + } + } }

['extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java', 'extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.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/20997/20979

quarkusio

quarkus

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

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

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

fixes

@RolesAllowed causes CompletionStage to be serialized as itself

### Describe the bug Consider the following method: @GET @Path("protected") @Produces(MediaType.APPLICATION_JSON) @RolesAllowed("protected-role") public CompletionStage<String> getProtected() { return CompletableFuture.completedFuture("{}"); } The CompletionStage is actually serialized instead of its result. ### Expected behavior The result should be serialized, that is the string `{}` should be returned by the endpoint: ``` HTTP/1.1 200 OK Content-Type: application/json content-length: 2 {} ``` ### Actual behavior The serialized JSON is that of the CompletionStage: ``` HTTP/1.1 200 OK Content-Type: application/json content-length: 85 { "cancelled": false, "done": true, "completedExceptionally": false, "numberOfDependents": 0 } ``` In a QuarkusTest I actually get a different error than while running the application: ``` 2021-10-25 13:33:02,686 ERROR [org.jbo.res.res.i18n] (executor-thread-0) RESTEASY002020: Unhandled asynchronous exception, sending back 500: com.fasterxml.jackson.databind.exc.InvalidDefinitionException: Invalid type definition for type `java.util.concurrent.CompletableFuture$MinimalStage`: Failed to construct BeanSerializer for [simple type, class java.util.concurrent.CompletableFuture$MinimalStage]: (java.lang.reflect.InaccessibleObjectException) Unable to make public boolean java.util.concurrent.CompletableFuture$MinimalStage.isCancelled() accessible: module java.base does not "opens java.util.concurrent" to unnamed module @328e4ec2 at com.fasterxml.jackson.databind.exc.InvalidDefinitionException.from(InvalidDefinitionException.java:72) ... ``` ### How to Reproduce? https://github.com/antoniomacri/quarkus-completionstage-rolesallowed ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` Java 11 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.4.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Maven 3.8.1 ### Additional information _No response_

e6275f1c444ced3fe18dead7de24c59605e67055

599096275581642aa15b07c29a5ce5070d40e9e4

https://github.com/quarkusio/quarkus/compare/e6275f1c444ced3fe18dead7de24c59605e67055...599096275581642aa15b07c29a5ce5070d40e9e4

diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDefaultTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDefaultTest.java index 60e9a2eb516..757223d2b5b 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDefaultTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDefaultTest.java @@ -6,6 +6,8 @@ import static io.quarkus.security.test.utils.SecurityTestUtils.assertFailureFor; import static io.quarkus.security.test.utils.SecurityTestUtils.assertSuccess; +import java.util.concurrent.ExecutionException; + import javax.inject.Inject; import javax.inject.Named; @@ -13,6 +15,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.function.Executable; import io.quarkus.security.ForbiddenException; import io.quarkus.security.UnauthorizedException; @@ -73,6 +76,33 @@ public void shouldRestrictAccessToSpecificRole() { assertSuccess(() -> bean.securedMethod(), "accessibleForAdminOnly", ADMIN); } + @Test + public void shouldRestrictAccessToSpecificRoleUni() { + assertFailureFor(() -> bean.securedMethodUni().await().indefinitely(), UnauthorizedException.class, ANONYMOUS); + assertFailureFor(() -> bean.securedMethodUni().await().indefinitely(), ForbiddenException.class, USER); + assertSuccess(() -> bean.securedMethodUni().await().indefinitely(), "accessibleForAdminOnly", ADMIN); + } + + @Test + public void shouldRestrictAccessToSpecificRoleCompletionState() { + Executable executable = () -> { + try { + bean.securedMethodCompletionStage().toCompletableFuture().get(); + } catch (ExecutionException e) { + throw e.getCause(); + } + }; + assertFailureFor(executable, UnauthorizedException.class, ANONYMOUS); + assertFailureFor(executable, ForbiddenException.class, USER); + assertSuccess(() -> { + try { + return bean.securedMethodCompletionStage().toCompletableFuture().get(); + } catch (InterruptedException | ExecutionException e) { + throw new RuntimeException(e); + } + }, "accessibleForAdminOnly", ADMIN); + } + @Test public void shouldFailToAccessForbiddenOnClass() { assertFailureFor(() -> denyAllBean.noAdditionalConstraints(), UnauthorizedException.class, ANONYMOUS); diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/BeanWithSecuredMethods.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/BeanWithSecuredMethods.java index 8dca89dfe04..987620fa5e9 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/BeanWithSecuredMethods.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/BeanWithSecuredMethods.java @@ -1,10 +1,14 @@ package io.quarkus.security.test.cdi.app; +import java.util.concurrent.CompletionStage; + import javax.annotation.security.DenyAll; import javax.annotation.security.RolesAllowed; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; +import io.smallrye.mutiny.Uni; + /** * @author Michal Szynkiewicz, [email protected] */ @@ -23,6 +27,16 @@ public String securedMethod() { return "accessibleForAdminOnly"; } + @RolesAllowed("admin") + public Uni<String> securedMethodUni() { + return Uni.createFrom().item("accessibleForAdminOnly"); + } + + @RolesAllowed("admin") + public CompletionStage<String> securedMethodCompletionStage() { + return Uni.createFrom().item("accessibleForAdminOnly").subscribeAsCompletionStage(); + } + public String unsecuredMethod() { return "accessibleForAll"; } diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.java index 0a58e6fed97..209d37d1ab4 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.java @@ -1,6 +1,5 @@ package io.quarkus.security.runtime.interceptor; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.function.Function; @@ -33,8 +32,13 @@ public Object handle(InvocationContext ic) throws Exception { .onItem().transformToUni(new UniContinuation(ic)); } else if (CompletionStage.class.isAssignableFrom(returnType)) { return constrainer.nonBlockingCheck(ic.getMethod(), ic.getParameters()) - .subscribeAsCompletionStage() - .thenApply(new CompletionStageContinuation(ic)); + .onItem().transformToUni((s) -> { + try { + return Uni.createFrom().completionStage((CompletionStage<?>) ic.proceed()); + } catch (Exception e) { + throw new RuntimeException(e); + } + }).subscribeAsCompletionStage(); } else if (Multi.class.isAssignableFrom(returnType)) { return constrainer.nonBlockingCheck(ic.getMethod(), ic.getParameters()) .onItem().transformToMulti(new MultiContinuation(ic)); @@ -65,23 +69,6 @@ public Uni<?> apply(Object o) { } } - private static class CompletionStageContinuation implements Function<Object, CompletionStage<?>> { - private final InvocationContext ic; - - CompletionStageContinuation(InvocationContext invocationContext) { - ic = invocationContext; - } - - @Override - public CompletionStage<?> apply(Object o) { - try { - return (CompletionStage<?>) ic.proceed(); - } catch (Exception e) { - return CompletableFuture.failedFuture(e); - } - } - } - private static class MultiContinuation implements Function<Object, Multi<?>> { private final InvocationContext ic;

['extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/BeanWithSecuredMethods.java', 'extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.java', 'extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDefaultTest.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/20996/20866

quarkusio

quarkus

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

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

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

fixes

~580 INFO messages from datasource dev service when no Docker available

### Describe the bug I see ~580 INFO messages from datasource dev service when no Docker available and running latest Quarkus in dev mode. Log messages are printed within 1 minute window, after that no new messages appear. ``` ... 2021-10-19 13:58:22,820 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 2021-10-19 13:58:22,922 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 2021-10-19 13:58:23,024 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 2021-10-19 13:58:23,126 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 2021-10-19 13:58:23,227 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 2021-10-19 13:58:23,330 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 2021-10-19 13:58:23,433 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 2021-10-19 13:58:23,536 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 2021-10-19 13:58:23,639 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 2021-10-19 13:58:23,742 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 2021-10-19 13:58:23,846 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 2021-10-19 13:58:23,950 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 2021-10-19 13:58:24,053 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 2021-10-19 13:58:24,155 INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375 ... ``` ### Expected behavior One message about unavailable Docker could be enough. Alternative solution could be less frequent logging, e.g. once per 5 or 10 seconds. ### Actual behavior ~580 INFO messages when no Docker available, printed within 1 minute window, after that no new messages appear. `INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375` ### How to Reproduce? - Generate project with `quarkus-jdbc-postgresql` - Make sure no Docker / podman is running - run `mvn quarkus:dev` - Check the console output Look for `INFO [com.git.doc.zer.sha.org.apa.hc.cli.htt.imp.cla.HttpRequestRetryExec] (ducttape-1) Recoverable I/O exception (java.io.IOException) caught when processing request to {}->unix://localhost:2375` ### Output of `uname -a` or `ver` macOS BigSur ### Output of `java -version` Java 11 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.3.0.Final / 999-SNAPSHOT ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

5caf0dbe786c899d47f99ab1147ebf85f771f275

ffa1151a81160830b359268fbcc6d714c54fa9f2

https://github.com/quarkusio/quarkus/compare/5caf0dbe786c899d47f99ab1147ebf85f771f275...ffa1151a81160830b359268fbcc6d714c54fa9f2

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/IsDockerWorking.java b/core/deployment/src/main/java/io/quarkus/deployment/IsDockerWorking.java index 2f241e9b8f5..7c10c563dfa 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/IsDockerWorking.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/IsDockerWorking.java @@ -71,7 +71,10 @@ private TestContainersStrategy(boolean silent) { @Override public Result get() { - StartupLogCompressor compressor = new StartupLogCompressor("Checking Docker Environment", Optional.empty(), null); + //testcontainers uses the Unreliables library to test if docker is started + //this runs in threads that start with 'ducttape' + StartupLogCompressor compressor = new StartupLogCompressor("Checking Docker Environment", Optional.empty(), null, + (s) -> s.getName().startsWith("ducttape")); try { Class<?> dockerClientFactoryClass = Thread.currentThread().getContextClassLoader() .loadClass("org.testcontainers.DockerClientFactory"); diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/StartupLogCompressor.java b/core/deployment/src/main/java/io/quarkus/deployment/console/StartupLogCompressor.java index 24d163e547c..75760253249 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/console/StartupLogCompressor.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/console/StartupLogCompressor.java @@ -6,6 +6,7 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiPredicate; +import java.util.function.Predicate; import io.quarkus.deployment.dev.testing.MessageFormat; import io.quarkus.deployment.logging.LoggingSetupBuildItem; @@ -24,10 +25,19 @@ public class StartupLogCompressor implements Closeable, BiPredicate<String, Bool final StatusLine sl; final List<String> toDump = new ArrayList<>(); final AtomicInteger COUNTER = new AtomicInteger(); + final Predicate<Thread> additionalThreadPredicate; public StartupLogCompressor(String name, @SuppressWarnings("unused") Optional<ConsoleInstalledBuildItem> consoleInstalledBuildItem, @SuppressWarnings("unused") LoggingSetupBuildItem loggingSetupBuildItem) { + this(name, consoleInstalledBuildItem, loggingSetupBuildItem, (s) -> false); + } + + public StartupLogCompressor(String name, + @SuppressWarnings("unused") Optional<ConsoleInstalledBuildItem> consoleInstalledBuildItem, + @SuppressWarnings("unused") LoggingSetupBuildItem loggingSetupBuildItem, + Predicate<Thread> additionalThreadPredicate) { + this.additionalThreadPredicate = additionalThreadPredicate; if (QuarkusConsole.INSTANCE.isAnsiSupported()) { QuarkusConsole.installRedirects(); this.name = name; @@ -68,7 +78,8 @@ public boolean test(String s, Boolean errorStream) { //not installed return true; } - if (Thread.currentThread() == thread) { + Thread current = Thread.currentThread(); + if (current == this.thread || additionalThreadPredicate.test(current)) { toDump.add(s); sl.setMessage(MessageFormat.BLUE + name + MessageFormat.RESET + " " + s.replace("\\n", "")); return false;

['core/deployment/src/main/java/io/quarkus/deployment/console/StartupLogCompressor.java', 'core/deployment/src/main/java/io/quarkus/deployment/IsDockerWorking.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/20995/17034

quarkusio

quarkus

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

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

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

fixes

List<PathSegment> exception on RESTEasy Reactive

## Describe the bug As I asked in [Zulip](https://quarkusio.zulipchat.com/#narrow/stream/187030-users/topic/PathSegment.20exception.20on.20RESTEasy.20Reactive), I wanted to use `List<PathSegment>` with RESTEasy Reactive extension to use @PathParam and Regular Expressions. i.e. @Path("{keyword:.*}") https://docs.jboss.org/resteasy/docs/4.6.0.Final/userguide/html_single/index.html#_PathParam_and_PathSegment But I'm getting exceptions as below: https://github.com/tedwon/quarkus-resteasy-reactive-with-pathsegment/blob/master/README.adoc It is working properly with `@PathParam("id") PathSegment id`: https://github.com/tedwon/quarkus-resteasy-reactive-with-pathsegment/blob/master/src/main/java/org/acme/getting/started/ReactiveGreetingResource.java#L51-L55 However, getting errors `java.lang.RuntimeException: Failed to find converter for javax.ws.rs.core.PathSegment` with `@PathParam("keyword") List<PathSegment> keywords` while startup Quarkus. https://github.com/tedwon/quarkus-resteasy-reactive-with-pathsegment/blob/master/src/main/java/org/acme/getting/started/ReactiveGreetingResource.java#L57-L61 Note that it is working properly for the same code with List<PathSegment> on my other Quarkus app with quarkus-resteasy extension. ### Expected behavior No exception for the usage of List<PathSegment> with quarkus-resteasy extension ### Actual behavior ~~~ 2021-05-02 02:16:02,416 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.resteasy.reactive.server.deployment.ResteasyReactiveProcessor#setupEndpoints threw an exception: java.lang.RuntimeException: java.lang.RuntimeException: Failed to process method org.acme.getting.started.ReactiveGreetingResource#java.lang.String searchByKeywords(java.util.List<javax.ws.rs.core.PathSegment> keywords) at org.jboss.resteasy.reactive.common.processor.EndpointIndexer.createEndpoints(EndpointIndexer.java:238) at io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveProcessor.setupEndpoints(ResteasyReactiveProcessor.java:402) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at io.quarkus.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:920) at io.quarkus.builder.BuildContext.run(BuildContext.java:277) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2415) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1452) at java.base/java.lang.Thread.run(Thread.java:834) at org.jboss.threads.JBossThread.run(JBossThread.java:501) Caused by: java.lang.RuntimeException: Failed to process method org.acme.getting.started.ReactiveGreetingResource#java.lang.String searchByKeywords(java.util.List<javax.ws.rs.core.PathSegment> keywords) at org.jboss.resteasy.reactive.common.processor.EndpointIndexer.createResourceMethod(EndpointIndexer.java:524) at org.jboss.resteasy.reactive.common.processor.EndpointIndexer.createEndpoints(EndpointIndexer.java:285) at org.jboss.resteasy.reactive.common.processor.EndpointIndexer.createEndpoints(EndpointIndexer.java:209) ... 11 more Caused by: java.lang.RuntimeException: Failed to find converter for javax.ws.rs.core.PathSegment at io.quarkus.resteasy.reactive.server.deployment.QuarkusServerEndpointIndexer.extractConverter(QuarkusServerEndpointIndexer.java:198) at org.jboss.resteasy.reactive.server.processor.ServerEndpointIndexer.handleListParam(ServerEndpointIndexer.java:277) at org.jboss.resteasy.reactive.server.processor.ServerEndpointIndexer.handleListParam(ServerEndpointIndexer.java:57) at org.jboss.resteasy.reactive.common.processor.EndpointIndexer.extractParameterInfo(EndpointIndexer.java:909) at org.jboss.resteasy.reactive.common.processor.EndpointIndexer.createResourceMethod(EndpointIndexer.java:407) ... 13 more ~~~ ## To Reproduce Please run this reproducer project: https://github.com/tedwon/quarkus-resteasy-reactive-with-pathsegment ~~~ ./mvnw quarkus:dev ~~~ ### Quarkus version or git rev QUARKUS 1.13.3

5caf0dbe786c899d47f99ab1147ebf85f771f275

d83e522f55548a09b91fef8b8e5eff0ec77ecf98

https://github.com/quarkusio/quarkus/compare/5caf0dbe786c899d47f99ab1147ebf85f771f275...d83e522f55548a09b91fef8b8e5eff0ec77ecf98

diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomResourceProducersGenerator.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomResourceProducersGenerator.java index 802da5d0339..a5e08aefd1d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomResourceProducersGenerator.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomResourceProducersGenerator.java @@ -151,8 +151,8 @@ public static void generate(Map<DotName, MethodInfo> resourcesThatNeedCustomProd ResultHandle quarkusRestContextHandle = m.invokeVirtualMethod(getContextMethodCreator.getMethodDescriptor(), m.getThis()); ResultHandle extractorHandle = m.newInstance( - MethodDescriptor.ofConstructor(PathParamExtractor.class, int.class, boolean.class), - m.getMethodParam(0), m.load(false)); + MethodDescriptor.ofConstructor(PathParamExtractor.class, int.class, boolean.class, boolean.class), + m.getMethodParam(0), m.load(false), m.load(true)); ResultHandle resultHandle = m.invokeVirtualMethod(MethodDescriptor.ofMethod(PathParamExtractor.class, "extractParameter", Object.class, ResteasyReactiveRequestContext.class), extractorHandle, quarkusRestContextHandle); diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java index 4271339ce3c..43b6427f271 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java @@ -10,6 +10,7 @@ import java.util.function.Predicate; import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.PathSegment; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; @@ -26,6 +27,7 @@ import org.jboss.resteasy.reactive.server.core.parameters.converters.NoopParameterConverter; import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverter; import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverterSupplier; +import org.jboss.resteasy.reactive.server.core.parameters.converters.PathSegmentParamConverter; import org.jboss.resteasy.reactive.server.core.parameters.converters.RuntimeResolvedConverter; import org.jboss.resteasy.reactive.server.processor.ServerEndpointIndexer; import org.jboss.resteasy.reactive.server.processor.ServerIndexedParameter; @@ -133,6 +135,8 @@ protected ParameterConverterSupplier extractConverter(String elementType, IndexV if (delegate == null) throw new RuntimeException("Failed to find converter for " + elementType); return delegate; + } else if (elementType.equals(PathSegment.class.getName())) { + return new PathSegmentParamConverter.Supplier(); } MethodDescriptor fromString = null; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/HelloResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/HelloResource.java index c172e743f13..900fd9752b1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/HelloResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/HelloResource.java @@ -1,7 +1,11 @@ package io.quarkus.resteasy.reactive.server.test.path; +import java.util.List; + import javax.ws.rs.GET; import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.core.PathSegment; /** * Per spec: @@ -25,4 +29,10 @@ public String hello() { public String nested() { return "world hello"; } + + @GET + @Path("other/{keyword:.*}") + public String searchByKeywords(@PathParam("keyword") List<PathSegment> keywords) { + return keywords.toString(); + } } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestPathTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestPathTestCase.java index 96acfeb0d4f..66579e73e7c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestPathTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestPathTestCase.java @@ -25,4 +25,11 @@ public void testRestPath() { RestAssured.when().get("/app/foo/hello").then().statusCode(200).body(Matchers.is("hello")); RestAssured.when().get("/app/foo/hello/nested").then().statusCode(200).body(Matchers.is("world hello")); } + + @Test + public void testListOfPathParams() { + RestAssured.basePath = "/"; + RestAssured.when().get("/app/foo/hello/other/bar/baz/boo/bob").then().statusCode(200) + .body(Matchers.is("[bar, baz, boo, bob]")); + } } diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java index 3a018f4651c..60d592571db 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java @@ -1,5 +1,6 @@ package org.jboss.resteasy.reactive.server.core.parameters; +import java.util.List; import org.jboss.resteasy.reactive.common.util.Encode; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; @@ -7,18 +8,24 @@ public class PathParamExtractor implements ParameterExtractor { private final int index; private final boolean encoded; + private final boolean single; - public PathParamExtractor(int index, boolean encoded) { + public PathParamExtractor(int index, boolean encoded, boolean single) { this.index = index; this.encoded = encoded; + this.single = single; } @Override public Object extractParameter(ResteasyReactiveRequestContext context) { String pathParam = context.getPathParam(index); if (encoded) { - return Encode.encodeQueryParam(pathParam); + pathParam = Encode.encodeQueryParam(pathParam); + } + if (single) { + return pathParam; + } else { + return List.of(pathParam.split("/")); } - return pathParam; } } 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 14d865cbc55..e2c1cbe2dfe 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 @@ -536,7 +536,7 @@ public ParameterExtractor parameterExtractor(Map<String, Integer> pathParameterI extractor = new NullParamExtractor(); } } else { - extractor = new PathParamExtractor(index, encoded); + extractor = new PathParamExtractor(index, encoded, single); } return extractor; case CONTEXT:

['extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java', 'extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestPathTestCase.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java', 'extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/HelloResource.java', 'extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomResourceProducersGenerator.java']

{'.java': 6}

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/21295/18154

quarkusio

quarkus

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

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

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

fixes

Setting both test-port and test-ssl-port to 0 yields the same random port for both

## Describe the bug Setting these config properties to 0 yields the same random port for both. This also happens in Quarkus 1.13.7 but in 2.0 this can result in the following exception after a few tests have run, e.g.: ``` 2021-06-09 23:41:37,675 INFO [org.apa.htt.imp.cli.DefaultHttpClient] (main) I/O exception (org.apache.http.NoHttpResponseException) caught when processing request to {}->http://localhost:40695: The target server failed to respond 2021-06-09 23:41:37,675 INFO [org.apa.htt.imp.cli.DefaultHttpClient] (main) Retrying request to {}->http://localhost:40695 [...] org.apache.http.NoHttpResponseException: localhost:40695 failed to respond ``` ### Expected behavior Should be listening on different ports, one for insecure http and one for TLS. ### Actual behavior E.g.: ``` Listening on: http://localhost:40695 and https://localhost:40695 ``` and with Quarkus 2 it can lead to the error I posted above (after some tests). ## To Reproduce https://github.com/famod/quarkus-issue-18154 I don't think I'll be able to reproduce that error, though! (special execution order of project-specific tests) Steps to reproduce the behavior: 1. clone https://github.com/famod/quarkus-issue-18154 2. mvn verify 3. observe something like: ```INFO [io.quarkus] (main) Quarkus 1.13.7.Final on JVM started in 1.019s. Listening on: http://localhost:44237 and https://localhost:44237``` ### Configuration ```yaml http: insecure-requests: enabled test-port: 0 test-ssl-port: 0 ssl: certificate: # base path for %test is / (the path to the project) file: ./src/main/local-certs/wildcard.crt key-file: ./src/main/local-certs/wildcard.key ``` ## Environment (please complete the following information): ### Output of `uname -a` or `ver` Linux W4DEUMSY9003463 5.4.72-microsoft-standard-WSL2 #1 SMP Wed Oct 28 23:40:43 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux (Ubuntu 20.04.2 LTS via WSL2) Same happens in our Jenkins build (host VM is on CentOS 7 and build runs in Alpine based docker container). ### Output of `java -version` OpenJDK 64-Bit Server VM AdoptOpenJDK-11.0.11+9 (build 11.0.11+9, mixed mode) ### GraalVM version (if different from Java) - ### Quarkus version or git rev 2.0.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.1 ## Additional context https://quarkusio.zulipchat.com/#narrow/stream/187030-users/topic/.5B2.2E0.2E0.2ECR3.2B.5D.20.22The.20target.20server.20failed.20to.20respond.22

598534257da772dc70b645e5f62fba430751cdf2

f81a64ca95f0fc2136265a50fb13d54203964147

https://github.com/quarkusio/quarkus/compare/598534257da772dc70b645e5f62fba430751cdf2...f81a64ca95f0fc2136265a50fb13d54203964147

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 609ec34135b..909aee45961 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 @@ -713,7 +713,8 @@ private static HttpServerOptions createSslOptions(HttpBuildTimeConfig buildTimeC serverOptions.setSni(sslConfig.sni); serverOptions.setHost(httpConfiguration.host); int sslPort = httpConfiguration.determineSslPort(launchMode); - serverOptions.setPort(sslPort == 0 ? -1 : sslPort); + // -2 instead of -1 (see http) to have vert.x assign two different random ports if both http and https shall be random + serverOptions.setPort(sslPort == 0 ? -2 : sslPort); serverOptions.setClientAuth(buildTimeConfig.tlsClientAuth); serverOptions.setReusePort(httpConfiguration.soReusePort); serverOptions.setTcpQuickAck(httpConfiguration.tcpQuickAck);

['extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.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/21296/18571

quarkusio

quarkus

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

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

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

fixes

Sporadic EOFException when running tests in Eclipse with jacoco extension

## Describe the bug I'm seeing this frequently (but not always) in Eclipse at the end of a test execution: ``` Failed to generate Jacoco reports java.io.EOFException at java.base/java.io.DataInputStream.readUnsignedShort(DataInputStream.java:345) at java.base/java.io.DataInputStream.readUTF(DataInputStream.java:594) at java.base/java.io.DataInputStream.readUTF(DataInputStream.java:569) at org.jacoco.core.data.ExecutionDataReader.readExecutionData(ExecutionDataReader.java:149) at org.jacoco.core.data.ExecutionDataReader.readBlock(ExecutionDataReader.java:116) at org.jacoco.core.data.ExecutionDataReader.read(ExecutionDataReader.java:93) at org.jacoco.core.tools.ExecFileLoader.load(ExecFileLoader.java:60) at org.jacoco.core.tools.ExecFileLoader.load(ExecFileLoader.java:74) at io.quarkus.jacoco.runtime.ReportCreator.run(ReportCreator.java:72) at java.base/java.lang.Thread.run(Thread.java:829) ``` This doesn't make the test fail, it only looks scary. ### Expected behavior No such exception ### Actual behavior Exception is logged (not sure about the integrity of the report, though). ## To Reproduce No reproducer available (yet?). ## Environment (please complete the following information): ### Output of `uname -a` or `ver` ``` Linux W4DEUMSY9003463 5.4.72-microsoft-standard-WSL2 #1 SMP Wed Oct 28 23:40:43 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux ``` Ubuntu 20.04.2 LTS ### Output of `java -version` ``` OpenJDK 64-Bit Server VM AdoptOpenJDK-11.0.11+9 (build 11.0.11+9, mixed mode) ``` ### Quarkus version or git rev ``` 2.0.1.Final ``` (also seen in 2.0.0) ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Maven 3.8.1 or in this case better to say Eclipse 2021-06. ## Additional context Seems to come from a shutdown hook? Btw, Eclipse is running _in_ the WSL2 Ubuntu dist (xfce, accessed via xrdp), not on Windows host.

598534257da772dc70b645e5f62fba430751cdf2

cb26c21a9eb5f386c57a620b28f9b78eab5eae7c

https://github.com/quarkusio/quarkus/compare/598534257da772dc70b645e5f62fba430751cdf2...cb26c21a9eb5f386c57a620b28f9b78eab5eae7c

diff --git a/test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/ReportCreator.java b/test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/ReportCreator.java index 0a5956c4190..e118708a6c6 100644 --- a/test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/ReportCreator.java +++ b/test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/ReportCreator.java @@ -45,7 +45,7 @@ public void run() { long abortTime = System.currentTimeMillis() + 10000; Path datafile = Paths.get(reportInfo.dataFile); while (System.currentTimeMillis() < abortTime) { - if (Files.exists(datafile)) { + if (Files.exists(datafile) && Files.size(datafile) > 0) { break; } Thread.sleep(100);

['test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/ReportCreator.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/21320/18500

quarkusio

quarkus

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

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

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

fixes

2.0 dev mode not reading application properties

## Describe the bug After switching to `2.0`, it looks like dev mode is not reading my `application.yaml` in `config/`. ### Expected behavior Successful run ### Actual behavior `NoSuchElementException: SRCFG00014: The config property name is required but it could not be found in any config source` ## To Reproduce Reproducer: `service1` after swapping the Quarkus version in https://github.com/mweber03/quarkus-test Steps to reproduce the behavior: 1. Switch to `2.0.1.Final` in `gradle.properties` 2. `./gradlew service1:quarkusDev` ### Output of `uname -a` or `ver` Ubuntu 20.04 ### Output of `java -version` OpenJDK 11.0.11 ### Quarkus version or git rev 2.0.1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 6.9

7d4788108794b3499d89a7db9be306d0672a9424

0f6f472512287dd43c1e676c1b61380bb568ef4a

https://github.com/quarkusio/quarkus/compare/7d4788108794b3499d89a7db9be306d0672a9424...0f6f472512287dd43c1e676c1b61380bb568ef4a

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 6220c8e3578..1bef9fda0fb 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 @@ -959,6 +959,44 @@ Set<String> checkForFileChange(Function<DevModeContext.ModuleInfo, DevModeContex } } } + + // Mostly a copy of the code above but to handle watched files that are set with absolute path (not in the app resources) + for (String watchedFilePath : timestampSet.watchedFilePaths.keySet()) { + Path watchedFile = Paths.get(watchedFilePath); + if (watchedFile.isAbsolute()) { + if (watchedFile.toFile().exists()) { + try { + long value = Files.getLastModifiedTime(watchedFile).toMillis(); + Long existing = timestampSet.watchedFileTimestamps.get(watchedFile); + //existing can be null when running tests + //as there is both normal and test resources, but only one set of watched timestampts + if (existing != null && value > existing) { + ret.add(watchedFilePath); + //a write can be a 'truncate' + 'write' + //if the file is empty we may be seeing the middle of a write + if (Files.size(watchedFile) == 0) { + try { + Thread.sleep(200); + } catch (InterruptedException e) { + //ignore + } + } + //re-read, as we may have read the original TS if the middle of + //a truncate+write, even if the write had completed by the time + //we read the size + value = Files.getLastModifiedTime(watchedFile).toMillis(); + + log.infof("File change detected: %s", watchedFile); + timestampSet.watchedFileTimestamps.put(watchedFile, value); + } + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } else { + timestampSet.watchedFileTimestamps.put(watchedFile, 0L); + } + } + } } return ret; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java index 05d28cf9222..accc69537ed 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java @@ -3,12 +3,15 @@ import static io.quarkus.deployment.steps.ConfigBuildSteps.SERVICES_PREFIX; import static io.quarkus.deployment.util.ServiceUtil.classNamesNamedIn; import static io.smallrye.config.ConfigMappings.ConfigClassWithPrefix.configClassWithPrefix; +import static io.smallrye.config.SmallRyeConfig.SMALLRYE_CONFIG_LOCATIONS; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.lang.reflect.Modifier; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -20,6 +23,7 @@ import java.util.Set; import java.util.stream.Collectors; +import org.apache.commons.io.FilenameUtils; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.config.spi.ConfigSource; @@ -38,6 +42,7 @@ import io.quarkus.deployment.builditem.ConfigurationTypeBuildItem; import io.quarkus.deployment.builditem.GeneratedClassBuildItem; import io.quarkus.deployment.builditem.GeneratedResourceBuildItem; +import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem; import io.quarkus.deployment.builditem.LaunchModeBuildItem; import io.quarkus.deployment.builditem.LiveReloadBuildItem; import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem; @@ -58,10 +63,12 @@ import io.quarkus.runtime.annotations.StaticInitSafe; import io.quarkus.runtime.configuration.ConfigRecorder; import io.quarkus.runtime.configuration.ConfigUtils; +import io.quarkus.runtime.configuration.ProfileManager; import io.quarkus.runtime.configuration.RuntimeOverrideConfigSource; import io.smallrye.config.ConfigMappings.ConfigClassWithPrefix; import io.smallrye.config.ConfigSourceFactory; import io.smallrye.config.PropertiesLocationConfigSourceFactory; +import io.smallrye.config.SmallRyeConfig; public class ConfigGenerationBuildStep { @@ -217,6 +224,47 @@ public void setupConfigOverride( } } + @BuildStep + public void watchConfigFiles(BuildProducer<HotDeploymentWatchedFileBuildItem> watchedFiles) { + List<String> configWatchedFiles = new ArrayList<>(); + + SmallRyeConfig config = (SmallRyeConfig) ConfigProvider.getConfig(); + String userDir = System.getProperty("user.dir"); + + // Main files + configWatchedFiles.add("application.properties"); + configWatchedFiles.add("META-INF/microprofile-config.properties"); + configWatchedFiles.add(Paths.get(userDir, ".env").toAbsolutePath().toString()); + configWatchedFiles.add(Paths.get(userDir, "config", "application.properties").toAbsolutePath().toString()); + + // Profiles + String profile = ProfileManager.getActiveProfile(); + configWatchedFiles.add(String.format("application-%s.properties", profile)); + configWatchedFiles.add(String.format("META-INF/microprofile-config-%s.properties", profile)); + configWatchedFiles.add(Paths.get(userDir, String.format(".env-%s", profile)).toAbsolutePath().toString()); + configWatchedFiles.add( + Paths.get(userDir, "config", String.format("application-%s.properties", profile)).toAbsolutePath().toString()); + + Optional<List<String>> optionalLocations = config.getOptionalValues(SMALLRYE_CONFIG_LOCATIONS, String.class); + optionalLocations.ifPresent(locations -> { + for (String location : locations) { + if (!Files.isDirectory(Paths.get(location))) { + configWatchedFiles.add(location); + configWatchedFiles.add(appendProfileToFilename(location, profile)); + } + } + }); + + for (String configWatchedFile : configWatchedFiles) { + watchedFiles.produce(new HotDeploymentWatchedFileBuildItem(configWatchedFile)); + } + } + + private String appendProfileToFilename(String path, String activeProfile) { + String pathWithoutExtension = FilenameUtils.removeExtension(path); + return String.format("%s-%s.%s", pathWithoutExtension, activeProfile, FilenameUtils.getExtension(path)); + } + private void handleMembers(Config config, Map<String, String> values, Iterable<ClassDefinition.ClassMember> members, String prefix, Set<String> excludedConfigKeys) { for (ClassDefinition.ClassMember member : members) { diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/DevModeBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/DevModeBuildStep.java index ebdaed9d9b0..7ff4aa47ffe 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/DevModeBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/DevModeBuildStep.java @@ -1,30 +1,17 @@ package io.quarkus.deployment.steps; -import static io.smallrye.config.SmallRyeConfig.SMALLRYE_CONFIG_LOCATIONS; - -import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -import java.util.Optional; import java.util.stream.Collectors; -import org.eclipse.microprofile.config.ConfigProvider; - import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem; import io.quarkus.runtime.LiveReloadConfig; class DevModeBuildStep { - @BuildStep List<HotDeploymentWatchedFileBuildItem> watchChanges(LiveReloadConfig liveReloadConfig) { List<String> names = new ArrayList<>(); - names.add("META-INF/microprofile-config.properties"); - names.add("application.properties"); - names.add(Paths.get(".env").toAbsolutePath().toString()); - Optional<List<String>> locations = ConfigProvider.getConfig().getOptionalValues(SMALLRYE_CONFIG_LOCATIONS, - String.class); - locations.ifPresent(names::addAll); liveReloadConfig.watchedResources.ifPresent(names::addAll); return names.stream().map(HotDeploymentWatchedFileBuildItem::new).collect(Collectors.toList()); } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ProfileBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ProfileBuildStep.java index 20400b34fb2..b3c6f5ce6e8 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ProfileBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ProfileBuildStep.java @@ -1,53 +1,17 @@ package io.quarkus.deployment.steps; -import static io.smallrye.config.SmallRyeConfig.SMALLRYE_CONFIG_LOCATIONS; - -import java.nio.file.Paths; -import java.util.List; -import java.util.Optional; - -import org.apache.commons.io.FilenameUtils; -import org.eclipse.microprofile.config.ConfigProvider; - -import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem; import io.quarkus.deployment.builditem.LaunchModeBuildItem; import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem; import io.quarkus.runtime.LaunchMode; public class ProfileBuildStep { - @BuildStep RunTimeConfigurationDefaultBuildItem defaultProfile(LaunchModeBuildItem launchModeBuildItem) { return new RunTimeConfigurationDefaultBuildItem("quarkus.profile", getProfileValue(launchModeBuildItem.getLaunchMode())); } - @BuildStep - void watchProfileSpecificFile(LaunchModeBuildItem launchModeBuildItem, - BuildProducer<HotDeploymentWatchedFileBuildItem> items) { - String activeProfile = getProfileValue(launchModeBuildItem.getLaunchMode()); - String suffixedApplicationProperties = String.format("application-%s.properties", activeProfile); - items.produce(new HotDeploymentWatchedFileBuildItem(suffixedApplicationProperties)); - items.produce(new HotDeploymentWatchedFileBuildItem( - Paths.get(String.format(".env-%s", activeProfile)).toAbsolutePath().toString())); - items.produce(new HotDeploymentWatchedFileBuildItem(Paths - .get(System.getProperty("user.dir"), "config", suffixedApplicationProperties).toAbsolutePath().toString())); - Optional<List<String>> locations = ConfigProvider.getConfig().getOptionalValues(SMALLRYE_CONFIG_LOCATIONS, - String.class); - if (locations.isPresent()) { - for (String location : locations.get()) { - items.produce(new HotDeploymentWatchedFileBuildItem(appendProfileToFilename(location, activeProfile))); - } - } - } - - private String appendProfileToFilename(String path, String activeProfile) { - String pathWithoutExtension = FilenameUtils.removeExtension(path); - return String.format("%s-%s.%s", pathWithoutExtension, activeProfile, FilenameUtils.getExtension(path)); - } - private String getProfileValue(LaunchMode launchMode) { if (launchMode == LaunchMode.DEVELOPMENT) { return "dev"; diff --git a/extensions/config-yaml/deployment/src/main/java/io/quarkus/config/yaml/deployment/ConfigYamlProcessor.java b/extensions/config-yaml/deployment/src/main/java/io/quarkus/config/yaml/deployment/ConfigYamlProcessor.java index 52532751421..870999bc842 100644 --- a/extensions/config-yaml/deployment/src/main/java/io/quarkus/config/yaml/deployment/ConfigYamlProcessor.java +++ b/extensions/config-yaml/deployment/src/main/java/io/quarkus/config/yaml/deployment/ConfigYamlProcessor.java @@ -1,5 +1,9 @@ package io.quarkus.config.yaml.deployment; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; + import io.quarkus.config.yaml.runtime.ApplicationYamlConfigSourceLoader; import io.quarkus.deployment.Feature; import io.quarkus.deployment.annotations.BuildProducer; @@ -32,12 +36,27 @@ public void bootstrap( } @BuildStep - void watchYamlConfig(BuildProducer<HotDeploymentWatchedFileBuildItem> items) { - items.produce(new HotDeploymentWatchedFileBuildItem("application.yaml")); - items.produce(new HotDeploymentWatchedFileBuildItem("application.yml")); + void watchYamlConfig(BuildProducer<HotDeploymentWatchedFileBuildItem> watchedFiles) { + List<String> configWatchedFiles = new ArrayList<>(); + String userDir = System.getProperty("user.dir"); + + // Main files + configWatchedFiles.add("application.yaml"); + configWatchedFiles.add("application.yml"); + configWatchedFiles.add(Paths.get(userDir, "config", "application.yaml").toAbsolutePath().toString()); + configWatchedFiles.add(Paths.get(userDir, "config", "application.yml").toAbsolutePath().toString()); + + // Profiles + String profile = ProfileManager.getActiveProfile(); + configWatchedFiles.add(String.format("application-%s.yaml", profile)); + configWatchedFiles.add(String.format("application-%s.yml", profile)); + configWatchedFiles + .add(Paths.get(userDir, "config", String.format("application-%s.yaml", profile)).toAbsolutePath().toString()); + configWatchedFiles + .add(Paths.get(userDir, "config", String.format("application-%s.yml", profile)).toAbsolutePath().toString()); - String activeProfile = ProfileManager.getActiveProfile(); - items.produce(new HotDeploymentWatchedFileBuildItem(String.format("application-%s.yml", activeProfile))); - items.produce(new HotDeploymentWatchedFileBuildItem(String.format("application-%s.yaml", activeProfile))); + for (String configWatchedFile : configWatchedFiles) { + watchedFiles.produce(new HotDeploymentWatchedFileBuildItem(configWatchedFile)); + } } }

['core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java', 'core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java', 'core/deployment/src/main/java/io/quarkus/deployment/steps/ProfileBuildStep.java', 'extensions/config-yaml/deployment/src/main/java/io/quarkus/config/yaml/deployment/ConfigYamlProcessor.java', 'core/deployment/src/main/java/io/quarkus/deployment/steps/DevModeBuildStep.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/21924/21873

quarkusio

quarkus

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

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

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

fixes

OidcClient has failed to complete the refresh_token grant request: "error_description":"Refresh token expired"

### Describe the bug It seems like there's no processing of expired refresh_tokens implemented. So "refresh token expired" error appears and oidc-client is unable to get new access_token. ### Expected behavior OidcClient could have some refresh_token processing logic. 1. Test refresh_token for being expired 2. If true , get new refresh_token, await 3. If got new refresh_token, then get new access_token ### Actual behavior oidc-client is unable to get new access_token with stale refresh_token , and refresh_token itself is not requested. ### How to Reproduce? rest-client + oidc-client (via OidcClientRequestFilter) + keycloak 12hrs refresh_token exp. https://github.com/tttomat19/quarkus-quickstarts/tree/main/rest-client-quickstart ### 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_

52f3cc99c51ea77a2f9869cb7d69200b1d030278

1ac3ce435a7b16968469c421cd66a8a1f4ac5ed6

https://github.com/quarkusio/quarkus/compare/52f3cc99c51ea77a2f9869cb7d69200b1d030278...1ac3ce435a7b16968469c421cd66a8a1f4ac5ed6

diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClientConfig.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClientConfig.java index d751d649823..90257b7efd4 100644 --- a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClientConfig.java +++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClientConfig.java @@ -113,11 +113,17 @@ public String getGrantType() { public String refreshTokenProperty = OidcConstants.REFRESH_TOKEN_VALUE; /** - * Refresh token property name in a token grant response + * Access token expiry property name in a token grant response */ @ConfigItem(defaultValue = OidcConstants.EXPIRES_IN) public String expiresInProperty = OidcConstants.EXPIRES_IN; + /** + * Refresh token expiry property name in a token grant response + */ + @ConfigItem(defaultValue = OidcConstants.REFRESH_EXPIRES_IN) + public String refreshExpiresInProperty = OidcConstants.REFRESH_EXPIRES_IN; + public Type getType() { return type; } @@ -149,6 +155,14 @@ public String getExpiresInProperty() { public void setExpiresInProperty(String expiresInProperty) { this.expiresInProperty = expiresInProperty; } + + public String getRefreshExpiresInProperty() { + return refreshExpiresInProperty; + } + + public void setRefreshExpiresInProperty(String refreshExpiresInProperty) { + this.refreshExpiresInProperty = refreshExpiresInProperty; + } } /** diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/Tokens.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/Tokens.java index 37ca13c3133..fa2a7989107 100644 --- a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/Tokens.java +++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/Tokens.java @@ -12,14 +12,16 @@ public class Tokens { final private Long accessTokenExpiresAt; final private Long refreshTokenTimeSkew; final private String refreshToken; + final Long refreshTokenExpiresAt; final private JsonObject grantResponse; public Tokens(String accessToken, Long accessTokenExpiresAt, Duration refreshTokenTimeSkewDuration, String refreshToken, - JsonObject grantResponse) { + Long refreshTokenExpiresAt, JsonObject grantResponse) { this.accessToken = accessToken; this.accessTokenExpiresAt = accessTokenExpiresAt; this.refreshTokenTimeSkew = refreshTokenTimeSkewDuration == null ? null : refreshTokenTimeSkewDuration.getSeconds(); this.refreshToken = refreshToken; + this.refreshTokenExpiresAt = refreshTokenExpiresAt; this.grantResponse = grantResponse; } @@ -44,11 +46,11 @@ public Long getRefreshTokenTimeSkew() { } public boolean isAccessTokenExpired() { - if (accessTokenExpiresAt == null) { - return false; - } - final long nowSecs = System.currentTimeMillis() / 1000; - return nowSecs > accessTokenExpiresAt; + return isExpired(accessTokenExpiresAt); + } + + public boolean isRefreshTokenExpired() { + return isExpired(refreshTokenExpiresAt); } public boolean isAccessTokenWithinRefreshInterval() { @@ -58,4 +60,12 @@ public boolean isAccessTokenWithinRefreshInterval() { final long nowSecs = System.currentTimeMillis() / 1000; return nowSecs + refreshTokenTimeSkew > accessTokenExpiresAt; } + + private static boolean isExpired(Long expiresAt) { + if (expiresAt == null) { + return false; + } + final long nowSecs = System.currentTimeMillis() / 1000; + return nowSecs > expiresAt; + } } diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java index 89aa4137f2f..c87c9476866 100644 --- a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java +++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java @@ -124,20 +124,16 @@ private Tokens emitGrantTokens(HttpResponse<Buffer> resp, boolean refresh) { if (resp.statusCode() == 200) { LOG.debugf("%s OidcClient has %s the tokens", oidcConfig.getId().get(), (refresh ? "refreshed" : "acquired")); JsonObject json = resp.bodyAsJsonObject(); + // access token final String accessToken = json.getString(oidcConfig.grant.accessTokenProperty); + final Long accessTokenExpiresAt = getExpiresAtValue(accessToken, json.getValue(oidcConfig.grant.expiresInProperty)); + final String refreshToken = json.getString(oidcConfig.grant.refreshTokenProperty); - final Object expiresInValue = json.getValue(oidcConfig.grant.expiresInProperty); - Long accessTokenExpiresAt; - if (expiresInValue != null) { - long accessTokenExpiresIn = expiresInValue instanceof Number ? ((Number) expiresInValue).longValue() - : Long.parseLong(expiresInValue.toString()); - accessTokenExpiresAt = oidcConfig.absoluteExpiresIn ? accessTokenExpiresIn - : Instant.now().getEpochSecond() + accessTokenExpiresIn; - } else { - accessTokenExpiresAt = getExpiresJwtClaim(accessToken); - } + final Long refreshTokenExpiresAt = getExpiresAtValue(refreshToken, + json.getValue(oidcConfig.grant.refreshExpiresInProperty)); + return new Tokens(accessToken, accessTokenExpiresAt, oidcConfig.refreshTokenTimeSkew.orElse(null), refreshToken, - json); + refreshTokenExpiresAt, json); } else { String errorMessage = resp.bodyAsString(); LOG.debugf("%s OidcClient has failed to complete the %s grant request: status: %d, error message: %s", @@ -147,8 +143,19 @@ private Tokens emitGrantTokens(HttpResponse<Buffer> resp, boolean refresh) { } } - private static Long getExpiresJwtClaim(String accessToken) { - JsonObject claims = decodeJwtToken(accessToken); + private Long getExpiresAtValue(String token, Object expiresInValue) { + if (expiresInValue != null) { + long tokenExpiresIn = expiresInValue instanceof Number ? ((Number) expiresInValue).longValue() + : Long.parseLong(expiresInValue.toString()); + return oidcConfig.absoluteExpiresIn ? tokenExpiresIn + : Instant.now().getEpochSecond() + tokenExpiresIn; + } else { + return token != null ? getExpiresJwtClaim(token) : null; + } + } + + private static Long getExpiresJwtClaim(String token) { + JsonObject claims = decodeJwtToken(token); if (claims != null) { try { return claims.getLong(Claims.exp.name()); diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensHelper.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensHelper.java index 67c05375981..ed41d5082e3 100644 --- a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensHelper.java +++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensHelper.java @@ -40,9 +40,10 @@ public Uni<Tokens> getTokens(OidcClient oidcClient) { } else { Tokens tokens = currentState.tokens; if (tokens.isAccessTokenExpired() || tokens.isAccessTokenWithinRefreshInterval()) { - newState = new TokenRequestState(prepareUni(tokens.getRefreshToken() != null - ? oidcClient.refreshTokens(tokens.getRefreshToken()) - : oidcClient.getTokens())); + newState = new TokenRequestState( + prepareUni((tokens.getRefreshToken() != null && !tokens.isRefreshTokenExpired()) + ? oidcClient.refreshTokens(tokens.getRefreshToken()) + : oidcClient.getTokens())); if (tokenRequestStateUpdater.compareAndSet(this, currentState, newState)) { return newState.tokenUni; } diff --git a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcConstants.java b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcConstants.java index bcb7271ed7c..8251c56579b 100644 --- a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcConstants.java +++ b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcConstants.java @@ -48,4 +48,5 @@ public final class OidcConstants { public static final String EXCHANGE_GRANT = "urn:ietf:params:oauth:grant-type:token-exchange"; public static final String EXPIRES_IN = "expires_in"; + public static final String REFRESH_EXPIRES_IN = "refresh_expires_in"; } diff --git a/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java index a2ca7c12116..ea8b059a722 100644 --- a/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java +++ b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java @@ -50,7 +50,7 @@ public Map<String, String> start() { .aResponse() .withHeader("Content-Type", MediaType.APPLICATION_JSON) .withBody( - "{\\"access_token\\":\\"access_token_2\\", \\"expires_in\\":4, \\"refresh_token\\":\\"refresh_token_1\\"}"))); + "{\\"access_token\\":\\"access_token_2\\", \\"expires_in\\":4, \\"refresh_token\\":\\"refresh_token_2\\", \\"refresh_expires_in\\":1}"))); server.stubFor(WireMock.post("/refresh-token-only") .withRequestBody(matching("grant_type=refresh_token&refresh_token=shared_refresh_token")) diff --git a/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/OidcClientTest.java b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/OidcClientTest.java index f5a955b8549..0a274ca502f 100644 --- a/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/OidcClientTest.java +++ b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/OidcClientTest.java @@ -30,12 +30,41 @@ public class OidcClientTest { @Test public void testEchoAndRefreshTokens() { + // access_token_1 and refresh_token_1 are acquired using a password grant request. + // access_token_1 expires in 4 seconds, refresh_token_1 has no lifespan limit as no `refresh_expires_in` property is returned. + // "Default OidcClient has acquired the tokens" record is added to the log RestAssured.when().get("/frontend/echoToken") .then() .statusCode(200) .body(equalTo("access_token_1")); - // Wait until the access token has expired + // Wait until the access_token_1 has expired + waitUntillAccessTokenHasExpired(); + + // access_token_1 has expired, refresh_token_1 is assumed to be valid and used to acquire access_token_2 and refresh_token_2. + // access_token_2 expires in 4 seconds, but refresh_token_2 - in 1 sec - it will expire by the time access_token_2 has expired + // "Default OidcClient has refreshed the tokens" record is added to the log + RestAssured.when().get("/frontend/echoToken") + .then() + .statusCode(200) + .body(equalTo("access_token_2")); + + // Wait until the access_token_2 has expired + waitUntillAccessTokenHasExpired(); + + // Both access_token_2 and refresh_token_2 have now expired therefore a password grant request is repeated, + // as opposed to using a refresh token grant. + // access_token_1 is returned again - as the same token URL and grant properties are used and Wiremock stub returns access_token_1 + // 2nd "Default OidcClient has acquired the tokens" record is added to the log + RestAssured.when().get("/frontend/echoToken") + .then() + .statusCode(200) + .body(equalTo("access_token_1")); + + checkLog(); + } + + private static void waitUntillAccessTokenHasExpired() { long expiredTokenTime = System.currentTimeMillis() + 5000; await().atMost(10, TimeUnit.SECONDS) .pollInterval(Duration.ofSeconds(3)) @@ -45,12 +74,6 @@ public Boolean call() throws Exception { return System.currentTimeMillis() > expiredTokenTime; } }); - - RestAssured.when().get("/frontend/echoToken") - .then() - .statusCode(200) - .body(equalTo("access_token_2")); - checkLog(); } @Test @@ -109,8 +132,8 @@ public void run() throws Throwable { } } - assertEquals(1, tokenAcquisitionCount, - "Log file must contain a single OidcClientImpl token acquisition confirmation"); + assertEquals(2, tokenAcquisitionCount, + "Log file must contain two OidcClientImpl token acquisition confirmations"); assertEquals(1, tokenRefreshedCount, "Log file must contain a single OidcClientImpl token refresh confirmation"); }

['integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/OidcClientTest.java', 'extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcConstants.java', 'extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensHelper.java', 'integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java', 'extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/Tokens.java', 'extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java', 'extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClientConfig.java']

{'.java': 7}