Datasets:

tiginamaria

/

bug-localization

like 2

quarkusio/quarkus/8318/8301

quarkusio

quarkus

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

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

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

fixes

Qute collection access requires restart of quarkus:dev

**Describe the bug** When coding Qute templates in `quarkus:dev`, the first time we access a `list.get(index)` fails with a `java.lang.ClassNotFoundException: io.quarkus.qute.runtime.extensions.CollectionTemplateExtensions_Extension_ValueResolver_get_646e8480881185b6bc78b6698eeafb5d7b01c85c$$function$$2` Once we restart `quarkus:dev` and then the resolver is "known" once, it works as expected (even we remove the access and add it again). **Reproducer** 1. Start `quarkus:dev` with an empty template 2. Add a template that accesses a list, similar to this: ``` {#if ! entries.isEmpty} First title: {entries.get(0).title} {/} ``` 3. It fails with: ``` java.lang.NoClassDefFoundError: io.quarkus.qute.runtime.extensions.CollectionTemplateExtensions_Extension_ValueResolver_get_646e8480881185b6bc78b6698eeafb5d7b01c85c$$function$$2 at java.base/java.util.concurrent.CompletableFuture.encodeThrowable(CompletableFuture.java:314) at java.base/java.util.concurrent.CompletableFuture.uniComposeStage(CompletableFuture.java:1190) at java.base/java.util.concurrent.CompletableFuture.thenCompose(CompletableFuture.java:2299) at java.base/java.util.concurrent.CompletableFuture.thenCompose(CompletableFuture.java:143) at io.quarkus.qute.EvaluatorImpl.resolveReference(EvaluatorImpl.java:76) at io.quarkus.qute.EvaluatorImpl.evaluate(EvaluatorImpl.java:48) at io.quarkus.qute.ResolutionContextImpl.evaluate(ResolutionContextImpl.java:31) at io.quarkus.qute.ExpressionNode.resolve(ExpressionNode.java:25) at io.quarkus.qute.SectionNode$SectionResolutionContextImpl.execute(SectionNode.java:126) at io.quarkus.qute.IfSectionHelper.lambda$resolveCondition$0(IfSectionHelper.java:55) at io.quarkus.qute.IfSectionHelper$$Lambda$844/0000000000000000.apply(Unknown Source) at java.base/java.util.concurrent.CompletableFuture.uniComposeStage(CompletableFuture.java:1183) at java.base/java.util.concurrent.CompletableFuture.thenCompose(CompletableFuture.java:2299) at java.base/java.util.concurrent.CompletableFuture.thenCompose(CompletableFuture.java:143) at io.quarkus.qute.IfSectionHelper.resolveCondition(IfSectionHelper.java:53) at io.quarkus.qute.IfSectionHelper.resolve(IfSectionHelper.java:43) at io.quarkus.qute.SectionNode.resolve(SectionNode.java:34) at io.quarkus.qute.SectionNode$SectionResolutionContextImpl.execute(SectionNode.java:126) at io.quarkus.qute.SectionHelper$SectionResolutionContext.execute(SectionHelper.java:33) at io.quarkus.qute.Parser$1$1.resolve(Parser.java:80) at io.quarkus.qute.SectionNode.resolve(SectionNode.java:34) at io.quarkus.qute.TemplateImpl.renderData(TemplateImpl.java:99) at io.quarkus.qute.TemplateImpl.access$200(TemplateImpl.java:14) at io.quarkus.qute.TemplateImpl$TemplateInstanceImpl.renderAsync(TemplateImpl.java:80) at io.quarkus.resteasy.qute.runtime.TemplateResponseFilter.filter(TemplateResponseFilter.java:58) at org.jboss.resteasy.core.interception.jaxrs.ContainerResponseContextImpl.filter(ContainerResponseContextImpl.java:360) at org.jboss.resteasy.core.ServerResponseWriter.executeFilters(ServerResponseWriter.java:251) at org.jboss.resteasy.core.ServerResponseWriter.writeNomapResponse(ServerResponseWriter.java:101) at org.jboss.resteasy.core.ServerResponseWriter.writeNomapResponse(ServerResponseWriter.java:74) at org.jboss.resteasy.core.SynchronousDispatcher.writeResponse(SynchronousDispatcher.java:590) ... 58 more Caused by: java.lang.NoClassDefFoundError: io.quarkus.qute.runtime.extensions.CollectionTemplateExtensions_Extension_ValueResolver_get_646e8480881185b6bc78b6698eeafb5d7b01c85c$$function$$2 at io.quarkus.qute.runtime.extensions.CollectionTemplateExtensions_Extension_ValueResolver_get_646e8480881185b6bc78b6698eeafb5d7b01c85c.resolve(CollectionTemplateExtensions_Extension_ValueResolver_get_646e8480881185b6bc78b6698eeafb5d7b01c85c.zig:70) at io.quarkus.qute.EvaluatorImpl.resolve(EvaluatorImpl.java:100) at io.quarkus.qute.EvaluatorImpl.resolve(EvaluatorImpl.java:109) at io.quarkus.qute.EvaluatorImpl.resolve(EvaluatorImpl.java:109) at io.quarkus.qute.EvaluatorImpl.resolve(EvaluatorImpl.java:109) at io.quarkus.qute.EvaluatorImpl.resolve(EvaluatorImpl.java:109) at io.quarkus.qute.EvaluatorImpl.resolve(EvaluatorImpl.java:109) at io.quarkus.qute.EvaluatorImpl.resolve(EvaluatorImpl.java:109) at io.quarkus.qute.EvaluatorImpl.resolveReference(EvaluatorImpl.java:75) at io.quarkus.qute.EvaluatorImpl.lambda$resolveReference$1(EvaluatorImpl.java:78) at io.quarkus.qute.EvaluatorImpl$$Lambda$904/0000000000000000.apply(Unknown Source) at java.base/java.util.concurrent.CompletableFuture.uniComposeStage(CompletableFuture.java:1183) ... 86 more Caused by: java.lang.ClassNotFoundException: io.quarkus.qute.runtime.extensions.CollectionTemplateExtensions_Extension_ValueResolver_get_646e8480881185b6bc78b6698eeafb5d7b01c85c$$function$$2 at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:788) at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:178) at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:1081) at io.quarkus.bootstrap.classloading.QuarkusClassLoader.loadClass(QuarkusClassLoader.java:318) at io.quarkus.bootstrap.classloading.QuarkusClassLoader.loadClass(QuarkusClassLoader.java:274) ... 98 more ``` 4. If we stop and restart `quarkus:dev`, it works. Btw, in the same case (empty template when starting then adding the code only once `quarkus:dev` is running) `list[index]` doesn't fail with an error but silently returns no element: ``` {#if ! entries.isEmpty} Entries has {entries.size} elements First title: {entries[0].title} {/} ``` ``` <!-- output --> Entries has 3 elements First title: NOT_FOUND ``` Tested with Quarkus version `1.3.1.Final`.

b923fde090eb469a6cdad82a660225b7068833e8

c1416efff529a20c98a3f7dca5fd9042998ca5b3

https://github.com/quarkusio/quarkus/compare/b923fde090eb469a6cdad82a660225b7068833e8...c1416efff529a20c98a3f7dca5fd9042998ca5b3

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/MemoryClassPathElement.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/MemoryClassPathElement.java index 84a9856e7f4..b6769276f91 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/MemoryClassPathElement.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/MemoryClassPathElement.java @@ -10,6 +10,7 @@ import java.security.CodeSource; import java.security.ProtectionDomain; import java.security.cert.Certificate; +import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -22,7 +23,21 @@ public MemoryClassPathElement(Map<String, byte[]> resources) { } public void reset(Map<String, byte[]> resources) { - this.resources = resources; + Map<String, byte[]> newResources = new HashMap<>(resources); + //we can't delete .class files from the loader + //gizmo may not generate the same function names on restart + //so if we delete them already loaded classes may have problems, as functions they reference + //may have been removed + //see https://github.com/quarkusio/quarkus/issues/8301 + for (Map.Entry<String, byte[]> e : this.resources.entrySet()) { + if (newResources.containsKey(e.getKey())) { + continue; + } + if (e.getKey().endsWith(".class")) { + newResources.put(e.getKey(), e.getValue()); + } + } + this.resources = newResources; } @Override

['independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/MemoryClassPathElement.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/8304/8299

quarkusio

quarkus

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

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

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

resolves

Error when putting Qute include inside if/when/for

**Describe the bug** When putting an `{include}` inside a `{for}`, `{if}`, or `{with}` (maybe others), the inclusion fails with an error. **To Reproduce** The following works as expected: ``` <!-- some HTML file --> {#include includes/teaser} {#title}My Title{/title} {#content}My content{/content} {/include} ``` ``` <!-- includes/teaser.html --> <h2>{#insert title/}</h2> <p>{#insert content/}</p> ``` ``` <!-- output --> <h2>My Title</h2> <p>My content</p> ``` The following... ``` <!-- some HTML file --> {#if hello == 'world'} {#include includes/teaser} {#title}My Title{/title} {#content}My content{/content} {/include} {/if} ``` fails with: ``` org.jboss.resteasy.spi.UnhandledException: java.lang.NullPointerException at org.jboss.resteasy.core.ExceptionHandler.handleException(ExceptionHandler.java:381) at org.jboss.resteasy.core.SynchronousDispatcher.writeException(SynchronousDispatcher.java:216) at org.jboss.resteasy.core.SynchronousDispatcher.writeResponse(SynchronousDispatcher.java:610) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:520) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$invoke$4(SynchronousDispatcher.java:259) at org.jboss.resteasy.core.SynchronousDispatcher$$Lambda$717/0000000000000000.run(Unknown Source) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$preprocess$0(SynchronousDispatcher.java:160) at org.jboss.resteasy.core.SynchronousDispatcher$$Lambda$718/0000000000000000.get(Unknown Source) at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:362) at org.jboss.resteasy.core.SynchronousDispatcher.preprocess(SynchronousDispatcher.java:163) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:245) at org.jboss.resteasy.plugins.server.servlet.ServletContainerDispatcher.service(ServletContainerDispatcher.java:249) at io.quarkus.resteasy.runtime.ResteasyFilter$ResteasyResponseWrapper.sendError(ResteasyFilter.java:65) at io.undertow.servlet.handlers.DefaultServlet.doGet(DefaultServlet.java:172) at javax.servlet.http.HttpServlet.service(HttpServlet.java:503) at javax.servlet.http.HttpServlet.service(HttpServlet.java:590) at io.undertow.servlet.handlers.ServletHandler.handleRequest(ServletHandler.java:74) at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:129) at io.quarkus.resteasy.runtime.ResteasyFilter.doFilter(ResteasyFilter.java:28) at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:61) at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131) at io.undertow.servlet.handlers.FilterHandler.handleRequest(FilterHandler.java:84) at io.undertow.servlet.handlers.security.ServletSecurityRoleHandler.handleRequest(ServletSecurityRoleHandler.java:63) at io.undertow.servlet.handlers.ServletChain$1.handleRequest(ServletChain.java:68) at io.undertow.servlet.handlers.ServletDispatchingHandler.handleRequest(ServletDispatchingHandler.java:36) at io.undertow.servlet.handlers.security.SSLInformationAssociationHandler.handleRequest(SSLInformationAssociationHandler.java:133) at io.undertow.servlet.handlers.security.ServletAuthenticationCallHandler.handleRequest(ServletAuthenticationCallHandler.java:57) at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43) at io.undertow.security.handlers.AbstractConfidentialityHandler.handleRequest(AbstractConfidentialityHandler.java:46) at io.undertow.servlet.handlers.security.ServletConfidentialityConstraintHandler.handleRequest(ServletConfidentialityConstraintHandler.java:65) at io.undertow.security.handlers.AuthenticationMechanismsHandler.handleRequest(AuthenticationMechanismsHandler.java:60) at io.undertow.servlet.handlers.security.CachedAuthenticatedSessionHandler.handleRequest(CachedAuthenticatedSessionHandler.java:77) at io.undertow.security.handlers.NotificationReceiverHandler.handleRequest(NotificationReceiverHandler.java:50) at io.undertow.security.handlers.AbstractSecurityContextAssociationHandler.handleRequest(AbstractSecurityContextAssociationHandler.java:43) at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43) at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43) at io.undertow.servlet.handlers.ServletInitialHandler.handleFirstRequest(ServletInitialHandler.java:270) at io.undertow.servlet.handlers.ServletInitialHandler.access$100(ServletInitialHandler.java:59) at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:116) at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:113) at io.undertow.servlet.core.ServletRequestContextThreadSetupAction$1.call(ServletRequestContextThreadSetupAction.java:48) at io.undertow.servlet.core.ContextClassLoaderSetupAction$1.call(ContextClassLoaderSetupAction.java:43) at io.quarkus.undertow.runtime.UndertowDeploymentRecorder$9$1$1.call(UndertowDeploymentRecorder.java:496) at io.undertow.servlet.handlers.ServletInitialHandler.dispatchRequest(ServletInitialHandler.java:250) at io.undertow.servlet.handlers.ServletInitialHandler.handleRequest(ServletInitialHandler.java:175) at io.undertow.server.handlers.HttpContinueReadHandler.handleRequest(HttpContinueReadHandler.java:43) at io.quarkus.undertow.runtime.UndertowDeploymentRecorder$1.handleRequest(UndertowDeploymentRecorder.java:102) at io.undertow.server.Connectors.executeRootHandler(Connectors.java:290) at io.undertow.server.DefaultExchangeHandler.handle(DefaultExchangeHandler.java:18) at io.quarkus.undertow.runtime.UndertowDeploymentRecorder$6$1.run(UndertowDeploymentRecorder.java:379) at io.quarkus.runtime.CleanableExecutor$CleaningRunnable.run(CleanableExecutor.java:231) at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2027) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1551) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1442) at org.jboss.threads.DelegatingRunnable.run(DelegatingRunnable.java:29) at org.jboss.threads.ThreadLocalResettingRunnable.run(ThreadLocalResettingRunnable.java:29) at java.base/java.lang.Thread.run(Thread.java:835) at org.jboss.threads.JBossThread.run(JBossThread.java:479) Caused by: java.lang.NullPointerException at java.base/java.util.concurrent.ConcurrentHashMap.computeIfAbsent(ConcurrentHashMap.java:1693) at io.quarkus.qute.EngineImpl.getTemplate(EngineImpl.java:109) at io.quarkus.qute.IncludeSectionHelper$Factory$1.get(IncludeSectionHelper.java:54) at io.quarkus.qute.IncludeSectionHelper$Factory$1.get(IncludeSectionHelper.java:49) at io.quarkus.qute.IncludeSectionHelper.resolve(IncludeSectionHelper.java:23) at io.quarkus.qute.SectionNode.resolve(SectionNode.java:34) at io.quarkus.qute.SectionNode$SectionResolutionContextImpl.execute(SectionNode.java:119) at io.quarkus.qute.SectionHelper$SectionResolutionContext.execute(SectionHelper.java:33) at io.quarkus.qute.Parser$1$1.resolve(Parser.java:80) at io.quarkus.qute.SectionNode.resolve(SectionNode.java:34) at io.quarkus.qute.TemplateImpl.renderData(TemplateImpl.java:99) at io.quarkus.qute.TemplateImpl.access$200(TemplateImpl.java:14) at io.quarkus.qute.TemplateImpl$TemplateInstanceImpl.renderAsync(TemplateImpl.java:80) at io.quarkus.resteasy.qute.runtime.TemplateResponseFilter.filter(TemplateResponseFilter.java:58) at org.jboss.resteasy.core.interception.jaxrs.ContainerResponseContextImpl.filter(ContainerResponseContextImpl.java:360) at org.jboss.resteasy.core.ServerResponseWriter.executeFilters(ServerResponseWriter.java:251) at org.jboss.resteasy.core.ServerResponseWriter.writeNomapResponse(ServerResponseWriter.java:101) at org.jboss.resteasy.core.ServerResponseWriter.writeNomapResponse(ServerResponseWriter.java:74) at org.jboss.resteasy.core.SynchronousDispatcher.writeResponse(SynchronousDispatcher.java:590) ... 58 more ``` And putting `{include}` inside a `{for}` (for example) fails with: ``` java.lang.RuntimeException: Failed to start quarkus at io.quarkus.runner.ApplicationImpl.doStart(ApplicationImpl.zig:248) at io.quarkus.runtime.Application.start(Application.java:90) 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:564) at io.quarkus.runner.bootstrap.StartupActionImpl.run(StartupActionImpl.java:99) at io.quarkus.dev.IsolatedDevModeMain.restartApp(IsolatedDevModeMain.java:103) at io.quarkus.dev.RuntimeUpdatesProcessor.doScan(RuntimeUpdatesProcessor.java:138) at io.quarkus.vertx.http.runtime.devmode.VertxHotReplacementSetup$1.handle(VertxHotReplacementSetup.java:50) at io.quarkus.vertx.http.runtime.devmode.VertxHotReplacementSetup$1.handle(VertxHotReplacementSetup.java:42) at io.vertx.core.impl.ContextImpl.lambda$executeBlocking$2(ContextImpl.java:316) at io.vertx.core.impl.ContextImpl$$Lambda$713/0000000000000000.run(Unknown Source) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1130) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:630) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.base/java.lang.Thread.run(Thread.java:835) Caused by: java.lang.IndexOutOfBoundsException: Index 0 out of bounds for length 0 at java.base/jdk.internal.util.Preconditions.outOfBounds(Preconditions.java:64) at java.base/jdk.internal.util.Preconditions.outOfBoundsCheckIndex(Preconditions.java:70) at java.base/jdk.internal.util.Preconditions.checkIndex(Preconditions.java:248) at java.base/java.util.Objects.checkIndex(Objects.java:373) at java.base/java.util.ArrayList.get(ArrayList.java:426) at io.quarkus.qute.SectionInitContextImpl.getParameters(SectionInitContextImpl.java:28) at io.quarkus.qute.SectionInitContextImpl.getParameter(SectionInitContextImpl.java:36) at io.quarkus.qute.LoopSectionHelper$Factory.initialize(LoopSectionHelper.java:125) at io.quarkus.qute.LoopSectionHelper$Factory.initialize(LoopSectionHelper.java:102) at io.quarkus.qute.SectionNode$Builder.build(SectionNode.java:88) at io.quarkus.qute.Parser.flushTag(Parser.java:358) at io.quarkus.qute.Parser.tag(Parser.java:197) at io.quarkus.qute.Parser.processCharacter(Parser.java:148) at io.quarkus.qute.Parser.parse(Parser.java:105) at io.quarkus.qute.EngineImpl.load(EngineImpl.java:135) at io.quarkus.qute.EngineImpl$$Lambda$475/0000000000000000.apply(Unknown Source) at java.base/java.util.concurrent.ConcurrentHashMap.computeIfAbsent(ConcurrentHashMap.java:1708) at io.quarkus.qute.EngineImpl.getTemplate(EngineImpl.java:109) at io.quarkus.qute.runtime.EngineProducer.<init>(EngineProducer.java:126) at io.quarkus.qute.runtime.EngineProducer_Bean.create(EngineProducer_Bean.zig:382) at io.quarkus.qute.runtime.EngineProducer_Bean.create(EngineProducer_Bean.zig:299) at io.quarkus.arc.impl.AbstractSharedContext.createInstanceHandle(AbstractSharedContext.java:80) at io.quarkus.arc.impl.AbstractSharedContext$$Lambda$59/0000000000000000.apply(Unknown Source) at io.quarkus.arc.impl.ComputingCache$CacheFunction.lambda$apply$0(ComputingCache.java:99) at io.quarkus.arc.impl.ComputingCache$CacheFunction$$Lambda$468/0000000000000000.get(Unknown Source) at io.quarkus.arc.impl.LazyValue.get(LazyValue.java:26) at io.quarkus.arc.impl.ComputingCache.getValue(ComputingCache.java:41) at io.quarkus.arc.impl.AbstractSharedContext.get(AbstractSharedContext.java:25) at io.quarkus.qute.runtime.EngineProducer_Bean.get(EngineProducer_Bean.zig:283) at io.quarkus.qute.runtime.EngineProducer_Bean.get(EngineProducer_Bean.zig:251) at io.quarkus.arc.impl.ArcContainerImpl.beanInstanceHandle(ArcContainerImpl.java:376) at io.quarkus.arc.impl.ArcContainerImpl.beanInstanceHandle(ArcContainerImpl.java:389) at io.quarkus.arc.impl.ArcContainerImpl.instance(ArcContainerImpl.java:249) at io.quarkus.qute.runtime.EngineProducer_Observer_Synthetic_5ca7449e3ab1631e7e8ed910338051c00d29a79b.notify(EngineProducer_Observer_Synthetic_5ca7449e3ab1631e7e8ed910338051c00d29a79b.zig:71) at io.quarkus.arc.impl.EventImpl$Notifier.notifyObservers(EventImpl.java:282) at io.quarkus.arc.impl.EventImpl$Notifier.notify(EventImpl.java:267) at io.quarkus.arc.impl.EventImpl.fire(EventImpl.java:69) at io.quarkus.arc.runtime.LifecycleEventRunner.fireStartupEvent(LifecycleEventRunner.java:23) at io.quarkus.arc.runtime.ArcRecorder.handleLifecycleEvents(ArcRecorder.java:113) at io.quarkus.deployment.steps.LifecycleEventsBuildStep$startupEvent276.deploy_0(LifecycleEventsBuildStep$startupEvent276.zig:77) at io.quarkus.deployment.steps.LifecycleEventsBuildStep$startupEvent276.deploy(LifecycleEventsBuildStep$startupEvent276.zig:36) at io.quarkus.runner.ApplicationImpl.doStart(ApplicationImpl.zig:210) ... 16 more ``` However, if the `{include}` is empty, like in the following, there is no error (but also no way to use the include as expected): ``` {#for entry in entries} {#include includes/teaser} {/include} {/} ``` ``` <!-- output --> <h2></h2> <p></p> ``` Tested with Quarkus version `1.3.0.Final` and `1.3.1.Final`.

3e9a7106483ed675cb6e89b991766f79356e7996

bb2bf209f9a937b75927b1c7c4917ce75ffc7201

https://github.com/quarkusio/quarkus/compare/3e9a7106483ed675cb6e89b991766f79356e7996...bb2bf209f9a937b75927b1c7c4917ce75ffc7201

diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/LoopSectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/LoopSectionHelper.java index 23e146ef787..36e8526dac4 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/LoopSectionHelper.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/LoopSectionHelper.java @@ -28,7 +28,7 @@ public class LoopSectionHelper implements SectionHelper { private final Expression iterable; LoopSectionHelper(String alias, Expression iterable) { - this.alias = alias.equals(Parameter.EMPTY) ? DEFAULT_ALIAS : alias; + this.alias = Parameter.EMPTY.equals(alias) ? DEFAULT_ALIAS : alias; this.iterable = Objects.requireNonNull(iterable); } diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java index 6eef6d20bf3..7b7324a3d18 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java @@ -289,6 +289,7 @@ private void flushTag() { typeInfoStack.addFirst(typeInfos); } + // A new block - stop ignoring the block content ignoreContent = false; } else { @@ -345,6 +346,7 @@ private void flushTag() { "section block end tag [" + name + "] does not match the start tag [" + block.getLabel() + "]"); } section.addBlock(sectionBlockStack.pop().build()); + // Ignore the block content until a next block starts or the current section ends ignoreContent = true; } else { // Section end @@ -354,7 +356,11 @@ private void flushTag() { } section = sectionStack.pop(); if (!ignoreContent) { + // Add the current block to the current section section.addBlock(sectionBlockStack.pop().build()); + } else { + // The current section ends - stop ignoring the block content + ignoreContent = false; } sectionBlockStack.peek().addNode(section.build()); } diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionInitContextImpl.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionInitContextImpl.java index 39b512fb967..6388cf957a0 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionInitContextImpl.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionInitContextImpl.java @@ -1,6 +1,7 @@ package io.quarkus.qute; import io.quarkus.qute.SectionHelperFactory.SectionInitContext; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -25,7 +26,7 @@ public SectionInitContextImpl(EngineImpl engine, List<SectionBlock> blocks, Func * @return the params of the main block */ public Map<String, String> getParameters() { - return blocks.get(0).parameters; + return blocks.isEmpty() ? Collections.emptyMap() : blocks.get(0).parameters; } public boolean hasParameter(String name) { @@ -38,7 +39,7 @@ public String getParameter(String name) { @Override public Expression getExpression(String parameterName) { - return blocks.get(0).expressions.get(parameterName); + return blocks.isEmpty() ? null : blocks.get(0).expressions.get(parameterName); } @Override diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java index 147cb0de2a8..88ed9c6de02 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java @@ -58,4 +58,22 @@ public void testOptionalBlockEndTags() { engine.parse("{#include super}{#header}super header{#footer}super footer{/include}").render()); } + @Test + public void testIncludeInLoop() { + Engine engine = Engine.builder().addDefaults().build(); + engine.putTemplate("foo", engine.parse("{#insert snippet}empty{/insert}")); + assertEquals("1.2.3.4.5.", + engine.parse("{#for i in 5}{#include foo}{#snippet}{count}.{/snippet} this should be ingored {/include}{/for}") + .render()); + } + + @Test + public void testIncludeInIf() { + Engine engine = Engine.builder().addDefaults().build(); + engine.putTemplate("foo", engine.parse("{#insert snippet}empty{/insert}")); + assertEquals("1", + engine.parse("{#if true}{#include foo} {#snippet}1{/snippet} {/include}{/if}") + .render()); + } + }

['independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java', 'independent-projects/qute/core/src/main/java/io/quarkus/qute/LoopSectionHelper.java', 'independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java', 'independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionInitContextImpl.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/8302/8294

quarkusio

quarkus

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

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

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

fixes

Using @ConfigProperty with Optional<List<String>> throw an exception

**Describe the bug** Using: ``` @ConfigProperty(name = "items3") Optional<List<String>> getItems3(); ``` **Expected behavior** Return an empty list when unset **Actual behavior** Throws an exception: ``` java.lang.IllegalArgumentException: No Converter registered for interface java.util.List at io.smallrye.config.SmallRyeConfig.lambda$getConverter$1(SmallRyeConfig.java:202) at java.base/java.util.concurrent.ConcurrentHashMap.computeIfAbsent(ConcurrentHashMap.java:1705) at io.smallrye.config.SmallRyeConfig.getConverter(SmallRyeConfig.java:199) ``` **To Reproduce** Reproducer: https://github.com/ia3andy/check-list-config-empty **Environment (please complete the following information):** - Quarkus version or git rev: 1.3.1.Final

41db86a2e2d881f50431fdcfb0d3ef7647a17a7c

fef18580a87b621aa352138ca19e7b14776f6f7b

https://github.com/quarkusio/quarkus/compare/41db86a2e2d881f50431fdcfb0d3ef7647a17a7c...fef18580a87b621aa352138ca19e7b14776f6f7b

diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java index 5262640498e..9d8643ea1f5 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java @@ -268,11 +268,27 @@ private static ResultHandle populateConfigObject(ClassLoader classLoader, ClassI field.declaringClass().name()); // config.getOptionalValue - ResultHandle setterValue = methodCreator.invokeInterfaceMethod( - MethodDescriptor.ofMethod(Config.class, "getOptionalValue", Optional.class, String.class, - Class.class), - config, methodCreator.load(fullConfigName), methodCreator.loadClass(genericType.name().toString())); - createWriteValue(methodCreator, configObject, field, setter, useFieldAccess, setterValue); + if (genericType.kind() != Type.Kind.PARAMETERIZED_TYPE) { + ResultHandle setterValue = methodCreator.invokeInterfaceMethod( + MethodDescriptor.ofMethod(Config.class, "getOptionalValue", Optional.class, String.class, + Class.class), + config, methodCreator.load(fullConfigName), + methodCreator.loadClass(genericType.name().toString())); + createWriteValue(methodCreator, configObject, field, setter, useFieldAccess, setterValue); + } else { + // convert the String value and populate an Optional with it + ReadOptionalResponse readOptionalResponse = createReadOptionalValueAndConvertIfNeeded(fullConfigName, + genericType, field.declaringClass().name(), methodCreator, config); + createWriteValue(readOptionalResponse.getIsPresentTrue(), configObject, field, setter, useFieldAccess, + readOptionalResponse.getIsPresentTrue().invokeStaticMethod( + MethodDescriptor.ofMethod(Optional.class, "of", Optional.class, Object.class), + readOptionalResponse.getValue())); + + // set Optional.empty if the value isn't set + createWriteValue(readOptionalResponse.getIsPresentFalse(), configObject, field, setter, useFieldAccess, + readOptionalResponse.getIsPresentFalse().invokeStaticMethod( + MethodDescriptor.ofMethod(Optional.class, "empty", Optional.class))); + } } else { /* * We want to support cases where the Config class defines a default value for fields diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java index a17e0b939d9..76982cd50e5 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java @@ -94,7 +94,7 @@ static ReadOptionalResponse createReadOptionalValueAndConvertIfNeeded(String pro return new ReadOptionalResponse(value, isPresentTrue, isPresentBranch.falseBranch(), effectiveTypeResponse); } - private static EffectiveTypeResponse getEffectiveResultType(Type resultType, DotName declaringClass) { + static EffectiveTypeResponse getEffectiveResultType(Type resultType, DotName declaringClass) { if (DotNames.LIST.equals(resultType.name()) || DotNames.COLLECTION.equals(resultType.name()) || DotNames.SET.equals(resultType.name())) { /* diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java index bd02a980f34..9d2fa1b4204 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java @@ -1,6 +1,7 @@ package io.quarkus.arc.deployment.configproperties; import static io.quarkus.arc.deployment.configproperties.ConfigPropertiesUtil.createReadMandatoryValueAndConvertIfNeeded; +import static io.quarkus.arc.deployment.configproperties.ConfigPropertiesUtil.createReadOptionalValueAndConvertIfNeeded; import static io.quarkus.arc.deployment.configproperties.ConfigPropertiesUtil.determineSingleGenericType; import java.lang.reflect.Modifier; @@ -134,12 +135,32 @@ static String generateImplementationForInterfaceConfigProperties(ClassInfo origi Type genericType = determineSingleGenericType(returnType, method.declaringClass().name()); - ResultHandle result = methodCreator.invokeInterfaceMethod( - MethodDescriptor.ofMethod(Config.class, "getOptionalValue", Optional.class, String.class, - Class.class), - config, methodCreator.load(fullConfigName), - methodCreator.loadClass(genericType.name().toString())); - methodCreator.returnValue(result); + + if (genericType.kind() != Type.Kind.PARAMETERIZED_TYPE) { + ResultHandle result = methodCreator.invokeInterfaceMethod( + MethodDescriptor.ofMethod(Config.class, "getOptionalValue", Optional.class, + String.class, + Class.class), + config, methodCreator.load(fullConfigName), + methodCreator.loadClass(genericType.name().toString())); + methodCreator.returnValue(result); + } else { + // convert the String value and populate an Optional with it + ConfigPropertiesUtil.ReadOptionalResponse readOptionalResponse = createReadOptionalValueAndConvertIfNeeded( + fullConfigName, + genericType, method.declaringClass().name(), methodCreator, config); + + // return Optional.empty() if no config value was read + readOptionalResponse.getIsPresentFalse() + .returnValue(readOptionalResponse.getIsPresentFalse().invokeStaticMethod( + MethodDescriptor.ofMethod(Optional.class, "empty", Optional.class))); + + // return Optional.of() using the converted value + readOptionalResponse.getIsPresentTrue() + .returnValue(readOptionalResponse.getIsPresentTrue().invokeStaticMethod( + MethodDescriptor.ofMethod(Optional.class, "of", Optional.class, Object.class), + readOptionalResponse.getValue())); + } } else { if (defaultValueStr != null) { /* diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java index 65d79dff90e..9a81c7c7998 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java @@ -27,7 +27,7 @@ public class ClassWithAllPublicFieldsConfigPropertiesTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( - "dummy.name=quarkus\\ndummy.numbers=1,2,3,4\\ndummy.bool-with-default=true\\ndummy.optional-int=100"), + "dummy.name=quarkus\\ndummy.numbers=1,2,3,4\\ndummy.bool-with-default=true\\ndummy.optional-int=100\\ndummy.optional-int-list=1,2"), "application.properties")); @Inject @@ -42,6 +42,9 @@ public void testConfiguredValues() { assertTrue(dummyBean.getOptionalInt().isPresent()); assertEquals(100, dummyBean.getOptionalInt().get()); assertFalse(dummyBean.getOptionalString().isPresent()); + assertFalse(dummyBean.getOptionalStringList().isPresent()); + assertTrue(dummyBean.getOptionalIntList().isPresent()); + assertEquals(Arrays.asList(1, 2), dummyBean.getOptionalIntList().get()); } @Singleton @@ -72,6 +75,14 @@ Optional<Integer> getOptionalInt() { Optional<String> getOptionalString() { return dummyProperties.optionalString; } + + Optional<List<String>> getOptionalStringList() { + return dummyProperties.optionalStringList; + } + + Optional<List<Integer>> getOptionalIntList() { + return dummyProperties.optionalIntList; + } } @ConfigProperties(prefix = "dummy") @@ -83,5 +94,7 @@ public static class DummyProperties { public List<Integer> numbers; public Optional<Integer> optionalInt; public Optional<String> optionalString; + public Optional<List<String>> optionalStringList; + public Optional<List<Integer>> optionalIntList; } } diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalInterfaceConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalInterfaceConfigPropertiesTest.java index ba31954273c..c91f9e09a4f 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalInterfaceConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalInterfaceConfigPropertiesTest.java @@ -6,6 +6,7 @@ import java.util.Arrays; import java.util.Collection; +import java.util.List; import java.util.Optional; import javax.inject.Inject; @@ -28,7 +29,7 @@ public class TypicalInterfaceConfigPropertiesTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(DummyBean.class, DummyProperties.class) .addAsResource(new StringAsset( - "dummy.name=quarkus\\ndummy.numbers=1,2,3,4\\ndummy.boolWD=true\\ndummy.optional-int=100"), + "dummy.name=quarkus\\ndummy.numbers=1,2,3,4\\ndummy.boolWD=true\\ndummy.optional-int=100\\ndummy.optionalStringList=a,b"), "application.properties")); @Inject @@ -44,6 +45,9 @@ public void testConfiguredValues() { assertTrue(dummyBean.getOptionalInt().isPresent()); assertEquals(100, dummyBean.getOptionalInt().get()); assertFalse(dummyBean.getOptionalString().isPresent()); + assertFalse(dummyBean.getIntListOptional().isPresent()); + assertTrue(dummyBean.getStringListOptional().isPresent()); + assertEquals(Arrays.asList("a", "b"), dummyBean.getStringListOptional().get()); } @Singleton @@ -76,6 +80,14 @@ Optional<String> getOptionalString() { return dummyProperties.stringOptional(); } + Optional<List<String>> getStringListOptional() { + return dummyProperties.stringListOptional(); + } + + Optional<List<Integer>> getIntListOptional() { + return dummyProperties.intListOptional(); + } + String nameWithSuffix() { return dummyProperties.nameWithSuffix(); } @@ -100,6 +112,12 @@ public interface DummyProperties { @ConfigProperty(name = "optionalString") Optional<String> stringOptional(); + @ConfigProperty(name = "optionalStringList") + Optional<List<String>> stringListOptional(); + + @ConfigProperty(name = "optionalIntList") + Optional<List<Integer>> intListOptional(); + default String nameWithSuffix() { return getFirstName() + "!"; }

['extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java', 'extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/TypicalInterfaceConfigPropertiesTest.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/8283/8260

quarkusio

quarkus

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

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

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

fixes

Prohibited package name: java.util.concurrent

**Describe the bug** I tried to upgrade quarkus version (platform + plugin) to 1.3.0.Final and 1.3.1.Final, but maven build failed due to error in instantiation of test: ``` ...fileDownload Time elapsed: 0.021 s <<< ERROR! java.lang.RuntimeException: java.lang.RuntimeException: java.lang.reflect.InvocationTargetException Caused by: java.lang.RuntimeException: java.lang.reflect.InvocationTargetException Caused by: java.lang.reflect.InvocationTargetException Caused by: java.lang.SecurityException: Prohibited package name: java.util.concurrent ``` I guess, it is somehow project related, because I couldn't reproduce the issue in basic demo application. The test was executed fine with quarkus 1.2.0.Final I tried to search in all project depedencies if I spot a class within the that java package but no luck. Is there a way, how to get more info from quarkus, what was wrong? I tried to enable TRACE log level in application.properties (in test/resources) but again, just those **Expected behavior** The tests annotated by @QuarkusTest annotation should be executed fine or it should get back more explanatory error message, which class was in prohibited package. **Actual behavior** Test fails due to following issue : Caused by: java.lang.SecurityException: Prohibited package name: java.util.concurrent **To Reproduce** Steps to reproduce the behavior: Not able to reproduce it. **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`: Linux name-VirtualBox 4.15.0-91-generic #92-Ubuntu SMP Fri Feb 28 11:09:48 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux - Output of `java -version`: openjdk version "1.8.0_242" OpenJDK Runtime Environment (build 1.8.0_242-b06) OpenJDK 64-Bit Server VM GraalVM CE 20.0.0 (build 25.242-b06-jvmci-20.0-b02, mixed mode) - GraalVM version (if different from Java): - Quarkus version or git rev: 1.3.1.Final - Build tool (ie. output of `mvnw --version` or `gradlew --version`): Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) Maven home: /home/<>/Tools/maven Java version: 1.8.0_242, vendor: Oracle Corporation, runtime: /home/<>/Tools/graalvm/jre Default locale: en_US, platform encoding: UTF-8 OS name: "linux", version: "4.15.0-91-generic", arch: "amd64", family: "unix" **Additional context** (Add any other context about the problem here.)

dded561efe07ed5de7d4971f9fc16ad6c45b5dea

b3fe1e9882a26adff63202633a08c1be3488553d

https://github.com/quarkusio/quarkus/compare/dded561efe07ed5de7d4971f9fc16ad6c45b5dea...b3fe1e9882a26adff63202633a08c1be3488553d

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java index feb0e97ae9d..5bfd53defe2 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java @@ -35,6 +35,7 @@ public class QuarkusClassLoader extends ClassLoader implements Closeable { private static final Logger log = Logger.getLogger(QuarkusClassLoader.class); protected static final String META_INF_SERVICES = "META-INF/services/"; + protected static final String JAVA = "java."; static { registerAsParallelCapable(); @@ -276,6 +277,9 @@ public Class<?> loadClass(String name) throws ClassNotFoundException { @Override protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { + if (name.startsWith(JAVA)) { + return parent.loadClass(name); + } //even if the thread is interrupted we still want to be able to load classes //if the interrupt bit is set then we clear it and restore it at the end boolean interrupted = Thread.interrupted();

['independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.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/8247/8246

quarkusio

quarkus

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

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

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

fixes

quarkus.container-image.registry is not reflected, docker.io is always used

Trying to push the image to quay.io, docker.io is always used It seems quarkus.container-image.registry is not reflected in the push command I will look into it and try to fix is.

a1768757089ea347693e4bdca1517fe0cba01d58

b5023c8fc43c5b7abf991a1aa717d7e2e33d2b19

https://github.com/quarkusio/quarkus/compare/a1768757089ea347693e4bdca1517fe0cba01d58...b5023c8fc43c5b7abf991a1aa717d7e2e33d2b19

diff --git a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java index e25f53c01ee..eb186d74536 100644 --- a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java +++ b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java @@ -118,12 +118,15 @@ private void createContainerImage(ContainerImageConfig containerImageConfig, Doc log.infof("Pushed container image %s (%s)\\n", image, reader.getImageId()); if (pushRequested || containerImageConfig.push) { + String registry = "docker.io"; if (!containerImageConfig.registry.isPresent()) { log.info("No container image registry was set, so 'docker.io' will be used"); + } else { + registry = containerImageConfig.registry.get(); } // Check if we need to login first if (containerImageConfig.username.isPresent() && containerImageConfig.password.isPresent()) { - boolean loginSuccessful = ExecUtil.exec("docker", "login", "-u", containerImageConfig.username.get(), + boolean loginSuccessful = ExecUtil.exec("docker", "login", registry, "-u", containerImageConfig.username.get(), "-p" + containerImageConfig.password.get()); if (!loginSuccessful) { throw dockerException(new String[] { "-u", containerImageConfig.username.get(), "-p", "********" });

['extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.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/8219/8217

quarkusio

quarkus

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

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

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

resolves

Qute - computed section helpers used during validation don't play well with {#include}

As a result section blocks in an `{#include}` section must also define an end tag which is normally optional.

e1492fb9a5273f8ae4b2d12a89ac561ea6e0f4f4

d3c2976bcd211d5127c6de0f5e0909600e1b5099

https://github.com/quarkusio/quarkus/compare/e1492fb9a5273f8ae4b2d12a89ac561ea6e0f4f4...d3c2976bcd211d5127c6de0f5e0909600e1b5099

diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/include/IncludeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/include/IncludeTest.java index ce75ef68f87..b0c80dd229f 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/include/IncludeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/include/IncludeTest.java @@ -18,15 +18,16 @@ public class IncludeTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) - .addAsResource(new StringAsset("{#insert item}NOK{/}"), "templates/base.html") - .addAsResource(new StringAsset("{#include base}{#item}OK{/}{/}"), "templates/detail.html")); + .addAsResource(new StringAsset("{#insert item}NOK{/}:{#insert foo}default foo{/}"), "templates/base.html") + .addAsResource(new StringAsset("{#include base}{#item}OK{/}{#foo}my foo{/include}"), + "templates/detail.html")); @Inject Template detail; @Test public void testIncludeSection() { - assertEquals("OK", detail.render()); + assertEquals("OK:my foo", detail.render()); } } diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java index 385c0b097df..0dfdf59ccca 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java @@ -44,7 +44,7 @@ class EngineImpl implements Engine { EngineImpl(Map<String, SectionHelperFactory<?>> sectionHelperFactories, List<ValueResolver> valueResolvers, List<NamespaceResolver> namespaceResolvers, List<TemplateLocator> locators, List<ResultMapper> resultMappers, Function<String, SectionHelperFactory<?>> sectionHelperFunc) { - this.sectionHelperFactories = new HashMap<>(sectionHelperFactories); + this.sectionHelperFactories = Collections.unmodifiableMap(new HashMap<>(sectionHelperFactories)); this.valueResolvers = sort(valueResolvers); this.namespaceResolvers = ImmutableList.copyOf(namespaceResolvers); this.evaluator = new EvaluatorImpl(this.valueResolvers); @@ -82,7 +82,7 @@ public SectionHelperFactory<?> getSectionHelperFactory(String name) { } public Map<String, SectionHelperFactory<?>> getSectionHelperFactories() { - return Collections.unmodifiableMap(sectionHelperFactories); + return sectionHelperFactories; } public List<ValueResolver> getValueResolvers() { diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java index c91eb18173c..6eef6d20bf3 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java @@ -263,7 +263,7 @@ private void flushTag() { // Add a section block if the section name matches a section block label or does not map to any section helper and the last section treats unknown subsections as blocks if (lastSection != null && lastSection.factory.getBlockLabels().contains(sectionName) || (lastSection.factory.treatUnknownSectionsAsBlocks() - && engine.getSectionHelperFactory(sectionName) == null)) { + && !engine.getSectionHelperFactories().containsKey(sectionName))) { // Section block if (!ignoreContent) { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java index cf87f46fdf5..147cb0de2a8 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java @@ -50,4 +50,12 @@ public void testIncludeSimpleData() { engine.parse("{#include detail/}").render(data)); } + @Test + public void testOptionalBlockEndTags() { + Engine engine = Engine.builder().addDefaults().build(); + engine.putTemplate("super", engine.parse("{#insert header}header{/}:{#insert footer /}")); + assertEquals("super header:super footer", + engine.parse("{#include super}{#header}super header{#footer}super footer{/include}").render()); + } + }

['independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java', 'extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/include/IncludeTest.java', 'independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java', 'independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.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/8176/8156

quarkusio

quarkus

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

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

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

fixes

Quarkus hello.world image build fails when using openjdk-8u252-jvmci-20.0-b03

**Describe the bug** Building a Quarkus hello.world image fails when using a GraalVM built from https://github.com/graalvm/graal-jvmci-8/releases/download/jvmci-20.0-b03/openjdk-8u252-jvmci-20.0-b03-linux-amd64.tar.gz ``` [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ hello.world --- [INFO] Building jar: /home/pwoegere/OLabs/issues/GR-21959/hello.world/target/hello.world-1.0-SNAPSHOT.jar [INFO] [INFO] --- quarkus-maven-plugin:1.2.0.Final:build (default) @ hello.world --- [INFO] [org.jboss.threads] JBoss Threads version 3.0.0.Final [INFO] [io.quarkus.deployment.pkg.steps.JarResultBuildStep] Building thin jar: /home/pwoegere/OLabs/issues/GR-21959/hello.world/target/hello.world-1.0-SNAPSHOT-runner.jar [INFO] [io.quarkus.deployment.QuarkusAugmentor] Quarkus augmentation completed in 1055ms [INFO] [INFO] --- quarkus-maven-plugin:1.2.0.Final:native-image (default) @ hello.world --- [INFO] [io.quarkus.deployment.pkg.steps.JarResultBuildStep] Building native image source jar: /home/pwoegere/OLabs/issues/GR-21959/hello.world/target/hello.world-1.0-SNAPSHOT-native-image-source-jar/hello.world-1.0-SNAPSHOT-runner.jar [INFO] [io.quarkus.deployment.pkg.steps.NativeImageBuildStep] Building native image from /home/pwoegere/OLabs/issues/GR-21959/hello.world/target/hello.world-1.0-SNAPSHOT-native-image-source-jar/hello.world-1.0-SNAPSHOT-runner.jar [INFO] [io.quarkus.deployment.pkg.steps.NativeImageBuildStep] Running Quarkus native-image plugin on GraalVM Version 20.1.0-dev LIBGRAAL (Java Version 1.8.0_252) [INFO] [io.quarkus.deployment.pkg.steps.NativeImageBuildStep] /home/pwoegere/OLabs/issues/GR-21959/graal/vm/latest_graalvm_home/bin/native-image -J-Djava.util.logging.manager=org.jboss.logmanager.LogManager -J-Dsun.nio.ch.maxUpdateArraySize=100 -J-Dio.netty.leakDetection.level=DISABLED -J-Dio.netty.allocator.maxOrder=1 -J-Dvertx.logger-delegate-factory-class-name=io.quarkus.vertx.core.runtime.VertxLogDelegateFactory -J-Dvertx.disableDnsResolver=true --initialize-at-build-time= -H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime -jar hello.world-1.0-SNAPSHOT-runner.jar -H:FallbackThreshold=0 -H:+ReportExceptionStackTraces -H:-AddAllCharsets -H:EnableURLProtocols=http -H:NativeLinkerOption=-no-pie -H:+JNI --no-server -H:-UseServiceLoaderFeature -H:+StackTrace hello.world-1.0-SNAPSHOT-runner [hello.world-1.0-SNAPSHOT-runner:47922] classlist: 4,574.43 ms, 1.36 GB [hello.world-1.0-SNAPSHOT-runner:47922] (cap): 653.05 ms, 1.36 GB [hello.world-1.0-SNAPSHOT-runner:47922] setup: 2,072.65 ms, 1.36 GB 15:10:54,309 INFO [org.jbo.threads] JBoss Threads version 3.0.0.Final [hello.world-1.0-SNAPSHOT-runner:47922] (clinit): 582.35 ms, 1.95 GB [hello.world-1.0-SNAPSHOT-runner:47922] (typeflow): 11,011.49 ms, 1.95 GB [hello.world-1.0-SNAPSHOT-runner:47922] (objects): 8,593.85 ms, 1.95 GB [hello.world-1.0-SNAPSHOT-runner:47922] (features): 388.07 ms, 1.95 GB [hello.world-1.0-SNAPSHOT-runner:47922] analysis: 21,522.86 ms, 1.95 GB Error: Unsupported features in 4 methods Detailed message: Error: Class initialization of io.netty.handler.ssl.JettyAlpnSslEngine$ClientEngine failed. Use the option --initialize-at-run-time=io.netty.handler.ssl.JettyAlpnSslEngine$ClientEngine to explicitly request delayed initialization of this class. Original exception that caused the problem: java.lang.NoClassDefFoundError: org/eclipse/jetty/alpn/ALPN$Provider at sun.misc.Unsafe.ensureClassInitialized(Native Method) at com.oracle.svm.hosted.classinitialization.ConfigurableClassInitialization.ensureClassInitialized(ConfigurableClassInitialization.java:167) at com.oracle.svm.hosted.classinitialization.ConfigurableClassInitialization.computeInitKindAndMaybeInitializeClass(ConfigurableClassInitialization.java:560) at com.oracle.svm.hosted.classinitialization.ConfigurableClassInitialization.computeInitKindAndMaybeInitializeClass(ConfigurableClassInitialization.java:130) at com.oracle.svm.hosted.classinitialization.ConfigurableClassInitialization.maybeInitializeHosted(ConfigurableClassInitialization.java:158) at com.oracle.svm.hosted.SVMHost.registerType(SVMHost.java:200) at com.oracle.graal.pointsto.meta.AnalysisUniverse.createType(AnalysisUniverse.java:264) at com.oracle.graal.pointsto.meta.AnalysisUniverse.lookupAllowUnresolved(AnalysisUniverse.java:205) at com.oracle.graal.pointsto.infrastructure.WrappedConstantPool.lookupType(WrappedConstantPool.java:155) at org.graalvm.compiler.java.BytecodeParser.lookupType(BytecodeParser.java:4248) at org.graalvm.compiler.java.BytecodeParser.genNewInstance(BytecodeParser.java:4505) at org.graalvm.compiler.java.BytecodeParser.processBytecode(BytecodeParser.java:5303) at org.graalvm.compiler.java.BytecodeParser.iterateBytecodesForBlock(BytecodeParser.java:3397) at org.graalvm.compiler.java.BytecodeParser.processBlock(BytecodeParser.java:3204) at org.graalvm.compiler.java.BytecodeParser.build(BytecodeParser.java:1085) at org.graalvm.compiler.java.BytecodeParser.buildRootMethod(BytecodeParser.java:979) at org.graalvm.compiler.java.GraphBuilderPhase$Instance.run(GraphBuilderPhase.java:84) at org.graalvm.compiler.phases.Phase.run(Phase.java:49) at org.graalvm.compiler.phases.BasePhase.apply(BasePhase.java:209) at org.graalvm.compiler.phases.Phase.apply(Phase.java:42) at org.graalvm.compiler.phases.Phase.apply(Phase.java:38) at com.oracle.graal.pointsto.flow.MethodTypeFlowBuilder.parse(MethodTypeFlowBuilder.java:221) at com.oracle.graal.pointsto.flow.MethodTypeFlowBuilder.apply(MethodTypeFlowBuilder.java:340) at com.oracle.graal.pointsto.flow.MethodTypeFlow.doParse(MethodTypeFlow.java:310) at com.oracle.graal.pointsto.flow.MethodTypeFlow.ensureParsed(MethodTypeFlow.java:300) at com.oracle.graal.pointsto.flow.MethodTypeFlow.addContext(MethodTypeFlow.java:107) at com.oracle.graal.pointsto.flow.StaticInvokeTypeFlow.update(InvokeTypeFlow.java:346) at com.oracle.graal.pointsto.BigBang$2.run(BigBang.java:523) at com.oracle.graal.pointsto.util.CompletionExecutor.lambda$execute$0(CompletionExecutor.java:175) at java.util.concurrent.ForkJoinTask$RunnableExecuteAction.exec(ForkJoinTask.java:1402) at java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:289) at java.util.concurrent.ForkJoinPool$WorkQueue.runTask(ForkJoinPool.java:1056) at java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1692) at java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:157) Caused by: java.lang.ClassNotFoundException: org.eclipse.jetty.alpn.ALPN$Provider at java.net.URLClassLoader.findClass(URLClassLoader.java:382) at java.lang.ClassLoader.loadClass(ClassLoader.java:419) at java.lang.ClassLoader.loadClass(ClassLoader.java:352) ... 34 more ``` **Expected behavior** Doing the same as above but based on the previous https://github.com/graalvm/openjdk8-jvmci-builder/releases/tag/jvmci-20.0-b02 release results in a successful build. The same should work when using a GraalVM release based on jvmci-20.0-b03. **Actual behavior** Building the Quarkus hello.world image when using a GraalVM release based on jvmci-20.0-b03 fails with the error message shown above. **To Reproduce** Steps to reproduce the behavior: 1. Get and extract https://github.com/graalvm/graal-jvmci-8/releases/download/jvmci-20.0-b03/openjdk-8u252-jvmci-20.0-b03-linux-amd64.tar.gz 2. Set `JAVA_HOME` to the openjdk-8u252-jvmci-20.0-b03 release 3. Clone https://github.com/oracle/graal/ 4. Change to `graal/vm` & build a GraalVM with `mx --dy /substratevm --disable-installables=true --force-bash-launchers=gu,native-image-configure,polyglot --skip-libraries=native-image-agent,polyglot` 5. Clone https://github.com/olpaw/quarkus-hello-world and change to `quarkus-hello-world` 6. Build with `GRAALVM_HOME=<path-to>/graal/vm/latest_graalvm_home mvn package -Pnative` to see the error message decribed above. **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Linux olpaw.lan 5.5.10-200.fc31.x86_64 #1 SMP Wed Mar 18 14:21:38 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux - Output of `java -version`: ``` openjdk version "1.8.0_252" OpenJDK Runtime Environment (build 1.8.0_252-b05) OpenJDK 64-Bit Server VM (build 25.252-b05-jvmci-20.0-b03, mixed mode) ``` - GraalVM version (if different from Java): see Steps to reproduce pt 4. - Quarkus version or git rev: 1.2.0.Final - Build tool (ie. output of `mvnw --version` or `gradlew --version`): Apache Maven 3.5.4 (Red Hat 3.5.4-5)

4c02d4f992c1761c1c7823465c09e20473d26dcc

db174d3f3480e871e0c49dc7cd7bc7fc3fb68d57

https://github.com/quarkusio/quarkus/compare/4c02d4f992c1761c1c7823465c09e20473d26dcc...db174d3f3480e871e0c49dc7cd7bc7fc3fb68d57

diff --git a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java index b3c4f28ad88..37ae94beb6f 100644 --- a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java +++ b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java @@ -122,18 +122,18 @@ public SSLEngine wrapSslEngine(SSLEngine engine, ByteBufAllocator alloc, @TargetClass(className = "io.netty.handler.ssl.JettyAlpnSslEngine", onlyWith = JDK8OrEarlier.class) final class Target_io_netty_handler_ssl_JettyAlpnSslEngine { - @Alias + @Substitute static boolean isAvailable() { return false; } - @Alias + @Substitute static Target_io_netty_handler_ssl_JettyAlpnSslEngine newClientEngine(SSLEngine engine, JdkApplicationProtocolNegotiator applicationNegotiator) { return null; } - @Alias + @Substitute static Target_io_netty_handler_ssl_JettyAlpnSslEngine newServerEngine(SSLEngine engine, JdkApplicationProtocolNegotiator applicationNegotiator) { return null;

['extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.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/8108/8009

quarkusio

quarkus

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

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

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

fixes

Quarkus Kotlin extension not added in Bootstrap Kotlin+Gradle Project

**Describe the bug** Quarkus Kotlin extension is not added in dependencies Bootstrap Kotlin+Gradle Project **Expected behavior** It should be added to to `dependencies` block **Actual behavior** It is not added to to `dependencies` block **To Reproduce** Steps to reproduce the behavior: - Bootstrap kotlin+gradle project ``` mvn io.quarkus:quarkus-maven-plugin:999-SNAPSHOT:create \\ -DprojectGroupId=org.acme \\ -DprojectArtifactId=kotlin-test-gradle \\ -DclassName="org.acme.fruitStore.FruitResource" \\ -Dpath="/fruits" \\ -DplatformArtifactId=quarkus-bom \\ -Dextensions="kotlin,resteasy-jsonb" \\ -DbuildTool=gradle ``` **Environment (please complete the following information):** - Build tool : Gradle 6.1.1

9f9788c78bc82f7ce6e1f79038f030e5458fde94

1490af52c89ef235663920aaa030a4401f7aa477

https://github.com/quarkusio/quarkus/compare/9f9788c78bc82f7ce6e1f79038f030e5458fde94...1490af52c89ef235663920aaa030a4401f7aa477

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java index caf1fab6a3b..df61b6767de 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java @@ -214,7 +214,8 @@ public void execute() throws MojoExecutionException { File createdDependenciesBuildFile = new File(projectRoot, buildToolEnum.getDependenciesFile()); File buildFile = new File(createdDependenciesBuildFile.getAbsolutePath()); if (success) { - success = new AddExtensions(projectWriter, platform).extensions(extensions).execute().isSuccess(); + success = new AddExtensions(projectWriter, buildToolEnum, platform).extensions(extensions).execute() + .isSuccess(); } if (BuildTool.MAVEN.equals(buildToolEnum)) { createMavenWrapper(createdDependenciesBuildFile, ToolsUtils.readQuarkusProperties(platform)); diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java index 2fefe7f6247..5cb2bc5ac6a 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java @@ -207,6 +207,32 @@ public void testProjectGenerationFromScratchWithExtensions() throws Exception { && d.getVersion() == null)).isTrue(); } + @Test + public void testGradleProjectGenerationFromScratchWithExtensions() throws Exception { + testDir = initEmptyProject("projects/gradle-project-generation-with-extensions"); + assertThat(testDir).isDirectory(); + invoker = initInvoker(testDir); + + Properties properties = new Properties(); + properties.put("projectGroupId", "org.acme"); + properties.put("projectArtifactId", "acme"); + properties.put("className", "org.acme.MyResource"); + properties.put("extensions", "kotlin,jackson"); + properties.put("buildTool", "gradle"); + setup(properties); + + // As the directory is not empty (log) navigate to the artifactID directory + testDir = new File(testDir, "acme"); + + assertThat(new File(testDir, "build.gradle")).isFile(); + assertThat(new File(testDir, "src/main/kotlin")).isDirectory(); + + check(new File(testDir, "src/main/kotlin/org/acme/MyResource.kt"), "package org.acme"); + + assertThat(FileUtils.readFileToString(new File(testDir, "build.gradle"), "UTF-8")) + .contains("quarkus-kotlin", "quarkus-jackson").doesNotContain("missing"); + } + @Test public void testProjectGenerationFromScratchWithCustomDependencies() throws Exception { testDir = initEmptyProject("projects/project-generation-with-resource-and-custom-deps");

['devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java', 'integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.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/8099/7996

quarkusio

quarkus

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

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

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

fixes

Quarkus 1.3.0.Final gradle does not start with Undertow Servlet

**Describe the bug** When I include Undertow Servlet in a Gradle project, quarkus application does not start. **Expected behavior** Quarkus app should start without throwing an error **Actual behavior** (Describe the actual behavior clearly and concisely.) **To Reproduce** Steps to reproduce the behavior: 1. Go to https://code.quarkus.io/ 2. Change Build Tool to: Gradle 3. Add Undertow Servlet as a dependency. 4. Generate project 5. Try running with quarkusDev build task. Project throws java.lang.ExceptionInInitializerError The same configuration when used with maven starts fine. **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.)

e1fa8201567b2c894ebad125c0ae535dd9631bf9

f6dc75afae158026fbcabf0791e650d3fac69f7e

https://github.com/quarkusio/quarkus/compare/e1fa8201567b2c894ebad125c0ae535dd9631bf9...f6dc75afae158026fbcabf0791e650d3fac69f7e

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java index ddfaf1b3481..8f489ad1672 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java @@ -34,6 +34,7 @@ public class QuarkusClassLoader extends ClassLoader implements Closeable { private static final Logger log = Logger.getLogger(QuarkusClassLoader.class); + protected static final String META_INF_SERVICES = "META-INF/services/"; static { registerAsParallelCapable(); @@ -132,6 +133,27 @@ public Enumeration<URL> getResources(String nm) throws IOException { // resources.add(element.getResource(nm).getUrl()); // } //} + + //this is a big of a hack, but is nessesary to prevent service leakage + //in some situations (looking at you gradle) the parent can contain the same + //classes as the application. The parent aggregation stops this being a problem + //in most cases, however if there are no actual implementations of the service + //in the application then this can still cause problems + //this approach makes sure that we don't load services that would result + //in a ServiceConfigurationError + //see https://github.com/quarkusio/quarkus/issues/7996 + if (name.startsWith(META_INF_SERVICES)) { + try { + Class<?> c = loadClass(name.substring(META_INF_SERVICES.length())); + if (c.getClassLoader() == this) { + //if the service class is defined by this class loader then any resources that could be loaded + //by the parent would have a different copy of the service class + banned = true; + } + } catch (ClassNotFoundException ignored) { + //ignore + } + } for (ClassPathElement i : elements) { ClassPathResource res = i.getResource(nm); if (res != null) {

['independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.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/8010/7990

quarkusio

quarkus

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

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

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

fixes

Native container-build on Windows10 fails (.exe)

**Describe the bug** Building a native image inside docker causes an error. It seems the build is looking for a **.exe** file. But with containerized build inside docker no **.exe** file is generated - and that is okay :-) **Expected behavior** Linux executable generated. **Actual behavior** ``` [INFO] --- quarkus-maven-plugin:1.3.0.Final:build (default) @ example --- [INFO] [org.jboss.threads] JBoss Threads version 3.0.1.Final [INFO] [org.hibernate.Version] HHH000412: Hibernate ORM core version 5.4.12.Final [INFO] [io.quarkus.deployment.pkg.steps.JarResultBuildStep] Building native image source jar: C:\\git\\CA.micro\\example-quarkus\\example\\target\\example-1.0.0-SNAPSHOT-native-image-source-jar\\example-1.0.0-SNAPSHOT-runner.jar [INFO] [io.quarkus.deployment.pkg.steps.NativeImageBuildStep] Building native image from C:\\git\\CA.micro\\example-quarkus\\example\\target\\example-1.0.0-SNAPSHOT-native-image-source-jar\\example-1.0.0-SNAPSHOT-runner.jar [INFO] [io.quarkus.deployment.pkg.steps.NativeImageBuildStep] Pulling image quay.io/quarkus/ubi-quarkus-native-image:20.0.0-java11 20.0.0-java11: Pulling from quarkus/ubi-quarkus-native-image 57de4da701b5: Pull complete cf0f3ebe9f53: Pull complete bc826280acdc: Pull complete Digest: sha256:7716147f3621829b8039dec6c2c56ec9eaea705e5d1b83899c600cc575c3a1a2 Status: Downloaded newer image for quay.io/quarkus/ubi-quarkus-native-image:20.0.0-java11 quay.io/quarkus/ubi-quarkus-native-image:20.0.0-java11 [INFO] [io.quarkus.deployment.pkg.steps.NativeImageBuildStep] Running Quarkus native-image plugin on GraalVM Version 20.0.0 CE [INFO] [io.quarkus.deployment.pkg.steps.NativeImageBuildStep] docker run -v //c/git/CA.micro/example-quarkus/example/target/example-1.0.0-SNAPSHOT-native-image-source-jar:/project:z --env LANG=C --rm quay.io/quarkus/ubi-quarkus-native-image:20.0.0-java11 -J-Djava.util.logging.manager=org.jboss.logmanager.LogManager -J-DCoordinatorEnvironmentBean.transactionStatusManagerEnable=false -J-Dsun.nio.ch.maxUpdateArraySize=100 -J-Dvertx.logger-delegate-factory-class-name=io.quarkus.vertx.core.runtime.VertxLogDelegateFactory -J-Dvertx.disableDnsResolver=true -J-Dio.netty.leakDetection.level=DISABLED -J-Dio.netty.allocator.maxOrder=1 -J-Duser.language=de -J-Dfile.encoding=Cp1252 --initialize-at-build-time= -H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime -H:+JNI -jar example-1.0.0-SNAPSHOT-runner.jar -H:FallbackThreshold=0 -H:+ReportExceptionStackTraces -J-Xmx8g -H:-AddAllCharsets -H:-IncludeAllTimeZones -H:EnableURLProtocols=http,https --enable-all-security-services -H:-UseServiceLoaderFeature -H:+StackTrace example-1.0.0-SNAPSHOT-runner Build on Server(pid: 28, port: 43973)* [example-1.0.0-SNAPSHOT-runner:28] classlist: 33.900,33 ms, 1,00 GB [example-1.0.0-SNAPSHOT-runner:28] (cap): 946,80 ms, 1,00 GB [example-1.0.0-SNAPSHOT-runner:28] setup: 3.569,52 ms, 1,00 GB 15:50:57,711 INFO [org.hib.Version] HHH000412: Hibernate ORM core version 5.4.12.Final 15:50:57,742 INFO [org.hib.ann.com.Version] HCANN000001: Hibernate Commons Annotations {5.1.0.Final} 15:50:57,846 INFO [org.hib.dia.Dialect] HHH000400: Using dialect: io.quarkus.hibernate.orm.runtime.dialect.QuarkusPostgreSQL10Dialect 15:51:00,713 INFO [org.jbo.threads] JBoss Threads version 3.0.1.Final [example-1.0.0-SNAPSHOT-runner:28] (typeflow): 141.095,72 ms, 3,10 GB [example-1.0.0-SNAPSHOT-runner:28] (objects): 66.946,90 ms, 3,10 GB [example-1.0.0-SNAPSHOT-runner:28] (features): 3.858,65 ms, 3,10 GB [example-1.0.0-SNAPSHOT-runner:28] analysis: 219.111,09 ms, 3,10 GB [example-1.0.0-SNAPSHOT-runner:28] (clinit): 2.007,05 ms, 3,10 GB [example-1.0.0-SNAPSHOT-runner:28] universe: 8.045,85 ms, 3,10 GB [example-1.0.0-SNAPSHOT-runner:28] (parse): 14.765,83 ms, 2,36 GB [example-1.0.0-SNAPSHOT-runner:28] (inline): 13.104,63 ms, 2,73 GB [example-1.0.0-SNAPSHOT-runner:28] (compile): 105.498,51 ms, 2,80 GB [example-1.0.0-SNAPSHOT-runner:28] compile: 140.530,07 ms, 2,80 GB [example-1.0.0-SNAPSHOT-runner:28] image: 9.756,83 ms, 2,80 GB [example-1.0.0-SNAPSHOT-runner:28] write: 4.205,53 ms, 2,80 GB [example-1.0.0-SNAPSHOT-runner:28] [total]: 420.428,43 ms, 2,80 GB [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 17:00 min [INFO] Finished at: 2020-03-19T16:57:19+01:00 [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal io.quarkus:quarkus-maven-plugin:1.3.0.Final:build (default) on project example: Failed to build quarkus application: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [ERROR] [error]: Build step io.quarkus.deployment.pkg.steps.NativeImageBuildStep#build threw an exception: java.lang.RuntimeException: Failed to build native image [ERROR] at io.quarkus.deployment.pkg.steps.NativeImageBuildStep.build(NativeImageBuildStep.java:352) [ERROR] at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [ERROR] at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) [ERROR] at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [ERROR] at java.base/java.lang.reflect.Method.invoke(Method.java:566) [ERROR] at io.quarkus.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:938) [ERROR] at io.quarkus.builder.BuildContext.run(BuildContext.java:273) [ERROR] at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) [ERROR] at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2027) [ERROR] at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1551) [ERROR] at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1442) [ERROR] at java.base/java.lang.Thread.run(Thread.java:834) [ERROR] at org.jboss.threads.JBossThread.run(JBossThread.java:479) [ERROR] Caused by: java.nio.file.NoSuchFileException: C:\\git\\CA.micro\\example-quarkus\\example\\target\\example-1.0.0-SNAPSHOT-native-image-source-jar\\example-1.0.0-SNAPSHOT-runner.exe [ERROR] at java.base/sun.nio.fs.WindowsException.translateToIOException(WindowsException.java:85) [ERROR] at java.base/sun.nio.fs.WindowsException.rethrowAsIOException(WindowsException.java:103) [ERROR] at java.base/sun.nio.fs.WindowsException.rethrowAsIOException(WindowsException.java:108) [ERROR] at java.base/sun.nio.fs.WindowsFileAttributeViews$Basic.readAttributes(WindowsFileAttributeViews.java:53) [ERROR] at java.base/sun.nio.fs.WindowsFileAttributeViews$Basic.readAttributes(WindowsFileAttributeViews.java:38) [ERROR] at java.base/sun.nio.fs.WindowsFileSystemProvider.readAttributes(WindowsFileSystemProvider.java:198) [ERROR] at java.base/java.nio.file.Files.readAttributes(Files.java:1763) [ERROR] at java.base/java.nio.file.FileTreeWalker.getAttributes(FileTreeWalker.java:225) [ERROR] at java.base/java.nio.file.FileTreeWalker.visit(FileTreeWalker.java:276) [ERROR] at java.base/java.nio.file.FileTreeWalker.walk(FileTreeWalker.java:322) [ERROR] at java.base/java.nio.file.Files.walkFileTree(Files.java:2716) [ERROR] at io.quarkus.bootstrap.util.IoUtils.copy(IoUtils.java:98) [ERROR] at io.quarkus.deployment.pkg.steps.NativeImageBuildStep.build(NativeImageBuildStep.java:346) [ERROR] ... 12 more [ERROR] -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException ``` **To Reproduce** Steps to reproduce the behavior: 1. Start the build ``mvn clean package -Pnative`` **Configuration** ``` quarkus.native.container-build=true quarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:20.0.0-java11 ``` **Environment** - Output of `uname -a` or `ver`: ``Microsoft Windows [Version 10.0.17134.1304]`` - Output of `java -version`: ``` openjdk version "11.0.6" 2020-01-14 LTS OpenJDK Runtime Environment Zulu11.37+17-CA (build 11.0.6+10-LTS) OpenJDK 64-Bit Server VM Zulu11.37+17-CA (build 11.0.6+10-LTS, mixed mode) ``` - GraalVM version (if different from Java): ``20.0.0-java11`` - Quarkus version or git rev: ``1.3.0.Final`` - Build tool (ie. output of `mvnw --version` or `gradlew --version`): ``` Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) Maven home: C:\\devtools\\apache-maven-3.6.3\\bin\\.. Java version: 11.0.6, vendor: Azul Systems, Inc., runtime: C:\\Program Files\\Zulu\\zulu-11 Default locale: de_DE, platform encoding: Cp1252 OS name: "windows 10", version: "10.0", arch: "amd64", family: "windows" ```

f75581c3ae7cd14165e3f63345d80ce0fb01392e

0582165ead93227cb7e7f3a69af7860052eb2fe4

https://github.com/quarkusio/quarkus/compare/f75581c3ae7cd14165e3f63345d80ce0fb01392e...0582165ead93227cb7e7f3a69af7860052eb2fe4

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java index 719874032cf..83a02c48afb 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java @@ -338,7 +338,8 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa if (exitCode != 0) { throw imageGenerationFailed(exitCode, command); } - if (IS_WINDOWS) { //once image is generated it gets added .exe on windows + if (IS_WINDOWS && !(nativeConfig.containerRuntime.isPresent() || nativeConfig.containerBuild)) { + //once image is generated it gets added .exe on Windows executableName = executableName + ".exe"; } Path generatedImage = outputDir.resolve(executableName);

['core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.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/7947/2923

quarkusio

quarkus

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

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

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

fixes

Class generation build items are screwy

We have a `GeneratedClassBuildItem` which accepts a class name, byte array, and a flag to indicate what "kind" of class it is. At the same time, we have a pattern for generating classes, particularly with Gizmo: consume the `ClassOutputBuildItem` and then feed it to Gizmo and have it write the class directly to the `ClassOutput`. On top of all this, we have two different kinds of `ClassOutput`. The build item is not ideal because to use it with Gizmo, you have to create your own `ClassOutput` (the Gizmo one) and have it produce the generated classes (i.e. you can't just return a `GeneratedClassBuildItem` unless you stash the object somewhere). The common Gizmo pattern of consuming the `ClassOutputBuildItem` is not ideal because nothing is produced - so the build step won't run unless you artificially produce something. We should make the `ClassOutputBuildItem` work nicely with Gizmo and non-Gizmo usages. Maybe Gizmo should emit classes to an array by default, or maybe `ClassOutputBuildItem` should accept a supplier for class bytes that the Gizmo class factory can produce (if we're worried about heap usage). Maybe Gizmo's `ClassOutput` API should be replaced by a pull API like `ClassCreator.write(OutputStream)` or `ClassCreator.getBytes()` (or both).

a0fd85a6f10f453100335e174d5f684210ccc925

955547ea092c5214928a56c149e70595fed51ae0

https://github.com/quarkusio/quarkus/compare/a0fd85a6f10f453100335e174d5f684210ccc925...955547ea092c5214928a56c149e70595fed51ae0

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ClassOutput.java b/core/deployment/src/main/java/io/quarkus/deployment/ClassOutput.java deleted file mode 100644 index daf3f819b06..00000000000 --- a/core/deployment/src/main/java/io/quarkus/deployment/ClassOutput.java +++ /dev/null @@ -1,28 +0,0 @@ -package io.quarkus.deployment; - -import java.io.IOException; -import java.io.Writer; - -import io.quarkus.gizmo.NullWriter; - -/** - * Interface that represents a target for generated bytecode - */ -public interface ClassOutput { - - /** - * Writes some generate bytecode to an output target - * - * @param className The class name - * @param data The bytecode bytes - * @throws IOException If the class cannot be written - */ - void writeClass(boolean applicationClass, String className, byte[] data) throws IOException; - - void writeResource(String name, byte[] data) throws IOException; - - default Writer writeSource(String className) { - return NullWriter.INSTANCE; - } - -}

['core/deployment/src/main/java/io/quarkus/deployment/ClassOutput.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/9936/9847

quarkusio

quarkus

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

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

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

fixes

http access log attributes do not work

certain http access log attributes do not work, namely %t, %D always getting "-" for those attributes in the log. for the following pattern: %t "%r" %s %b %D "%{i,Referer}" "%{i,User-Agent}" getting the following line in the log file: - "GET /_health HTTP_1_1" 200 2 - "-" "curl/7.58.0" **Expected behavior** %t - Date and time, in Common Log Format format %D - Time taken to process the request, in millis **Actual behavior** always getting dashes ("-") for those attributes **To Reproduce** see the Configuration section. **Configuration** ```properties quarkus.http.access-log.enabled = true quarkus.http.access-log.pattern = %t "%r" %s %b %D "%{i,Referer}" "%{i,User-Agent}" quarkus.http.access-log.log-to-file = true quarkus.http.access-log.base-file-name = http-access quarkus.http.access-log.log-directory = /var/log/quarkus/http ``` **Environment (please complete the following information):** x86_64 GNU/Linux OpenJDK Runtime Environment Corretto-11.0.7.10.1 (build 11.0.7+10-LTS) Quarkus 1.5.0 Apache Maven 3.6.3

1d456915dfc1a975ad797de9cef9ebd4843f9dcb

465ca693bd6d7b53a01ade11fcaef7737ecc3671

https://github.com/quarkusio/quarkus/compare/1d456915dfc1a975ad797de9cef9ebd4843f9dcb...465ca693bd6d7b53a01ade11fcaef7737ecc3671

diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/attribute/DateTimeAttribute.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/attribute/DateTimeAttribute.java index e8660cbdec8..ade164d92f8 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/attribute/DateTimeAttribute.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/attribute/DateTimeAttribute.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.http.runtime.attribute; -import java.time.LocalDateTime; import java.time.ZoneId; +import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.Locale; @@ -41,7 +41,7 @@ public DateTimeAttribute(final String dateFormat, final String timezone) { @Override public String readAttribute(final RoutingContext exchange) { - return formatter.format(LocalDateTime.now()); + return formatter.format(ZonedDateTime.now()); } @Override diff --git a/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/attribute/DateTimeAttributeTest.java b/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/attribute/DateTimeAttributeTest.java index 1b2dd007b2d..1c2359b768d 100644 --- a/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/attribute/DateTimeAttributeTest.java +++ b/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/attribute/DateTimeAttributeTest.java @@ -5,6 +5,7 @@ import java.text.SimpleDateFormat; import java.util.Date; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class DateTimeAttributeTest { @@ -15,4 +16,13 @@ void shouldReadAttribute() { DateTimeAttribute dta = new DateTimeAttribute("dd/MM/yyyy"); assertThat(dta.readAttribute(null)).isEqualTo(sdf.format(new Date())); } + + @Test + void testDefaultDateFormat() { + final ExchangeAttribute attribute = new DateTimeAttribute.Builder().build(DateTimeAttribute.DATE_TIME_SHORT); + final String value = attribute.readAttribute(null); + Assertions.assertNotNull(value, DateTimeAttribute.DATE_TIME_SHORT + " attribute returned null"); + Assertions.assertFalse(value.trim().isEmpty(), DateTimeAttribute.DATE_TIME_SHORT + " attribute returned empty value"); + } + }

['extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/attribute/DateTimeAttributeTest.java', 'extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/attribute/DateTimeAttribute.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/10016/10015

quarkusio

quarkus

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

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

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

fixes

Hibernate Reactive: sessions are not closed, connections leak

ATM, we have the following method to produce `Stage.Session` and `Mutiny.Session` tied to the request scope: ```java package io.quarkus.hibernate.reactive.runtime; import java.util.concurrent.CompletionStage; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; import javax.inject.Inject; import org.hibernate.reactive.mutiny.Mutiny; import org.hibernate.reactive.stage.Stage; import io.quarkus.arc.DefaultBean; import io.smallrye.mutiny.Uni; @ApplicationScoped public class ReactiveSessionProducer { @Inject private Stage.SessionFactory reactiveSessionFactory; @Inject private Mutiny.SessionFactory mutinySessionFactory; @Produces @RequestScoped @DefaultBean public CompletionStage<Stage.Session> stageSession() { return reactiveSessionFactory.openSession(); } @Produces @RequestScoped @DefaultBean public Uni<Mutiny.Session> mutinySession() { return mutinySessionFactory.openSession(); } public void disposeStageSession(@Disposes CompletionStage<Stage.Session> reactiveSession) { reactiveSession.whenComplete((s, t) -> { if (s != null) s.close(); }); } public void disposeMutinySession(@Disposes Uni<Mutiny.Session> reactiveSession) { // TODO: @AGG this is not working, need to check w/ Clement to figure out the proper way reactiveSession.on().termination((session, ex, cancelled) -> { if (session != null) session.close(); }); } } ``` Now, the problem is that we're tying a `CompletionStage<Stage.Session>` (and respectively same for Mutiny) to the request, which is a promise of a session. The `disposeStageSession` cannot work, because `CompletionStage` are immutable, and the value returned by `reactiveSession.whenComplete()` is never used, so this `s.close()` will never be called. A similar issue exists for `disposeMutinySession` except it's possible that the `Uni<Mutiny.Session>` opens a new session for each call to `subscribe` (unless `cache()` is called on it, I don't know if it is) whereas for `CompletionStage` it's eager and will have a single session by design. We can't do `whenComplete`/`on().termination` in `stageSession`/`mutinySession` either because that would close the session before we return it to the user. To be frank, ATM I don't know how to register a way to auto-close what is lazily obtained by a CS/Uni and tied to the request scope.

1efbafe938626577a3cde99c430e09d2f58ab78c

67a3593102f81092315ed5b137ffbeba1f0d9828

https://github.com/quarkusio/quarkus/compare/1efbafe938626577a3cde99c430e09d2f58ab78c...67a3593102f81092315ed5b137ffbeba1f0d9828

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 181d97d9d3b..6814c3e5d2a 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 @@ -34,7 +34,7 @@ public CompletionStage<Stage.Session> stageSession() { @RequestScoped @DefaultBean public Uni<Mutiny.Session> mutinySession() { - return mutinySessionFactory.openSession(); + return mutinySessionFactory.openSession().cache(); } public void disposeStageSession(@Disposes CompletionStage<Stage.Session> reactiveSession) { @@ -45,11 +45,7 @@ public void disposeStageSession(@Disposes CompletionStage<Stage.Session> reactiv } public void disposeMutinySession(@Disposes Uni<Mutiny.Session> reactiveSession) { - // TODO: @AGG this is not working, need to check w/ Clement to figure out the proper way - reactiveSession.on().termination((session, ex, cancelled) -> { - if (session != null) - session.close(); - }); + reactiveSession.subscribe().with(Mutiny.Session::close); } } 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 b71bfb7ae88..ec058f66f25 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 @@ -132,9 +132,8 @@ public Uni<String> reactiveUpdate() { } private Uni<RowSet<Row>> populateDB() { - return db2Pool.getConnection() - .flatMap(c -> c.preparedQuery("DELETE FROM Pig").execute().map(junk -> c)) - .flatMap(c -> c.preparedQuery("INSERT INTO Pig (id, name) VALUES (5, 'Aloi')").execute()); + return db2Pool.query("DELETE FROM Pig").execute() + .flatMap(junk -> db2Pool.preparedQuery("INSERT INTO Pig (id, name) VALUES (5, 'Aloi')").execute()); } private Uni<String> selectNameFromId(Integer id) { 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 4e1695a16e0..54b589b62c4 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 @@ -132,9 +132,8 @@ public Uni<String> reactiveUpdate() { } private Uni<RowSet<Row>> populateDB() { - return mysqlPool.getConnection() - .flatMap(c -> c.preparedQuery("DELETE FROM Pig").execute().map(junk -> c)) - .flatMap(c -> c.preparedQuery("INSERT INTO Pig (id, name) VALUES (5, 'Aloi')").execute()); + return mysqlPool.query("DELETE FROM Pig").execute() + .flatMap(junk -> mysqlPool.preparedQuery("INSERT INTO Pig (id, name) VALUES (5, 'Aloi')").execute()); } private Uni<String> selectNameFromId(Integer id) { diff --git a/integration-tests/hibernate-reactive/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java b/integration-tests/hibernate-reactive/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java index 147cc835cd3..a39039a542f 100644 --- a/integration-tests/hibernate-reactive/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java +++ b/integration-tests/hibernate-reactive/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java @@ -132,9 +132,8 @@ public Uni<String> reactiveUpdate() { } private Uni<RowSet<Row>> populateDB() { - return pgPool.getConnection() - .flatMap(c -> c.preparedQuery("DELETE FROM Pig").execute().map(junk -> c)) - .flatMap(c -> c.preparedQuery("INSERT INTO Pig (id, name) VALUES (5, 'Aloi')").execute()); + return pgPool.query("DELETE FROM Pig").execute() + .flatMap(junk -> pgPool.preparedQuery("INSERT INTO Pig (id, name) VALUES (5, 'Aloi')").execute()); } private Uni<String> selectNameFromId(Integer id) {

['integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java', 'integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java', 'integration-tests/hibernate-reactive/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java', 'extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.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/11513/11470

quarkusio

quarkus

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

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

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

fixes

Custom settings.xml is not honored by Quarkus (1.3, 1.7) when the path is relative

Custom settings.xml is not honored by Quarkus when the path is relative. Workaround is to set absolute path to settings.xml. Spotted that when was trying to run Quarkus QS again released productized bit on https://maven.repository.redhat.com/ga Bits got downloaded but test execution printed "Downloading from central: https://repo.maven.apache.org/maven2/com/redhat/quarkus/quarkus-universe-bom/1.3.4.Final-redhat-00004/quarkus-universe-bom-1.3.4.Final-redhat-00004.pom" Quarkus implements own handling related to maven artifacts, there is probably issue in Quarkus bootstrap resolver. I can't say if the problem is related to just 1.3 series or this is in 1.7 as upstream bits are always in central. @aloubyansky this is probably for you. **Reproducer** ``` git clone --branch 1.3.4.Final https://github.com/quarkusio/quarkus-quickstarts.git code settings.xml ## see bellow mvn -s settings.xml -f quarkus-quickstarts/pom.xml -pl getting-started clean test \\ -Dquarkus.platform.group-id=com.redhat.quarkus -Dquarkus.platform.artifact-id=quarkus-universe-bom \\ -Dquarkus.platform.version=1.3.4.Final-redhat-00004 -Dquarkus-plugin.version=1.3.4.Final-redhat-00004 \\ -Dmaven.repo.local=$PWD/local-repo ``` **Error:** ``` [INFO] Running org.acme.getting.started.GreetingResourceTest Downloading from central: https://repo.maven.apache.org/maven2/com/redhat/quarkus/quarkus-universe-bom/1.3.4.Final-redhat-00004/quarkus-universe-bom-1.3.4.Final-redhat-00004.pom [ERROR] Tests run: 2, Failures: 0, Errors: 1, Skipped: 1, Time elapsed: 0.875 s <<< FAILURE! - in org.acme.getting.started.GreetingResourceTest [ERROR] testHelloEndpoint Time elapsed: 0.013 s <<< ERROR! java.lang.RuntimeException: io.quarkus.bootstrap.BootstrapException: Failed to create the application model for org.acme:getting-started::jar:1.0-SNAPSHOT Caused by: io.quarkus.bootstrap.BootstrapException: Failed to create the application model for org.acme:getting-started::jar:1.0-SNAPSHOT Caused by: io.quarkus.bootstrap.resolver.AppModelResolverException: Failed to read descriptor of org.acme:getting-started:jar:1.0-SNAPSHOT Caused by: org.eclipse.aether.resolution.ArtifactDescriptorException: Failed to read artifact descriptor for org.acme:getting-started:jar:1.0-SNAPSHOT Caused by: org.apache.maven.model.resolution.UnresolvableModelException: Could not find artifact com.redhat.quarkus:quarkus-universe-bom:pom:1.3.4.Final-redhat-00004 in central (https://repo.maven.apache.org/maven2) Caused by: org.eclipse.aether.resolution.ArtifactResolutionException: Could not find artifact com.redhat.quarkus:quarkus-universe-bom:pom:1.3.4.Final-redhat-00004 in central (https://repo.maven.apache.org/maven2) Caused by: org.eclipse.aether.transfer.ArtifactNotFoundException: Could not find artifact com.redhat.quarkus:quarkus-universe-bom:pom:1.3.4.Final-redhat-00004 in central (https://repo.maven.apache.org/maven2) ``` **settings.xml** ```xml <?xml version="1.0" encoding="UTF-8" standalone="no"?> <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> <localRepository/> <profiles> <profile> <id>rh</id> <repositories> <repository> <id>red-hat-enterprise-maven-repository</id> <url>https://maven.repository.redhat.com/ga/</url> <releases> <enabled>true</enabled> </releases> <snapshots> <enabled>false</enabled> </snapshots> </repository> </repositories> <pluginRepositories> <pluginRepository> <id>red-hat-enterprise-maven-repository</id> <url>https://maven.repository.redhat.com/ga/</url> <releases> <enabled>true</enabled> </releases> <snapshots> <enabled>false</enabled> </snapshots> </pluginRepository> </pluginRepositories> </profile> </profiles> <activeProfiles> <activeProfile>rh</activeProfile> </activeProfiles> </settings> ``` **Workaround** `mvn -s settings.xml` => `mvn -s $PWD/settings.xml`

eb015864ba85f90a4d2ca320257236dd4bc8a398

00352c14ad03d34bd60258f418166245114de2ce

https://github.com/quarkusio/quarkus/compare/eb015864ba85f90a4d2ca320257236dd4bc8a398...00352c14ad03d34bd60258f418166245114de2ce

diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java index e055581cbd6..dcea225818d 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java @@ -147,20 +147,7 @@ public BootstrapMavenContext(BootstrapMavenContextConfig<?> config) currentProject = resolveCurrentProject(); this.workspace = currentProject == null ? null : currentProject.getWorkspace(); } - userSettings = config.userSettings == null - ? resolveSettingsFile(getCliOptions().getOptionValue(BootstrapMavenOptions.ALTERNATE_USER_SETTINGS), - () -> { - final String quarkusMavenSettings = PropertyUtils.getProperty(MAVEN_SETTINGS); - return quarkusMavenSettings == null ? new File(userMavenConfigurationHome, SETTINGS_XML) - : new File(quarkusMavenSettings); - }) - : config.userSettings; - globalSettings = resolveSettingsFile(getCliOptions().getOptionValue(BootstrapMavenOptions.ALTERNATE_GLOBAL_SETTINGS), - () -> { - final String envM2Home = System.getenv(MAVEN_HOME); - return new File(PropertyUtils.getProperty(MAVEN_DOT_HOME, envM2Home != null ? envM2Home : ""), - "conf/settings.xml"); - }); + userSettings = config.userSettings; } public AppArtifact getCurrentProjectArtifact(String extension) throws BootstrapMavenException { @@ -188,11 +175,27 @@ public BootstrapMavenOptions getCliOptions() { } public File getUserSettings() { - return userSettings; + return userSettings == null + ? userSettings = resolveSettingsFile( + getCliOptions().getOptionValue(BootstrapMavenOptions.ALTERNATE_USER_SETTINGS), + () -> { + final String quarkusMavenSettings = PropertyUtils.getProperty(MAVEN_SETTINGS); + return quarkusMavenSettings == null ? new File(userMavenConfigurationHome, SETTINGS_XML) + : new File(quarkusMavenSettings); + }) + : userSettings; } public File getGlobalSettings() { - return globalSettings; + return globalSettings == null + ? globalSettings = resolveSettingsFile( + getCliOptions().getOptionValue(BootstrapMavenOptions.ALTERNATE_GLOBAL_SETTINGS), + () -> { + final String envM2Home = System.getenv(MAVEN_HOME); + return new File(PropertyUtils.getProperty(MAVEN_DOT_HOME, envM2Home != null ? envM2Home : ""), + "conf/settings.xml"); + }) + : globalSettings; } public boolean isOffline() throws BootstrapMavenException { @@ -270,27 +273,43 @@ public static String resolveLocalRepo(Settings settings) { return localRepo == null ? new File(userMavenConfigurationHome, "repository").getAbsolutePath() : localRepo; } - private static File resolveSettingsFile(String settingsArg, Supplier<File> supplier) { + private File resolveSettingsFile(String settingsArg, Supplier<File> supplier) { File userSettings; if (settingsArg != null) { userSettings = new File(settingsArg); if (userSettings.exists()) { return userSettings; } - String base = System.getenv("MAVEN_PROJECTBASEDIR"); // Root project base dir - if (base != null) { - userSettings = new File(base, settingsArg); - if (userSettings.exists()) { - return userSettings; - } + if (userSettings.isAbsolute()) { + return null; } - base = PropertyUtils.getProperty(BASEDIR); // current module project base dir - if (base != null) { - userSettings = new File(base, settingsArg); - if (userSettings.exists()) { - return userSettings; + + // in case the settings path is a relative one we check whether the pom path is also a relative one + // in which case we can resolve the settings path relative to the project directory + // otherwise, we don't have a clue what the settings path is relative to + String alternatePomDir = getCliOptions().getOptionValue(BootstrapMavenOptions.ALTERNATE_POM_FILE); + if (alternatePomDir != null) { + File tmp = new File(alternatePomDir); + if (tmp.isAbsolute()) { + alternatePomDir = null; + } else { + if (!tmp.isDirectory()) { + tmp = tmp.getParentFile(); + } + alternatePomDir = tmp.toString(); } } + + // Root project base dir + userSettings = resolveSettingsFile(settingsArg, alternatePomDir, System.getenv("MAVEN_PROJECTBASEDIR")); + if (userSettings != null) { + return userSettings; + } + // current module project base dir + userSettings = resolveSettingsFile(settingsArg, alternatePomDir, PropertyUtils.getProperty(BASEDIR)); + if (userSettings != null) { + return userSettings; + } userSettings = new File(PropertyUtils.getUserHome(), settingsArg); if (userSettings.exists()) { return userSettings; @@ -300,6 +319,25 @@ private static File resolveSettingsFile(String settingsArg, Supplier<File> suppl return userSettings.exists() ? userSettings : null; } + private File resolveSettingsFile(String settingsArg, String alternatePomDir, String projectBaseDir) { + if (projectBaseDir == null) { + return null; + } + File userSettings; + if (alternatePomDir != null && projectBaseDir.endsWith(alternatePomDir)) { + userSettings = new File(projectBaseDir.substring(0, projectBaseDir.length() - alternatePomDir.length()), + settingsArg); + if (userSettings.exists()) { + return userSettings; + } + } + userSettings = new File(projectBaseDir, settingsArg); + if (userSettings.exists()) { + return userSettings; + } + return null; + } + private DefaultRepositorySystemSession newRepositorySystemSession() throws BootstrapMavenException { final DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); final Settings settings = getEffectiveSettings();

['independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.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/11743/11736

quarkusio

quarkus

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

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

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

fixes

Active connection to MongoDB required for fresh project based on Quarkus master, wasn't needed for 1.7.0.Final and prior

Active connection to MongoDB required for fresh project based on master, wasn't needed for 1.7.0.Final and prior. Getting NPE from SmallRyeMetricsRecorder.registerMetrics(SmallRyeMetricsRecorder.java:217) Reproducer: - build Quarkus master - clone https://github.com/quarkus-qe/beefy-scenarios - run `mvn clean verify -pl 002-quarkus-all-extensions/` `mvn clean verify -pl 002-quarkus-all-extensions/ -Dquarkus.platform.version=1.7.0.Final -Dquarkus-plugin.version=1.7.0.Final` passes Stacktrace (commented out io.quarkus:quarkus-logging-json tependency in 002-quarkus-all-extensions/pom.xml): ``` 2020-08-31 10:15:01,619 INFO [org.mon.dri.cluster] (cluster-ClusterId{value='5f4cb1859520ed1f46c9241c', description='null'}-127.0.0.1:27017) Exception in monitor thread while connecting to server 127.0.0.1:27017: com.mongodb.MongoSocketOpenException: Exception opening socket at com.mongodb.internal.connection.SocketStream.open(SocketStream.java:70) at com.mongodb.internal.connection.InternalStreamConnection.open(InternalStreamConnection.java:143) at com.mongodb.internal.connection.DefaultServerMonitor$ServerMonitorRunnable.lookupServerDescription(DefaultServerMonitor.java:188) at com.mongodb.internal.connection.DefaultServerMonitor$ServerMonitorRunnable.run(DefaultServerMonitor.java:144) at java.base/java.lang.Thread.run(Thread.java:834) Caused by: java.net.ConnectException: Connection refused (Connection refused) at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:399) at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:242) at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:224) at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:403) at java.base/java.net.Socket.connect(Socket.java:609) at com.mongodb.internal.connection.SocketStreamHelper.initialize(SocketStreamHelper.java:78) at com.mongodb.internal.connection.SocketStream.initializeSocket(SocketStream.java:79) at com.mongodb.internal.connection.SocketStream.open(SocketStream.java:65) ... 4 more 2020-08-31 10:15:01,629 INFO [org.mon.dri.cluster] (cluster-ClusterId{value='5f4cb1859520ed1f46c9241d', description='null'}-127.0.0.1:27017) Exception in monitor thread while connecting to server 127.0.0.1:27017: com.mongodb.MongoSocketOpenException: Exception opening socket at com.mongodb.internal.connection.AsynchronousSocketChannelStream$OpenCompletionHandler.failed(AsynchronousSocketChannelStream.java:124) at java.base/sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:129) at java.base/sun.nio.ch.UnixAsynchronousSocketChannelImpl.finishConnect(UnixAsynchronousSocketChannelImpl.java:283) at java.base/sun.nio.ch.UnixAsynchronousSocketChannelImpl.finish(UnixAsynchronousSocketChannelImpl.java:198) at java.base/sun.nio.ch.UnixAsynchronousSocketChannelImpl.onEvent(UnixAsynchronousSocketChannelImpl.java:213) at java.base/sun.nio.ch.KQueuePort$EventHandlerTask.run(KQueuePort.java:312) at java.base/sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) at java.base/java.lang.Thread.run(Thread.java:834) Caused by: java.net.ConnectException: Connection refused at java.base/sun.nio.ch.UnixAsynchronousSocketChannelImpl.checkConnect(Native Method) at java.base/sun.nio.ch.UnixAsynchronousSocketChannelImpl.finishConnect(UnixAsynchronousSocketChannelImpl.java:252) ... 7 more 2020-08-31 10:15:01,677 ERROR [io.qua.application] (main) Failed to start application (with profile test): java.lang.NullPointerException at io.quarkus.smallrye.metrics.runtime.SmallRyeMetricsRecorder.registerMetrics(SmallRyeMetricsRecorder.java:217) at io.quarkus.deployment.steps.SmallRyeMetricsProcessor$registerRuntimeExtensionMetrics-632673255.deploy_0(SmallRyeMetricsProcessor$registerRuntimeExtensionMetrics-632673255.zig:74) at io.quarkus.deployment.steps.SmallRyeMetricsProcessor$registerRuntimeExtensionMetrics-632673255.deploy(SmallRyeMetricsProcessor$registerRuntimeExtensionMetrics-632673255.zig:40) at io.quarkus.runner.ApplicationImpl.doStart(ApplicationImpl.zig:1035) at io.quarkus.runtime.Application.start(Application.java:90) 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.run(StartupActionImpl.java:212) ```

4e0ed2e2fbfe4a5c83c889090d4d50c2ef5004a2

8775942525c833aa8975e914921a73f1443b0759

https://github.com/quarkusio/quarkus/compare/4e0ed2e2fbfe4a5c83c889090d4d50c2ef5004a2...8775942525c833aa8975e914921a73f1443b0759

diff --git a/extensions/neo4j/deployment/src/main/java/io/quarkus/neo4j/deployment/Neo4jDriverProcessor.java b/extensions/neo4j/deployment/src/main/java/io/quarkus/neo4j/deployment/Neo4jDriverProcessor.java index ccd68171859..ea9e3929f26 100644 --- a/extensions/neo4j/deployment/src/main/java/io/quarkus/neo4j/deployment/Neo4jDriverProcessor.java +++ b/extensions/neo4j/deployment/src/main/java/io/quarkus/neo4j/deployment/Neo4jDriverProcessor.java @@ -61,9 +61,10 @@ void metrics(Neo4jConfiguration configuration, Neo4jDriverRecorder recorder, BuildProducer<MetricsFactoryConsumerBuildItem> metrics) { Consumer<MetricsFactory> metricsFactoryConsumer = recorder.registerMetrics(configuration); - if (metricsFactoryConsumer != null) { - metrics.produce(new MetricsFactoryConsumerBuildItem(metricsFactoryConsumer)); - } + // If metrics for neo4j are disabled, the returned consumer will be null, + // but in a processor we can't know that (it's controlled by a runtime config property) + // so the BuildItem might contain null and in that case will be ignored by the metrics recorder + metrics.produce(new MetricsFactoryConsumerBuildItem(metricsFactoryConsumer)); } } diff --git a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java index e9a16c7a8b1..3f546c26035 100644 --- a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java +++ b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java @@ -214,7 +214,9 @@ public void registerMetric(MetricRegistry.Type scope, } public void registerMetrics(Consumer<MetricsFactory> consumer) { - consumer.accept(factory); + if (consumer != null) { + consumer.accept(factory); + } } public void createRegistries(BeanContainer container) {

['extensions/neo4j/deployment/src/main/java/io/quarkus/neo4j/deployment/Neo4jDriverProcessor.java', 'extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.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/11716/11707

quarkusio

quarkus

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

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

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

fixes

QuarkusClassLoader.getResourceAsStream does not work with directories in quarkus:dev

**Describe the bug** When your try to read a directory from the resources-folder using Thread.currentThread().getContextClassLoader().getResourceAsStream("test"), an IOException occurs. The directory can not be read as an InputStream, because the class Loaders uses Files.readAllBytes, which does not work with directories. **Expected behavior** According to the Java Spec, getResourceAsStream("test") should the same as getResource("test").openStream(). **Actual behavior** When I use getResource("test").openStream() the InputStream is returned properly, but getResourceAsStream("test"). The follwing Exeception occurs ``` 2020-08-28 11:55:57,017 ERROR [io.qua.ver.htt.run.QuarkusErrorHandler] (executor-thread-1) HTTP Request to /load/1 failed, error id: 4ca207b6-2f6f-4ad6-89c8-efe7959e90d3-3: org.jboss.resteasy.spi.UnhandledException: java.lang.RuntimeException: Unable to read /Users/christianradow/IntelliJ/classloader-test/target/classes/test at org.jboss.resteasy.core.ExceptionHandler.handleApplicationException(ExceptionHandler.java:106) at org.jboss.resteasy.core.ExceptionHandler.handleException(ExceptionHandler.java:372) at org.jboss.resteasy.core.SynchronousDispatcher.writeException(SynchronousDispatcher.java:216) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:515) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$invoke$4(SynchronousDispatcher.java:259) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$preprocess$0(SynchronousDispatcher.java:160) at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:364) at org.jboss.resteasy.core.SynchronousDispatcher.preprocess(SynchronousDispatcher.java:163) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:245) at io.quarkus.resteasy.runtime.standalone.RequestDispatcher.service(RequestDispatcher.java:73) at io.quarkus.resteasy.runtime.standalone.VertxRequestHandler.dispatch(VertxRequestHandler.java:132) at io.quarkus.resteasy.runtime.standalone.VertxRequestHandler.access$000(VertxRequestHandler.java:37) at io.quarkus.resteasy.runtime.standalone.VertxRequestHandler$1.run(VertxRequestHandler.java:94) at io.quarkus.runtime.CleanableExecutor$CleaningRunnable.run(CleanableExecutor.java:231) at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2046) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1578) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1452) at org.jboss.threads.DelegatingRunnable.run(DelegatingRunnable.java:29) at org.jboss.threads.ThreadLocalResettingRunnable.run(ThreadLocalResettingRunnable.java:29) at java.base/java.lang.Thread.run(Thread.java:834) at org.jboss.threads.JBossThread.run(JBossThread.java:479) Caused by: java.lang.RuntimeException: Unable to read /Users/christianradow/IntelliJ/classloader-test/target/classes/test at io.quarkus.bootstrap.classloading.DirectoryClassPathElement$1.getData(DirectoryClassPathElement.java:108) at io.quarkus.bootstrap.classloading.QuarkusClassLoader.getResourceAsStream(QuarkusClassLoader.java:337) at org.acme.quarkus.sample.ClassLoaderTestResource.testDirectory1(ClassLoaderTestResource.java:19) 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 org.jboss.resteasy.core.MethodInjectorImpl.invoke(MethodInjectorImpl.java:167) at org.jboss.resteasy.core.MethodInjectorImpl.invoke(MethodInjectorImpl.java:130) at org.jboss.resteasy.core.ResourceMethodInvoker.internalInvokeOnTarget(ResourceMethodInvoker.java:638) at org.jboss.resteasy.core.ResourceMethodInvoker.invokeOnTargetAfterFilter(ResourceMethodInvoker.java:504) at org.jboss.resteasy.core.ResourceMethodInvoker.lambda$invokeOnTarget$2(ResourceMethodInvoker.java:454) at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:364) at org.jboss.resteasy.core.ResourceMethodInvoker.invokeOnTarget(ResourceMethodInvoker.java:456) at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:417) at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:391) at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:68) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:488) ... 20 more Caused by: java.io.IOException: Is a directory at java.base/sun.nio.ch.FileDispatcherImpl.read0(Native Method) at java.base/sun.nio.ch.FileDispatcherImpl.read(FileDispatcherImpl.java:48) at java.base/sun.nio.ch.IOUtil.readIntoNativeBuffer(IOUtil.java:276) at java.base/sun.nio.ch.IOUtil.read(IOUtil.java:245) at java.base/sun.nio.ch.FileChannelImpl.read(FileChannelImpl.java:223) at java.base/sun.nio.ch.ChannelInputStream.read(ChannelInputStream.java:65) at java.base/sun.nio.ch.ChannelInputStream.read(ChannelInputStream.java:109) at java.base/sun.nio.ch.ChannelInputStream.read(ChannelInputStream.java:103) at java.base/java.nio.file.Files.read(Files.java:3158) at java.base/java.nio.file.Files.readAllBytes(Files.java:3212) at io.quarkus.bootstrap.classloading.DirectoryClassPathElement$1.getData(DirectoryClassPathElement.java:100) ... 37 more ``` **To Reproduce** Steps to reproduce the behavior: 1. Create a directory named test in the resources folder 2. Use the following Resource: ```java import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.io.IOException; import java.io.InputStream; @Path("/load") public class ClassLoaderTestResource { // Does not work using quarkus:dev @GET @Path("/1") @Produces(MediaType.TEXT_PLAIN) public String testDirectory1() { ClassLoader loader = Thread.currentThread().getContextClassLoader(); InputStream testResource = loader.getResourceAsStream("test"); return testResource.toString(); } // Works using quarkus:dev @GET @Path("/2") @Produces(MediaType.TEXT_PLAIN) public String testDirectory2() throws IOException { ClassLoader loader = Thread.currentThread().getContextClassLoader(); InputStream testResource = loader.getResource("test").openStream(); return testResource.toString(); } } ``` 3. Start the project using quarkus:dev 4. Test the /load/1 endpoint to reproduce the bug. **Configuration** ```properties # No additional config ``` **Environment (please complete the following information):** - tested on both Windows 10 and MacOS - Output of `java -version`: openjdk version "11.0.2" 2019-01-15 - Quarkus version or git rev: tested on multiple Versions from 1.3.1.Final to 1.7.1.Final - Build tool (ie. output of `mvnw --version` or `gradlew --version`): Apache Maven 3.6.3 **Additional context** The problem occurs because the directory is read using Files.readAllBytes(), which produces an IOException.

f585d9d8c00f235059942aa9f81b7ccea06297af

96de5bff1b568c1840d0bcb319db7072cb6bba4d

https://github.com/quarkusio/quarkus/compare/f585d9d8c00f235059942aa9f81b7ccea06297af...96de5bff1b568c1840d0bcb319db7072cb6bba4d

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java index 439e4ab8bbf..61dae72b5b6 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java @@ -323,6 +323,17 @@ public InputStream getResourceAsStream(String unsanitisedName) { for (ClassPathElement i : elements) { ClassPathResource res = i.getResource(name); if (res != null) { + if (res.isDirectory()) { + try { + return res.getUrl().openStream(); + } catch (IOException e) { + log.debug("Ignoring exception that occurred while opening a stream for resource " + unsanitisedName, + e); + // behave like how java.lang.ClassLoader#getResourceAsStream() behaves + // and don't propagate the exception + continue; + } + } return new ByteArrayInputStream(res.getData()); } } diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingResourceUrlTestCase.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingResourceUrlTestCase.java index d9d91d65aee..611d70bc06d 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingResourceUrlTestCase.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingResourceUrlTestCase.java @@ -4,6 +4,7 @@ import io.quarkus.bootstrap.classloading.JarClassPathElement; import io.quarkus.bootstrap.classloading.QuarkusClassLoader; import io.quarkus.bootstrap.util.IoUtils; +import java.io.InputStream; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; @@ -51,6 +52,36 @@ public void testUrlReturnedFromClassLoaderDirectory() throws Exception { } } + /** + * Test that {@link QuarkusClassLoader#getResourceAsStream(String)} returns a stream for directory + * resources + * + * @throws Exception + * @see <a href="https://github.com/quarkusio/quarkus/issues/11707"/> + */ + @Test + public void testResourceAsStreamForDirectory() throws Exception { + final JavaArchive jar = ShrinkWrap.create(JavaArchive.class) + .add(new StringAsset("a"), "a.txt") + .add(new StringAsset("b"), "b/b.txt"); + final Path tmpDir = Files.createTempDirectory("test"); + try { + jar.as(ExplodedExporter.class).exportExploded(tmpDir.toFile(), "tmpcltest"); + final ClassLoader cl = QuarkusClassLoader.builder("test", getClass().getClassLoader(), false) + .addElement(new DirectoryClassPathElement(tmpDir.resolve("tmpcltest"))) + .build(); + + try (final InputStream is = cl.getResourceAsStream("b/")) { + Assertions.assertNotNull(is, "InputStream is null for a directory resource"); + } + try (final InputStream is = cl.getResourceAsStream("b")) { + Assertions.assertNotNull(is, "InputStream is null for a directory resource"); + } + } finally { + IoUtils.recursiveDelete(tmpDir); + } + } + /** * URLClassLoader will return URL's that end with a / if the call to getResource ends with a / */

['independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java', 'independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingResourceUrlTestCase.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/11639/11617

quarkusio

quarkus

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

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

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

fix

Kafka Streams Bootstrap Servers Problem

**Describe the bug** Admin client can't establish the connection to bootstrap server. I'm sure that the host name is correct, when I use it in Kafka Messaging like mp.messaging.connector.smallrye-kafka.bootstrap.servers=my.host.name:9093 there are no problems. **Expected behavior** Admin client establishes the connection. **Actual behavior** Admin client can't establish the connection. Kafka Consumer Config logs: ... bootstrap.servers = [my.host.name/< unresolved >:9093] (Why < unresolved > ??? When I use the same server to mp.messaging, I don't have the < unresolved >) ... In Console can I see: ... Connection to node -1 (localhost/127.0.0.1:9093) could not be established. Broker may not be available. ... ERROR [io.qua.kaf.str.run.KafkaStreamsProducer] (pool-6-thread-1) Failed to get topic names from broker: java.util.concurrent.TimeoutException **Configuration** ```properties quarkus.kafka-streams.bootstrap-servers=my.host.name:9093 quarkus.kafka-streams.application-id=... quarkus.kafka-streams.topics=... kafka-streams.security.inter.broker.protocol=SSL kafka-streams.security.protocol=SSL kafka-streams.ssl.truststore.location=... kafka-streams.ssl.truststore.password=... kafka-streams.ssl.keystore.location=... kafka-streams.ssl.keystore.password=... kafka-streams.ssl.key.password=... kafka-streams.cache.max.bytes.buffering=10240 kafka-streams.commit.interval.ms=1000 kafka-streams.metadata.max.age.ms=500 kafka-streams.auto.offset.reset=earliest kafka-streams.metrics.recording.level=DEBUG ``` **Environment (please complete the following information):** - Output of `java -version`: openjdk version "14" 2020-03-17 OpenJDK Runtime Environment (build 14+36-1461) OpenJDK 64-Bit Server VM (build 14+36-1461, mixed mode, sharing) - Quarkus version or git rev: 1.7.0.Final

239a860252fccc3c38a05a07c300e7be0fc1bf4f

4a4f0bda4ef6e1eb1dfddb82f43773b25acac0a1

https://github.com/quarkusio/quarkus/compare/239a860252fccc3c38a05a07c300e7be0fc1bf4f...4a4f0bda4ef6e1eb1dfddb82f43773b25acac0a1

diff --git a/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/DefaultConsulConfigGateway.java b/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/DefaultConsulConfigGateway.java index b2482d48ad8..bf60e6da0aa 100644 --- a/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/DefaultConsulConfigGateway.java +++ b/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/DefaultConsulConfigGateway.java @@ -117,7 +117,7 @@ public Optional<Response> getValue(String key) throws IOException { } try (CloseableHttpClient client = httpClientBuilder.build()) { String finalUri = (consulConfig.agent.useHttps ? "https" : "http") + "://" - + consulConfig.agent.hostPort.getHostName() + ":" + consulConfig.agent.hostPort.getPort() + + consulConfig.agent.hostPort.getHostString() + ":" + consulConfig.agent.hostPort.getPort() + "/v1/kv/" + key; HttpGet request = new HttpGet(finalUri); diff --git a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/JaegerDeploymentRecorder.java b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/JaegerDeploymentRecorder.java index 6bb6abb43a1..9be5af77ecc 100644 --- a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/JaegerDeploymentRecorder.java +++ b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/JaegerDeploymentRecorder.java @@ -60,7 +60,7 @@ private void initTracerConfig(JaegerConfig jaeger) { initTracerProperty("JAEGER_AUTH_TOKEN", jaeger.authToken, token -> token); initTracerProperty("JAEGER_USER", jaeger.user, user -> user); initTracerProperty("JAEGER_PASSWORD", jaeger.password, pw -> pw); - initTracerProperty("JAEGER_AGENT_HOST", jaeger.agentHostPort, address -> address.getHostName()); + initTracerProperty("JAEGER_AGENT_HOST", jaeger.agentHostPort, address -> address.getHostString()); initTracerProperty("JAEGER_AGENT_PORT", jaeger.agentHostPort, address -> String.valueOf(address.getPort())); initTracerProperty("JAEGER_REPORTER_LOG_SPANS", jaeger.reporterLogSpans, log -> log.toString()); initTracerProperty("JAEGER_REPORTER_MAX_QUEUE_SIZE", jaeger.reporterMaxQueueSize, size -> size.toString()); 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 42cb3cd499b..1037b6dc61f 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 @@ -254,10 +254,14 @@ private static <T> void setProperty(Optional<T> property, Properties properties, private static String asString(List<InetSocketAddress> addresses) { return addresses.stream() - .map(InetSocketAddress::toString) + .map(KafkaStreamsProducer::toHostPort) .collect(Collectors.joining(",")); } + private static String toHostPort(InetSocketAddress inetSocketAddress) { + return inetSocketAddress.getHostString() + ":" + inetSocketAddress.getPort(); + } + private static void waitForTopicsToBeCreated(Admin adminClient, Collection<String> topicsToAwait) throws InterruptedException { Set<String> lastMissingTopics = null;

['extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/DefaultConsulConfigGateway.java', 'extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/JaegerDeploymentRecorder.java', 'extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.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/11625/11612

quarkusio

quarkus

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

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

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

fixes

devmode: Quarkus 1.7.0.Final + grpc + smallrye health gRPC Server is DOWN

**Describe the bug** After generating a project from code.quarkus.io with grpc and smallrye health extensions, then following the quarkus gRPC quickstart guide, the healthcheck endpoint always reports gRPC server as DOWN despite the endpoint successfully responding to calls. **Expected behavior** Healthcheck should report UP if the service is available. ``` $ grpcurl -plaintext -proto=src/main/proto/helloworld.proto localhost:9000 helloworld.Greeter.SayHello { "message": "Hello " } ``` **Actual behavior** Healthcheck reports DOWN ``` { "status": "DOWN", "checks": [ { "name": "gRPC Server", "status": "DOWN" } ] } ``` **To Reproduce** Reproduction repo: https://github.com/jeffhubLR/quarkus-1.7-grpc-smallrye-health Steps to reproduce the behavior: 1. Generate project from code.quarkus.io, selecting grpc and smallrye health 2. Follow quarkus grpc quickstart, creating proto and .java file 3. Start up service 4. Find that calls to the grpc service succeed, while the health endpoint still reports DOWN **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Darwin USMACEA094JHUBB 19.5.0 Darwin Kernel Version 19.5.0: Tue May 26 20:41:44 PDT 2020; root:xnu-6153.121.2~2/RELEASE_X86_64 x86_64 - Output of `java -version`: openjdk version "11.0.8" 2020-07-14 OpenJDK Runtime Environment AdoptOpenJDK (build 11.0.8+10) OpenJDK 64-Bit Server VM AdoptOpenJDK (build 11.0.8+10, mixed mode) - GraalVM version (if different from Java): - Quarkus version or git rev: 1.7.0.Final - Build tool (ie. output of `mvnw --version` or `gradlew --version`): Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) Maven home: /usr/local/Cellar/maven/3.6.3_1/libexec Java version: 11.0.8, vendor: AdoptOpenJDK, runtime: /Library/Java/JavaVirtualMachines/adoptopenjdk-11.0.8.jdk/Contents/Home Default locale: en_US, platform encoding: UTF-8 OS name: "mac os x", version: "10.15.5", arch: "x86_64", family: "mac"

8bf700dbb0144429ff227c544ea947fb2de3fe45

88668a1277966874deec098b9578b5c45f239fd1

https://github.com/quarkusio/quarkus/compare/8bf700dbb0144429ff227c544ea947fb2de3fe45...88668a1277966874deec098b9578b5c45f239fd1

diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java index 5ca99a60e32..77b64699480 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java @@ -95,24 +95,7 @@ private void prodStart(GrpcContainer grpcContainer, Vertx vertx, GrpcServerConfi if (result.failed()) { startResult.completeExceptionally(result.cause()); } else { - grpcContainer.getHealthStorage().stream().forEach(new Consumer<GrpcHealthStorage>() { //NOSONAR - @Override - public void accept(GrpcHealthStorage storage) { - storage.setStatus(GrpcHealthStorage.DEFAULT_SERVICE_NAME, - HealthOuterClass.HealthCheckResponse.ServingStatus.SERVING); - grpcContainer.getServices().forEach( - new Consumer<BindableService>() { // NOSONAR - @Override - public void accept(BindableService service) { - ServerServiceDefinition definition = service.bindService(); - storage.setStatus(definition.getServiceDescriptor().getName(), - HealthOuterClass.HealthCheckResponse.ServingStatus.SERVING); - } - }); - } - }); - LOGGER.infof("gRPC Server started on %s:%d [SSL enabled: %s]", - configuration.host, configuration.port, !configuration.plainText); + postStartup(grpcContainer, configuration); startResult.complete(null); } @@ -130,6 +113,27 @@ public void accept(BindableService service) { } } + private void postStartup(GrpcContainer grpcContainer, GrpcServerConfiguration configuration) { + grpcContainer.getHealthStorage().stream().forEach(new Consumer<GrpcHealthStorage>() { //NOSONAR + @Override + public void accept(GrpcHealthStorage storage) { + storage.setStatus(GrpcHealthStorage.DEFAULT_SERVICE_NAME, + HealthOuterClass.HealthCheckResponse.ServingStatus.SERVING); + grpcContainer.getServices().forEach( + new Consumer<BindableService>() { // NOSONAR + @Override + public void accept(BindableService service) { + ServerServiceDefinition definition = service.bindService(); + storage.setStatus(definition.getServiceDescriptor().getName(), + HealthOuterClass.HealthCheckResponse.ServingStatus.SERVING); + } + }); + } + }); + LOGGER.infof("gRPC Server started on %s:%d [SSL enabled: %s]", + configuration.host, configuration.port, !configuration.plainText); + } + private void devModeStart(GrpcContainer grpcContainer, Vertx vertx, GrpcServerConfiguration configuration, ShutdownContext shutdown) { CompletableFuture<Boolean> future = new CompletableFuture<>(); @@ -142,6 +146,7 @@ public void handle(AsyncResult<Void> ar) { LOGGER.error("Unable to start the gRPC server", ar.cause()); future.completeExceptionally(ar.cause()); } else { + postStartup(grpcContainer, configuration); future.complete(true); grpcVerticleCount.incrementAndGet(); }

['extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.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/11605/11600

quarkusio

quarkus

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

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

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

fixes

Server shutdown warning when building native with Mandrel

Using Mandrel 20.1 with cleanup server option shows: ``` Status: Downloaded newer image for quay.io/quarkus/ubi-quarkus-mandrel:20.1.0.1.Alpha2-java11 quay.io/quarkus/ubi-quarkus-mandrel:20.1.0.1.Alpha2-java11 [INFO] [io.quarkus.deployment.pkg.steps.NativeImageBuildStep] Running Quarkus native-image plugin on GraalVM Version 20.1.0.1.Alpha2 56d4ee1b28 (Mandrel Distribution) (Java Version 11.0.8) Warning: Ignoring server-mode native-image argument --server-shutdown. Error: Please specify class containing the main entry point method. (see --help) [INFO] [io.quarkus.deployment.pkg.steps.NativeImageBuildStep] docker run -v /root/quarkus/integration-tests/main/target/quarkus-integration-test-main-1.7.0.Final-native-image-source-jar:/project:z --env LANG=C --user 0:0 --rm quay.io/quarkus/ubi-quarkus-mandrel:20.1.0.1.Alpha2-java11 -J-Dsun.nio.ch.maxUpdateArraySize=100 -J-DCoordinatorEnvironmentBean.transactionStatusManagerEnable=false -J-Djava.util.logging.manager=org.jboss.logmanager.LogManager -J-Dcom.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize=true -J-Drx.unsafe-disable=true -J-Dvertx.logger-delegate-factory-class-name=io.quarkus.vertx.core.runtime.VertxLogDelegateFactory -J-Dvertx.disableDnsResolver=true -J-Dio.netty.leakDetection.level=DISABLED -J-Dio.netty.allocator.maxOrder=1 -J-Duser.language=en -J-Dfile.encoding=UTF-8 -H:IncludeResources=test-resources/.*\\.txt --initialize-at-build-time= -H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime -H:+JNI -jar quarkus-integration-test-main-1.7.0.Final-runner.jar -H:FallbackThreshold=0 -H:+ReportExceptionStackTraces -H:+AddAllCharsets -H:EnableURLProtocols=http -H:-UseServiceLoaderFeature -H:+StackTrace quarkus-integration-test-main-1.7.0.Final-runner [quarkus-integration-test-main-1.7.0.Final-runner:56] classlist: 17,708.30 ms, 1.19 GB ``` Native image is built fine, but the warning above is related to server shutdown. Mandrel does not support server (`--no-server` already excludes the use of Mandrel), so we just need to extend server shutdown to non-Mandrel versions. Related to https://github.com/graalvm/mandrel/issues/107.

e7169364e5bbb1148d893e61bcd5d7e22ca4cc42

bac08b1dcbca41a76cd66a0a35e6380cee0e154e

https://github.com/quarkusio/quarkus/compare/e7169364e5bbb1148d893e61bcd5d7e22ca4cc42...bac08b1dcbca41a76cd66a0a35e6380cee0e154e

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java index 15c59625dc5..7e9e8fcf908 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java @@ -204,7 +204,7 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa try { List<String> command = new ArrayList<>(nativeImage); - if (nativeConfig.cleanupServer) { + if (nativeConfig.cleanupServer && !graalVMVersion.isMandrel()) { List<String> cleanup = new ArrayList<>(nativeImage); cleanup.add("--server-shutdown"); final ProcessBuilder pb = new ProcessBuilder(cleanup.toArray(new String[0]));

['core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.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/11561/11550

quarkusio

quarkus

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

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

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

fix

quarkus-grpc-protoc-plugin windows script fails with java.exe in Program Files

**Describe the bug** protoc compilation fails with "'С:\\Program' is not recognized as an internal or external command, operable program or batch file." **Expected behavior** protoc compilation successfully runs **Actual behavior** protoc compilation fails with "'С:\\Program' is not recognized as an internal or external command, operable program or batch file." **To Reproduce** Steps to reproduce the behavior: 1. Have java in C:\\Program Files\\Java 2. Use quarkus gradle plugin with quarkus-grpc dependency to compile some protoc files 3. It will fail with exception from https://github.com/quarkusio/quarkus/blob/1.7/extensions/grpc/codegen/src/main/java/io/quarkus/grpc/deployment/GrpcCodeGen.java line 86 saying "Failed to generate Java classes from proto files:" which doesn't explain anything. 4. If you try to run generated command yourself you will get a real reason saying C:\\Program is not a command. 5. Further investigation will show that GrpcCodeGen.java generates a cmd sript on line 207 which contains a java command - `C:\\Program Files\\AdoptOpenJDK\\jdk-11.0.7.10-hotspot\\bin\\java.EXE -cp "C:\\Users\\blablabla"` 6. Adding double quotes around java command fixes the issue **Environment (please complete the following information):** - Quarkus version or git rev: 1.7.0.Final - Build tool (ie. output of `mvnw --version` or `gradlew --version`): Gradle 6.6 Build time: 2020-08-10 22:06:19 UTC Revision: d119144684a0c301aea027b79857815659e431b9 Kotlin: 1.3.72 Groovy: 2.5.12 Ant: Apache Ant(TM) version 1.10.8 compiled on May 10 2020 JVM: 11.0.7 (AdoptOpenJDK 11.0.7+10) OS: Windows 10 10.0 amd64 Issue seems to be specific to quarkus 1.7.0.Final. At least changing version to 1.6.1.Final doesn't throw this exception, but it seems like it also doesn't try to compile proto files at all.

56cc4aa222e986254d3a5f9569baeaf69374fe47

196fcefd960f2f404c7782341d297c52eedcef07

https://github.com/quarkusio/quarkus/compare/56cc4aa222e986254d3a5f9569baeaf69374fe47...196fcefd960f2f404c7782341d297c52eedcef07

diff --git a/extensions/grpc/codegen/src/main/java/io/quarkus/grpc/deployment/GrpcCodeGen.java b/extensions/grpc/codegen/src/main/java/io/quarkus/grpc/deployment/GrpcCodeGen.java index dcdc158210b..049bcfe7a03 100644 --- a/extensions/grpc/codegen/src/main/java/io/quarkus/grpc/deployment/GrpcCodeGen.java +++ b/extensions/grpc/codegen/src/main/java/io/quarkus/grpc/deployment/GrpcCodeGen.java @@ -204,7 +204,7 @@ private static Path writeScript(Path buildDir, Path pluginPath, String shebang, } private static void writePluginExeCmd(Path pluginPath, BufferedWriter writer) throws IOException { - writer.write(JavaBinFinder.findBin() + " -cp \\"" + + writer.write("\\"" + JavaBinFinder.findBin() + "\\" -cp \\"" + pluginPath.toAbsolutePath().toString() + "\\" " + quarkusProtocPluginMain); writer.newLine(); }

['extensions/grpc/codegen/src/main/java/io/quarkus/grpc/deployment/GrpcCodeGen.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/11797/11792

quarkusio

quarkus

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

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

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

fixes

Command line app ignores SIGINT (Ctrl+C)

**Describe the bug** Quarkus command line apps do not respond to SIGINT **Expected behavior** A Quarkus command line app should initiate shutdown when passed SIGINT (Ctrl+C on a terminal) **Actual behavior** The signal is ignored, nothing happens **To Reproduce** Steps to reproduce the behavior: 1. Clone https://github.com/ivangreene/my-quarkus-cli 2. Run `mvn clean package` 3. Run `java -jar target/my-quarkus-cli-1.0-SNAPSHOT-runner.jar` 4. Press Ctrl+C **Environment (please complete the following information):** - Output of `uname -a` or `ver`: `Darwin ivan.local 19.6.0 Darwin Kernel Version 19.6.0: Sun Jul 5 00:43:10 PDT 2020; root:xnu-6153.141.1~9/RELEASE_X86_64 x86_64 i386 MacBookPro16,1 Darwin` - Output of `java -version`: ``` openjdk version "11.0.7" 2020-04-14 OpenJDK Runtime Environment AdoptOpenJDK (build 11.0.7+10) OpenJDK 64-Bit Server VM AdoptOpenJDK (build 11.0.7+10, mixed mode) ``` - GraalVM version (if different from Java): - Quarkus version or git rev: `1.7.1.Final` - Build tool (ie. output of `mvnw --version` or `gradlew --version`): ``` Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) Maven home: /usr/local/Cellar/maven/3.6.3_1/libexec Java version: 11.0.7, vendor: AdoptOpenJDK, runtime: /Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home Default locale: en_US, platform encoding: UTF-8 OS name: "mac os x", version: "10.15.6", arch: "x86_64", family: "mac" ```

7f04249f1717b4c9772641b2a8122e4ab47a75fc

66e46d44be320c1d480013228d0802f62a07e9bb

https://github.com/quarkusio/quarkus/compare/7f04249f1717b4c9772641b2a8122e4ab47a75fc...66e46d44be320c1d480013228d0802f62a07e9bb

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/Application.java b/core/runtime/src/main/java/io/quarkus/runtime/Application.java index 709b391261e..ac632628c96 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/Application.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/Application.java @@ -228,16 +228,15 @@ public void awaitShutdown() { stateLock.lock(); try { for (;;) { - switch (state) { - case ST_STOPPED: - return; // all good - default: - try { - stateCond.await(); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw interruptedOnAwaitStop(); - } + if (state == ST_STOPPED) { + return; // all good + } else { + try { + stateCond.await(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw interruptedOnAwaitStop(); + } } } } finally { diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java b/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java index 911e549850e..f12a92b8c07 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java @@ -1,5 +1,6 @@ package io.quarkus.runtime; +import java.util.Locale; import java.util.Objects; import java.util.Set; import java.util.concurrent.locks.Condition; @@ -16,8 +17,6 @@ import org.jboss.logging.Logger; import org.wildfly.common.lock.Locks; -import com.oracle.svm.core.OS; - import io.quarkus.runtime.graal.DiagnosticPrinter; import sun.misc.Signal; import sun.misc.SignalHandler; @@ -74,7 +73,7 @@ public static void run(Application application, Class<? extends QuarkusApplicati //in this case we don't shut it down at the end boolean alreadyStarted = application.isStarted(); if (!hooksRegistered) { - registerHooks(); + registerHooks(exitCodeHandler == null ? defaultExitCodeHandler : exitCodeHandler); hooksRegistered = true; } if (currentApplication != null && !shutdownRequested) { @@ -104,7 +103,7 @@ public static void run(Application application, Class<? extends QuarkusApplicati } QuarkusApplication instance; if (bean == null) { - instance = quarkusApplication.newInstance(); + instance = quarkusApplication.getDeclaredConstructor().newInstance(); } else { CreationalContext<?> ctx = beanManager.createCreationalContext(bean); instance = (QuarkusApplication) beanManager.getReference(bean, quarkusApplication, ctx); @@ -159,36 +158,36 @@ public static void run(Application application, Class<? extends QuarkusApplicati (exitCodeHandler == null ? defaultExitCodeHandler : exitCodeHandler).accept(getExitCode()); //this may not be called if shutdown was initiated by a signal } - private static void registerHooks() { + private static void registerHooks(final Consumer<Integer> exitCodeHandler) { if (ImageInfo.inImageRuntimeCode() && System.getenv(DISABLE_SIGNAL_HANDLERS) == null) { - registerSignalHandlers(); + registerSignalHandlers(exitCodeHandler); } final ShutdownHookThread shutdownHookThread = new ShutdownHookThread(); Runtime.getRuntime().addShutdownHook(shutdownHookThread); } - private static void registerSignalHandlers() { - final SignalHandler handler = new SignalHandler() { + private static void registerSignalHandlers(final Consumer<Integer> exitCodeHandler) { + final SignalHandler exitHandler = new SignalHandler() { @Override public void handle(Signal signal) { - System.exit(signal.getNumber() + 0x80); + exitCodeHandler.accept(signal.getNumber() + 0x80); } }; - final SignalHandler quitHandler = new SignalHandler() { + final SignalHandler diagnosticsHandler = new SignalHandler() { @Override public void handle(Signal signal) { DiagnosticPrinter.printDiagnostics(System.out); } }; - handleSignal("INT", handler); - handleSignal("TERM", handler); + handleSignal("INT", exitHandler); + handleSignal("TERM", exitHandler); // the HUP and QUIT signals are not defined for the Windows OpenJDK implementation: // https://hg.openjdk.java.net/jdk8u/jdk8u-dev/hotspot/file/7d5c800dae75/src/os/windows/vm/jvm_windows.cpp - if (OS.getCurrent() == OS.WINDOWS) { - handleSignal("BREAK", quitHandler); + if (System.getProperty("os.name", "unknown").toLowerCase(Locale.ENGLISH).contains("windows")) { + handleSignal("BREAK", diagnosticsHandler); } else { - handleSignal("HUP", handler); - handleSignal("QUIT", quitHandler); + handleSignal("HUP", exitHandler); + handleSignal("QUIT", diagnosticsHandler); } } @@ -294,6 +293,12 @@ public void run() { } finally { stateLock.unlock(); } + if (currentApplication.isStarted()) { + // On CLI apps, SIGINT won't call io.quarkus.runtime.Application#stop(), + // making the awaitShutdown() below block the application termination process + // It should be a noop if called twice anyway + currentApplication.stop(); + } currentApplication.awaitShutdown(); System.out.flush(); System.err.flush(); diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java index 31c8ad6175b..5e19392330d 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java @@ -46,7 +46,7 @@ @Recorder public class LoggingSetupRecorder { - private static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("win"); + private static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows"); /** * <a href="https://conemu.github.io">ConEmu</a> ANSI X3.64 support enabled,

['core/runtime/src/main/java/io/quarkus/runtime/Application.java', 'core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java', 'core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.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/11504/11472

quarkusio

quarkus

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

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

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

close

Quarkus Unit tests fail when running from IntelliJ for Gradle project

**Describe the bug** In #8737 support for IntelliJ builder/runner was added. But it seems that it does not work. Reproducible: https://github.com/asodja/quarkus-gradle-idea-multi-module Error: ``` java.lang.RuntimeException: java.io.UncheckedIOException: Error while reading file as JAR: /Users/anzes/prototype-dev/quarkus-gradle-idea-multi-module/module-1/build/libs/module-1-my-version.jar at io.quarkus.test.junit.QuarkusTestExtension.throwBootFailureException(QuarkusTestExtension.java:513) at io.quarkus.test.junit.QuarkusTestExtension.beforeEach(QuarkusTestExtension.java:363) Caused by: java.io.UncheckedIOException: Error while reading file as JAR: /Users/anzes/prototype-dev/quarkus-gradle-idea-multi-module/module-1/build/libs/module-1-my-version.jar at io.quarkus.bootstrap.classloading.JarClassPathElement.<init>(JarClassPathElement.java:46) at io.quarkus.bootstrap.classloading.ClassPathElement.fromPath(ClassPathElement.java:51) at io.quarkus.bootstrap.app.CuratedApplication.processCpElement(CuratedApplication.java:156) at io.quarkus.bootstrap.app.CuratedApplication.getBaseRuntimeClassLoader(CuratedApplication.java:235) at io.quarkus.test.junit.QuarkusTestExtension.doJavaStart(QuarkusTestExtension.java:198) at io.quarkus.test.junit.QuarkusTestExtension.ensureStarted(QuarkusTestExtension.java:491) at io.quarkus.test.junit.QuarkusTestExtension.beforeAll(QuarkusTestExtension.java:524) at org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor.lambda$invokeBeforeAllCallbacks$7(ClassBasedTestDescriptor.java:359) ... 29 more Caused by: java.io.FileNotFoundException: /Users/anzes/prototype-dev/quarkus-gradle-idea-multi-module/module-1/build/libs/module-1-my-version.jar (No such file or directory) at java.util.zip.ZipFile.open(Native Method) at java.util.zip.ZipFile.<init>(ZipFile.java:225) at java.util.zip.ZipFile.<init>(ZipFile.java:155) at java.util.jar.JarFile.<init>(JarFile.java:166) at java.util.jar.JarFile.<init>(JarFile.java:130) at io.smallrye.common.io.jar.JarFiles.create(JarFiles.java:34) at io.quarkus.bootstrap.classloading.JarClassPathElement.<init>(JarClassPathElement.java:44) ... 41 more ``` The problems are two: 1. IntelliJ compiles files to `out/` and Gradle Model expects things in `build/` directory 2. Gradle Model expects Jars for test sources (IntelliJ does not create jars) This can be workaround with: https://github.com/quarkusio/quarkus/pull/11339 If you run `./gradlew build` test will pass since jars are in `build/` folder. **Expected behavior** Unit test passes, no exception is thrown. **Actual behavior** Unit test fails, exception is thrown. **To Reproduce** Steps to reproduce the behavior: 1. git clone https://github.com/asodja/quarkus-gradle-idea-multi-module 2. In IntelliJ set Preferences -> Gradle -> Build and run using IntelliJ and Run tests using IntelliJ 3. Run `MyTest` (Note: you should not have `build/` folder) **Environment (please complete the following information):** - Mac OS Catalina - OpenJDK 1.8.0_242 - Quarkus version: 1.7.0.Final - Build tool: Gradle 6.5.1

669677000f1f898376c8250f41fa87017ad20b26

7da33438576d4aaa38c859d4cb8d82d24bbf8370

https://github.com/quarkusio/quarkus/compare/669677000f1f898376c8250f41fa87017ad20b26...7da33438576d4aaa38c859d4cb8d82d24bbf8370

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/utils/BuildToolHelper.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/utils/BuildToolHelper.java index babc69bd053..90d9c68dbfa 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/utils/BuildToolHelper.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/utils/BuildToolHelper.java @@ -59,13 +59,13 @@ public static Path getBuildFile(Path project, BuildTool tool) { return null; } - public static QuarkusModel enableGradleAppModel(Path projectRoot, String mode) + public static QuarkusModel enableGradleAppModel(Path projectRoot, String mode, String... tasks) throws IOException, AppModelResolverException { if (isMavenProject(projectRoot)) { return null; } final QuarkusModel model = QuarkusGradleModelFactory.create(getBuildFile(projectRoot, BuildTool.GRADLE).toFile(), - mode); + mode, tasks); QuarkusModelHelper.exportModel(model); return model; } diff --git a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusGradleModelFactory.java b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusGradleModelFactory.java index 8f025f98f15..69ef1e314ef 100644 --- a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusGradleModelFactory.java +++ b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusGradleModelFactory.java @@ -8,10 +8,11 @@ public class QuarkusGradleModelFactory { - public static QuarkusModel create(File projectDir, String mode) { + public static QuarkusModel create(File projectDir, String mode, String... tasks) { try (ProjectConnection connection = GradleConnector.newConnector() .forProjectDirectory(projectDir) .connect()) { + connection.newBuild().forTasks(tasks).run(); return connection.action(new QuarkusModelBuildAction(mode)).run(); } } diff --git a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/util/QuarkusModelHelper.java b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/util/QuarkusModelHelper.java index c90a7d07ef4..dd295b6797f 100644 --- a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/util/QuarkusModelHelper.java +++ b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/util/QuarkusModelHelper.java @@ -36,6 +36,7 @@ private QuarkusModelHelper() { } public final static String[] DEVMODE_REQUIRED_TASKS = new String[] { "classes" }; + public final static String[] TEST_REQUIRED_TASKS = new String[] { "classes", "testClasses" }; public static void exportModel(QuarkusModel model) throws AppModelResolverException, IOException { Path serializedModel = QuarkusModelHelper diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java index aec84b21510..4cf1e341e5f 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java @@ -57,6 +57,7 @@ import io.quarkus.bootstrap.app.StartupAction; import io.quarkus.bootstrap.model.PathsCollection; import io.quarkus.bootstrap.runner.Timing; +import io.quarkus.bootstrap.util.QuarkusModelHelper; import io.quarkus.bootstrap.utils.BuildToolHelper; import io.quarkus.builder.BuildChainBuilder; import io.quarkus.builder.BuildContext; @@ -181,7 +182,7 @@ private ExtensionState doJavaStart(ExtensionContext context, Class<? extends Qua Path root = Paths.get("").normalize().toAbsolutePath(); // If gradle project running directly with IDE if (System.getProperty(BootstrapConstants.SERIALIZED_APP_MODEL) == null) { - BuildToolHelper.enableGradleAppModel(root, "TEST"); + BuildToolHelper.enableGradleAppModel(root, "TEST", QuarkusModelHelper.TEST_REQUIRED_TASKS); } runnerBuilder.setApplicationRoot(rootBuilder.build());

['independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusGradleModelFactory.java', 'independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/util/QuarkusModelHelper.java', 'independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/utils/BuildToolHelper.java', 'test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.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/11500/11461

quarkusio

quarkus

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

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

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

fixes

Unable to read a literal value from a secret containing keys ending in "yaml,yml or properties"

**Describe the bug** (Describe the problem clearly and concisely.) When reading a secret any secret key with that ends with ".yml" or ".yaml" or ".properties" is assumed to contain a ConfigSource. It's not possible to read a literal value from a secret with containing keys ending in "yaml,yml or properties" **Expected behavior** Should be able to read literal values from secrets containing keys ending in "yaml,yml or properties" **Actual behavior** 2020-08-19 09:42:27,386 DEBUG [io.qua.kub.cli.run.KubernetesConfigSourceProvider] (main) Attempting to read Secret tournamentcache-generated-secret 2020-08-19 09:42:48,593 DEBUG [io.qua.kub.cli.run.AbstractKubernetesConfigSourceUtil] (main) Attempting to convert data in Secret 'tournamentcache-generated-secret' to a list of ConfigSource objects 2020-08-19 09:45:23,074 DEBUG [io.qua.kub.cli.run.AbstractKubernetesConfigSourceUtil] (main) Secret 'tournamentcache-generated-secret' converted into 0ConfigSource objects 2020-08-19 09:46:09,200 DEBUG [io.qua.kub.cli.run.KubernetesConfigSourceProvider] (main) Done reading Secret tournamentcache-generated-secret **To Reproduce** Steps to reproduce the behavior: 1. 2. 3. **Configuration** ```properties # Add your application.properties here, if applicable. quarkus.kubernetes-config.enabled=true quarkus.kubernetes-config.secrets.enabled=true quarkus.kubernetes-config.fail-on-missing-config=true quarkus.kubernetes-config.secrets=tournamentcache-generated-secret ``` **Screenshots** (If applicable, add screenshots to help explain your problem.) **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** ```yaml oc get secret -o yaml tournamentcache-generated-secret apiVersion: v1 data: identities.yaml: Y3JlZGVudGlhbHM6Ci0gdXNlcm5hbWU6IGRldmVsb3BlcgogIHBhc3N3b3JkOiBUZDNaamZaYUJSOEQxQWZrCi0gdXNlcm5hbWU6IG9wZXJhdG9yCiAgcGFzc3dvcmQ6IGMyRm1KdTY3UlQ3R2JVQWsK kind: Secret metadata: creationTimestamp: "2020-08-09T08:29:49Z" labels: app: infinispan-secret-identities clusterName: tournamentcache infinispan_cr: tournamentcache ```

3e01efc70af78a296f1b66bc823181dfdae2b640

2a5cd97f23302e987de357e5a53a4a215af4d223

https://github.com/quarkusio/quarkus/compare/3e01efc70af78a296f1b66bc823181dfdae2b640...2a5cd97f23302e987de357e5a53a4a215af4d223

diff --git a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/AbstractKubernetesConfigSourceUtil.java b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/AbstractKubernetesConfigSourceUtil.java index 6d58dc71b79..2672f56a018 100644 --- a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/AbstractKubernetesConfigSourceUtil.java +++ b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/AbstractKubernetesConfigSourceUtil.java @@ -50,7 +50,7 @@ List<ConfigSource> toConfigSources(String kubernetesConfigSourceName, Map<String log.debug( "Adding a ConfigSource for the literal data of " + getType() + " '" + kubernetesConfigSourceName + "'"); } - result.add(createLiteralDataConfigSource(kubernetesConfigSourceName + "-literalData", + result.add(createLiteralDataConfigSource(kubernetesConfigSourceName, categorizedConfigSourceData.literalData, ORDINAL)); } @@ -69,9 +69,6 @@ List<ConfigSource> toConfigSources(String kubernetesConfigSourceName, Map<String + " '" + kubernetesConfigSourceName + "'"); } result.add(createYamlConfigSource(kubernetesConfigSourceName, fileName, rawFileData, ORDINAL)); - } else { - // TODO all keys named `*.{properties,yml,yaml}` are categorized as file sources, - // but here, we only look for `application.{properties,yml,yaml}` } } @@ -91,7 +88,8 @@ private static CategorizedConfigSourceData categorize(Map<String, String> data) List<Map.Entry<String, String>> fileData = new ArrayList<>(); for (Map.Entry<String, String> entry : data.entrySet()) { String key = entry.getKey(); - if (key.endsWith(".yml") || key.endsWith(".yaml") || key.endsWith(".properties")) { + if ((key.startsWith("application")) && + ((key.endsWith(".yml") || key.endsWith(".yaml") || key.endsWith(".properties")))) { fileData.add(entry); } else { literalData.put(key, entry.getValue()); diff --git a/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtilTest.java b/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtilTest.java index e34730b5ea3..6d458abc8d7 100644 --- a/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtilTest.java +++ b/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtilTest.java @@ -59,7 +59,7 @@ void testOnlySingleNonMatchingPropertiesData() { List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData()); - assertThat(configSources).isEmpty(); + assertThat(configSources).isNotEmpty(); } @Test @@ -83,7 +83,7 @@ void testOnlySingleNonMatchingYamlData() { List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData()); - assertThat(configSources).isEmpty(); + assertThat(configSources).isNotEmpty(); } @Test @@ -101,10 +101,18 @@ void testWithAllKindsOfData() { List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData()); assertThat(configSources).hasSize(4); - assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("literal")) - .singleElement().satisfies(c -> { - assertThat(c.getProperties()).containsOnly(entry("some.key", "someValue")); + + assertThat(configSources.get(0).getClass().getName().contains("ConfigMapLiteralDataPropertiesConfigSource")).isTrue(); + + assertThat(configSources).filteredOn(c -> !c.getName().toLowerCase().contains("application")) + .hasOnlyOneElementSatisfying(c -> { + assertThat(c.getProperties()).containsOnly( + entry("some.key", "someValue"), + entry("app.properties", "ignored1=ignoredValue1"), + entry("app.yaml", "ignored2: ignoredValue2"), + entry("app.yml", "ignored3: ignoredValue3")); }); + assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.properties")) .singleElement().satisfies(c -> { assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("app.key", "val")); diff --git a/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/SecretConfigSourceUtilTest.java b/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/SecretConfigSourceUtilTest.java index 1a18e573e73..13f9fbf9f86 100644 --- a/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/SecretConfigSourceUtilTest.java +++ b/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/SecretConfigSourceUtilTest.java @@ -60,7 +60,7 @@ void testOnlySingleNonMatchingPropertiesData() { List<ConfigSource> configSources = sut.toConfigSources(secret.getMetadata().getName(), secret.getData()); - assertThat(configSources).isEmpty(); + assertThat(configSources).isNotEmpty(); } @Test @@ -84,7 +84,7 @@ void testOnlySingleNonMatchingYamlData() { List<ConfigSource> configSources = sut.toConfigSources(secret.getMetadata().getName(), secret.getData()); - assertThat(configSources).isEmpty(); + assertThat(configSources).isNotEmpty(); } @Test @@ -102,14 +102,22 @@ void testWithAllKindsOfData() { List<ConfigSource> configSources = sut.toConfigSources(secret.getMetadata().getName(), secret.getData()); assertThat(configSources).hasSize(4); - assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("literal")) - .singleElement().satisfies(c -> { - assertThat(c.getProperties()).containsOnly(entry("some.key", "someValue")); + assertThat(configSources.get(0).getClass().getName().contains("SecretLiteralDataPropertiesConfigSource")).isTrue(); + + assertThat(configSources).filteredOn(c -> !c.getName().toLowerCase().contains("application")) + .hasOnlyOneElementSatisfying(c -> { + assertThat(c.getProperties()).containsOnly( + entry("some.key", "someValue"), + entry("app.properties", "ignored1=ignoredValue1"), + entry("app.yaml", "ignored2: ignoredValue2"), + entry("app.yml", "ignored3: ignoredValue3")); }); + assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.properties")) .singleElement().satisfies(c -> { assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("app.key", "val")); }); + assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.yaml")) .singleElement().satisfies(c -> { assertThat(c.getProperties()).containsOnly(entry("key2", "value2"),

['extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtilTest.java', 'extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/AbstractKubernetesConfigSourceUtil.java', 'extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/SecretConfigSourceUtilTest.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/11499/11430

quarkusio

quarkus

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

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

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

fixes

java.lang.IllegalArgumentException: Unable to resolve locale: c.u-US

When I try to build the jar on a server I got the next error ``` [INFO] --- quarkus-maven-plugin:1.7.0.Final:build (default) @ quarkus-cloud --- [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 32.095 s [INFO] Finished at: 2020-08-17T22:05:49Z [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal io.quarkus:quarkus-maven-plugin:1.7.0.Final:build (default) on project quarkus-cloud: Failed to build quarkus application: java.lang.IllegalArgumentException: Unable to resolve locale: c.u-US -> [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 ``` **Additional context** IBM cloud toolchain On my computer works just fine: macos 10.15.6 (19G2021)

a9e63cc32e428929c43a6430e7f434d5a3e285cb

4afde7622d20cce580124060239b7617be965d12

https://github.com/quarkusio/quarkus/compare/a9e63cc32e428929c43a6430e7f434d5a3e285cb...4afde7622d20cce580124060239b7617be965d12

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java index 304668aa737..cab0ff13948 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java @@ -30,7 +30,7 @@ public Locale convert(final String value) { } Locale locale = Locale.forLanguageTag(NORMALIZE_LOCALE_PATTERN.matcher(localeValue).replaceAll("-")); - if (locale.getLanguage() == null || locale.getLanguage().isEmpty()) { + if (locale != Locale.ROOT && (locale.getLanguage() == null || locale.getLanguage().isEmpty())) { throw new IllegalArgumentException("Unable to resolve locale: " + value); } diff --git a/core/runtime/src/test/java/io/quarkus/runtime/configuration/LocaleConverterTest.java b/core/runtime/src/test/java/io/quarkus/runtime/configuration/LocaleConverterTest.java index 0c924c9d781..87d61ffe46c 100644 --- a/core/runtime/src/test/java/io/quarkus/runtime/configuration/LocaleConverterTest.java +++ b/core/runtime/src/test/java/io/quarkus/runtime/configuration/LocaleConverterTest.java @@ -1,6 +1,8 @@ package io.quarkus.runtime.configuration; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import java.util.Locale; @@ -19,8 +21,23 @@ public void testStandardLocale() { @Test public void testUnderscoreLocale() { LocaleConverter localeConverter = new LocaleConverter(); - Locale locale = localeConverter.convert("fr-FR"); + Locale locale = localeConverter.convert("fr_FR"); assertEquals("fr", locale.getLanguage()); assertEquals("FR", locale.getCountry()); } + + @Test + public void testCLocale() { + LocaleConverter localeConverter = new LocaleConverter(); + Locale locale = localeConverter.convert("c.u-US"); + assertSame(Locale.ROOT, locale); + } + + @Test + public void testEmptyLocale() { + LocaleConverter localeConverter = new LocaleConverter(); + Locale locale = localeConverter.convert(""); + assertNull(locale); + } + }

['core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java', 'core/runtime/src/test/java/io/quarkus/runtime/configuration/LocaleConverterTest.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/11352/11351

quarkusio

quarkus

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

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

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

fixes

Redis client throw null exception on get

**Describe the bug** (Describe the problem clearly and concisely.) Getting null pointer exception when key not exists with following code: ``` @Path("/testing") class TestController { @Inject lateinit var redisClient: RedisClient @GET @Path("/test1") fun test1(): String { redisClient.get("testing") // this is throwing null pointer exception return "Testing" } } ``` ``` at org.jboss.resteasy.core.ExceptionHandler.handleApplicationException(ExceptionHandler.java:106) at org.jboss.resteasy.core.ExceptionHandler.handleException(ExceptionHandler.java:372) at org.jboss.resteasy.core.SynchronousDispatcher.writeException(SynchronousDispatcher.java:216) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:515) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$invoke$4(SynchronousDispatcher.java:259) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$preprocess$0(SynchronousDispatcher.java:160) at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:364) at org.jboss.resteasy.core.SynchronousDispatcher.preprocess(SynchronousDispatcher.java:163) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:245) at io.quarkus.resteasy.runtime.standalone.RequestDispatcher.service(RequestDispatcher.java:73) at io.quarkus.resteasy.runtime.standalone.VertxRequestHandler.dispatch(VertxRequestHandler.java:132) at io.quarkus.resteasy.runtime.standalone.VertxRequestHandler.access$000(VertxRequestHandler.java:37) at io.quarkus.resteasy.runtime.standalone.VertxRequestHandler$1.run(VertxRequestHandler.java:94) at io.quarkus.runtime.CleanableExecutor$CleaningRunnable.run(CleanableExecutor.java:231) at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2046) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1578) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1452) at org.jboss.threads.DelegatingRunnable.run(DelegatingRunnable.java:29) at org.jboss.threads.ThreadLocalResettingRunnable.run(ThreadLocalResettingRunnable.java:29) at java.base/java.lang.Thread.run(Thread.java:834) at org.jboss.threads.JBossThread.run(JBossThread.java:479) Caused by: java.lang.NullPointerException Caused by: java.lang.NullPointerException at io.quarkus.redis.client.runtime.RedisClientImpl.await(RedisClientImpl.java:1026) at io.quarkus.redis.client.runtime.RedisClientImpl.get(RedisClientImpl.java:237) ``` **Expected behavior** (Describe the expected behavior clearly and concisely.) **Actual behavior** (Describe the actual behavior clearly and concisely.) **To Reproduce** Steps to reproduce the behavior: 1. above code provided **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`: `Darwin sabeehs-mbp.home 19.6.0 Darwin Kernel Version 19.6.0: Sun Jul 5 00:43:10 PDT 2020; root:xnu-6153.141.1~9/RELEASE_X86_64 x86_64` - Output of `java -version`: ``` openjdk version "11.0.2" 2019-01-15 OpenJDK Runtime Environment 18.9 (build 11.0.2+9) OpenJDK 64-Bit Server VM 18.9 (build 11.0.2+9, mixed mode) ``` - GraalVM version (if different from Java): - Quarkus version or git rev: `1.7.0.Final` - Build tool (ie. output of `mvnw --version` or `gradlew --version`): ``` Gradle 6.3 ------------------------------------------------------------ Build time: 2020-03-24 19:52:07 UTC Revision: bacd40b727b0130eeac8855ae3f9fd9a0b207c60 Kotlin: 1.3.70 Groovy: 2.5.10 Ant: Apache Ant(TM) version 1.10.7 compiled on September 1 2019 JVM: 11.0.2 (Oracle Corporation 11.0.2+9) OS: Mac OS X 10.15.6 x86_64 ``` **Additional context** (Add any other context about the problem here.)

d8b2257d6a589f10cbe3942fe7d892088e3bf3fa

d7e13b7273bf41179f410436485947f45ba59155

https://github.com/quarkusio/quarkus/compare/d8b2257d6a589f10cbe3942fe7d892088e3bf3fa...d7e13b7273bf41179f410436485947f45ba59155

diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientImpl.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientImpl.java index bb1f119610f..e0ef01b0bae 100644 --- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientImpl.java +++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientImpl.java @@ -1023,6 +1023,10 @@ public Response zunionstore(List<String> args) { } private Response await(Uni<io.vertx.mutiny.redis.client.Response> mutinyResponse) { - return mutinyResponse.await().atMost(Duration.ofSeconds(timeout)).getDelegate(); + io.vertx.mutiny.redis.client.Response response = mutinyResponse.await().atMost(Duration.ofSeconds(timeout)); + if (response == null) { + return null; + } + return response.getDelegate(); } } diff --git a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResource.java b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResource.java index e59101e6ae2..0a4e0221110 100644 --- a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResource.java +++ b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResource.java @@ -12,6 +12,7 @@ import io.quarkus.redis.client.RedisClient; import io.quarkus.redis.client.reactive.ReactiveRedisClient; import io.smallrye.mutiny.Uni; +import io.vertx.redis.client.Response; @Path("/quarkus-redis") @ApplicationScoped @@ -26,7 +27,8 @@ public class RedisResource { @GET @Path("/sync/{key}") public String getSync(@PathParam("key") String key) { - return redisClient.get(key).toString(); + Response response = redisClient.get(key); + return response == null ? null : response.toString(); } @POST @@ -41,7 +43,7 @@ public void setSync(@PathParam("key") String key, String value) { public Uni<String> getReactive(@PathParam("key") String key) { return reactiveRedisClient .get(key) - .map(response -> response.toString()); + .map(response -> response == null ? null : response.toString()); } @POST diff --git a/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisTest.java b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisTest.java index 2c407bab66b..c04cec305f0 100644 --- a/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisTest.java +++ b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisTest.java @@ -16,6 +16,12 @@ class QuarkusRedisTest { @Test public void sync() { + RestAssured.given() + .when() + .get("/quarkus-redis/sync/" + SYNC_KEY) + .then() + .statusCode(204); // the key is not set yet + RestAssured.given() .body(SYNC_VALUE) .when() @@ -33,6 +39,12 @@ public void sync() { @Test public void reactive() { + RestAssured.given() + .when() + .get("/quarkus-redis/reactive/" + REACTIVE_KEY) + .then() + .statusCode(204); // the reactive key is not set yet + RestAssured.given() .body(REACTIVE_VALUE) .when()

['integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResource.java', 'integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisTest.java', 'extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientImpl.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/11335/11332

quarkusio

quarkus

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

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

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

fixes

Bundle message function name generated when using params is honoured only for the message key having a parameter in it's arguments and not for the other message keys

**Describe the bug** Bundle message function name generated when using params is honoured only for the message key having a parameter in it's arguments and not for the other message keys e.g let's say i have this message bundle ```java @MessageBundle(defaultKey = Message.UNDERSCORED_ELEMENT_NAME, value = "i18n") public interface AppDefaultMsg { @Message("hi {name} from Quarkus") String helloWithParam(String name); @Message("hi from Quarkus") String helloWithoutParam(); } ``` In my template hello.html ```html {i18n:hello_with_param('james')} {i18n:hello_without_param} ``` this will generates an error for the second key saying this ```log io.quarkus.qute.TemplateException: Found template problems (70): [1] Incorrect expression: i18n:hello_without_param - Message bundle [name=i18n, interface=xxx.AppDefaultMsg] does not define a method for key: hello_without_param - found in template [hello.html] ``` if you change the html to this ```html {i18n:hello_with_param('james')} {i18n:helloWithoutParam} ``` It will work hence confirming that the function name generated when using at least one message bundle key with argument doesn't respect the naming strategy used. **Expected behavior** I expect that my naming strategy to be applied to all my bundle keys like the normal case without params. **Actual behavior** The naming strategy is only honored for the message key having an argument **To Reproduce** Steps to reproduce the behavior: 1. Create a message bundle with two keys/values one having an argument and the other without argument 2. Set the naming strategy to something different than the default strategy (underscor or hyphen) 3. Create a qute template and try to display both values **Environment (please complete the following information):** - Output of `uname -a` or `ver`: `Darwin ***-MacBook-Pro.local 19.6.0 Darwin Kernel Version 19.6.0: Sun Jul 5 00:43:10 PDT 2020; root:xnu-6153.141.1~9/RELEASE_X86_64 x86_64` - Output of `java -version`: java version "11.0.7" 2020-04-14 LTS Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS) Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode - Quarkus version or git rev: 1.7.0.CR2 - Build tool (ie. output of `mvnw --version` or `gradlew --version`): Gradle 6.5.1

92c37dc291e102f231730d19c860ea3b2c20e199

ed73e4bf6171afab3873324a8b0fee62438d1ed6

https://github.com/quarkusio/quarkus/compare/92c37dc291e102f231730d19c860ea3b2c20e199...ed73e4bf6171afab3873324a8b0fee62438d1ed6

diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleMethodBuildItem.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleMethodBuildItem.java index 000c287eb0c..ec39f4ad5e2 100644 --- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleMethodBuildItem.java +++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleMethodBuildItem.java @@ -5,7 +5,7 @@ import io.quarkus.builder.item.MultiBuildItem; /** - * Represents a message bundle method that has a template that needs to be validated. + * Represents a message bundle method. * <p> * Note that templates that contain no expressions don't need to be validated. */ @@ -45,4 +45,13 @@ public String getTemplate() { return template; } + /** + * A bundle method that does not need to be validated has {@code null} template id. + * + * @return {@code true} if the template needs to be validated + */ + public boolean isValidatable() { + return templateId != null; + } + } diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java index 88734fdf924..1aea4304f45 100644 --- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java +++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java @@ -270,8 +270,10 @@ void initBundleContext(MessageBundleRecorder recorder, bundleInterfaces.put(bundle.getName(), localeToInterface); } - Map<String, String> templateIdToContent = messageBundleMethods.stream().collect( - Collectors.toMap(MessageBundleMethodBuildItem::getTemplateId, MessageBundleMethodBuildItem::getTemplate)); + Map<String, String> templateIdToContent = messageBundleMethods.stream() + .filter(MessageBundleMethodBuildItem::isValidatable).collect( + Collectors.toMap(MessageBundleMethodBuildItem::getTemplateId, + MessageBundleMethodBuildItem::getTemplate)); syntheticBeans.produce(SyntheticBeanBuildItem.configure(MessageBundleRecorder.BundleContext.class) .supplier(recorder.createContext(templateIdToContent, bundleInterfaces)).done()); @@ -283,6 +285,7 @@ void validateMessageBundleMethods(TemplatesAnalysisBuildItem templatesAnalysis, BuildProducer<IncorrectExpressionBuildItem> incorrectExpressions) { Map<String, MessageBundleMethodBuildItem> bundleMethods = messageBundleMethods.stream() + .filter(MessageBundleMethodBuildItem::isValidatable) .collect(Collectors.toMap(MessageBundleMethodBuildItem::getTemplateId, Function.identity())); for (TemplateAnalysis analysis : templatesAnalysis.getAnalysis()) { @@ -588,13 +591,9 @@ private String generateImplementation(ClassInfo defaultBundleInterface, String d if (messageTemplate == null) { messageTemplate = messageAnnotation.value().asString(); } - if (!messageTemplate.contains("}")) { - // No expression/tag - no need to use qute - bundleMethod.returnValue(bundleMethod.load(messageTemplate)); - } else { - // Obtain the template, e.g. msg_hello_name - String templateId; + String templateId = null; + if (messageTemplate.contains("}")) { if (defaultBundleInterface != null) { if (locale == null) { AnnotationInstance localizedAnnotation = bundleInterface.classAnnotation(LOCALIZED); @@ -604,10 +603,18 @@ private String generateImplementation(ClassInfo defaultBundleInterface, String d } else { templateId = bundleName + "_" + key; } + } - messageTemplateMethods - .produce(new MessageBundleMethodBuildItem(bundleName, key, templateId, method, messageTemplate)); + MessageBundleMethodBuildItem messageBundleMethod = new MessageBundleMethodBuildItem(bundleName, key, templateId, + method, messageTemplate); + messageTemplateMethods + .produce(messageBundleMethod); + if (!messageBundleMethod.isValidatable()) { + // No expression/tag - no need to use qute + bundleMethod.returnValue(bundleMethod.load(messageTemplate)); + } else { + // Obtain the template, e.g. msg_hello_name ResultHandle template = bundleMethod.invokeStaticMethod(BUNDLES_GET_TEMPLATE, bundleMethod.load(templateId)); // Create a template instance diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/AlphaMessages.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/AlphaMessages.java index e973f3dedc4..c405d5fd7f1 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/AlphaMessages.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/AlphaMessages.java @@ -12,4 +12,7 @@ public interface AlphaMessages { @Message(value = "Hello!", key = "hello_alpha") String hello(); + @Message("Hello {name} from alpha!") + String helloWithParam(String name); + } diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java index 441296a36f9..cee340f1ba1 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java @@ -25,7 +25,7 @@ public class MessageBundleTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(AppMessages.class, OtherMessages.class, AlphaMessages.class, Item.class) .addAsResource(new StringAsset( - "{msg:hello} {msg:hello_name('Jachym')} {msg:hello_with_if_section(3)} {alpha:hello-alpha} {alpha:hello_alpha}"), + "{msg:hello} {msg:hello_name('Jachym')} {msg:hello_with_if_section(3)} {alpha:hello-alpha} {alpha:hello_alpha} {alpha:hello-with-param('foo')}"), "templates/foo.html") .addAsResource(new StringAsset( "hello=Hallo Welt!\\nhello_name=Hallo {name}!"), @@ -64,10 +64,11 @@ public void testBeans() { @Test public void testResolvers() { - assertEquals("Hello world! Hello Jachym! Hello you guys! Hello alpha! Hello!", foo.instance().render()); - assertEquals("Hello world! Ahoj Jachym! Hello you guys! Hello alpha! Hello!", + assertEquals("Hello world! Hello Jachym! Hello you guys! Hello alpha! Hello! Hello foo from alpha!", + foo.instance().render()); + assertEquals("Hello world! Ahoj Jachym! Hello you guys! Hello alpha! Hello! Hello foo from alpha!", foo.instance().setAttribute(MessageBundles.ATTRIBUTE_LOCALE, Locale.forLanguageTag("cs")).render()); - assertEquals("Hallo Welt! Hallo Jachym! Hello you guys! Hello alpha! Hello!", + assertEquals("Hallo Welt! Hallo Jachym! Hello you guys! Hello alpha! Hello! Hello foo from alpha!", foo.instance().setAttribute(MessageBundles.ATTRIBUTE_LOCALE, Locale.GERMAN).render()); assertEquals("Dot test!", engine.parse("{msg:['dot.test']}").render()); }

['extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/AlphaMessages.java', 'extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java', 'extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java', 'extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleMethodBuildItem.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/11328/11253

quarkusio

quarkus

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

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

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

fixes

Regression in 1.7: Dev mode auto-compile fails in MapStruct with "Attempt to recreate a file for type ..."

**Describe the bug** I am getting this strange error during auto-compile while trying to start dev mode in one of our modules: ``` [INFO] --- quarkus-maven-plugin:1.7.0.CR2:dev (default-cli) @ middleware-patient-api-pro-fe --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] Changes detected - recompiling the module! [INFO] Compiling 54 source files to C:\\Develop\\someproject\\middleware\\_develop-2\\someproject-middleware\\patient\\api\\pro-fe\\target\\classes [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] /C:/Develop/someproject/middleware/_develop-2/someproject-middleware/patient/api/pro-fe/src/main/java/com/somecompany/someproject/middleware/patient/api/pro_fe/data/mapper/CaseFileApiMapper.java:[26,8] Internal error in the mapping processor: java.lang.Rat org.codehaus.plexus.classworlds.launcat org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:347) Caused by: javax.annotation.processing.FilerException: Attempt to recreate a file for type com.somecompany.someproject.middleware.patient.api.pro_fe... 49 more Casat jdk.compiler/com.sun.tools.javac.processing.JavacFiler.createSourceFile(JavacFiler.java:426) stence(at org.mapstruct.ap.internal.processor.MapperRenderingProcessor.createSourceFile(Mappe[INFO] 1 error ``` I have no clue why this is so horribly garbled. `mvn -e ...` doesn't help much but at least reveals which type was attempted to recreate. ``` Attempt to recreate a file for type com.somecompany.someproject.middleware.patient.api.pro_fe.data.mapper.CaseFileApiMapperImpl at org.mapstruct.ap.internal.processor.MapperRen(... garbled, I suppose MapperRenderingProcessor) ``` This is _not_ flaky, btw. Only the affected "MapperImpl" can fluctuate (we have multiple mappers). Dev mode in another module does work, but there we do not use MapStruct. **The very same code works with 1.6.1.Final!** **Expected behavior** Should just compile (if needed) without errors. **Actual behavior** Build is aborted. **To Reproduce** Steps to reproduce the behavior: 1. git clone clone https://github.com/famod/quarkus-quickstarts 2. git switch issue-11253-mapstruct-vs-prepare 4. cd getting-started 5. should pass: mvn clean verify (or install) 6. should fail: mvn quarkus:dev Note: This reproducer uses MapStruct 1.4.0.Beta3. Downgrading to 1.3.1.Final does not change anything. **Configuration** n/a **Environment (please complete the following information):** - Output of `uname -a` or `ver`: `MINGW64_NT-10.0-18363 XXX 3.0.7-338.x86_64 2019-11-21 23:07 UTC x86_64 Msys` - Output of `java -version`: `OpenJDK 64-Bit Server VM AdoptOpenJDK (build 11.0.7+10, mixed mode)` - GraalVM version (if different from Java): n/a - Quarkus version or git rev: 1.7.0.CR1 or 1.7.0.CR2 - Build tool (ie. output of `mvnw --version` or `gradlew --version`): Apache Maven 3.6.3 **Additional context** `mvn clean compile quarkus:dev` works, which is no wonder since compile is skipped in this case. I found two commits that may have something to do with it (the first one being the "hottest" candidate): - https://github.com/quarkusio/quarkus/commit/93e1ba6f97fa2714fe67c42d8d197f0210437100#diff-c007939524ea2a3177991ef913abf5df - https://github.com/quarkusio/quarkus/commit/3d7e64230f97a1772fb6bb58b929a2471e5a5eb2#diff-c007939524ea2a3177991ef913abf5df I did not yet have the time to debug this.

85fc8c0310dc6f8d898b959a9ddc842b2462d295

8b8bdfebf1eda5b5e7be16bd48145d3d043f0f29

https://github.com/quarkusio/quarkus/compare/85fc8c0310dc6f8d898b959a9ddc842b2462d295...8b8bdfebf1eda5b5e7be16bd48145d3d043f0f29

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CodeGenMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CodeGenMojo.java index dc812e5b613..3f3563047a7 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/CodeGenMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/CodeGenMojo.java @@ -106,8 +106,6 @@ void doExecute(Path sourcesDir, ? buildDir.toPath().resolve("generated-test-sources") : buildDir.toPath().resolve("generated-sources"); - sourceRegistrar.accept(generatedSourcesDir); - QuarkusClassLoader deploymentClassLoader = curatedApplication.createDeploymentClassLoader(); List<CodeGenData> codeGens = CodeGenerator.init(deploymentClassLoader, Collections.singleton(sourcesDir),

['devtools/maven/src/main/java/io/quarkus/maven/CodeGenMojo.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/11307/11264

quarkusio

quarkus

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

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

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

fixes

Amazon client requires both transport client implementations for native compilation

**Describe the bug** The [AmazonClientTransportRecorder](https://github.com/quarkusio/quarkus/blob/master/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientTransportRecorder.java) has both UrlConnectionHttpClient and ApacheHttpClient Code in the Runtime Recorder which seems to require both the respective dependencies during native image compilation. **Expected behavior** Only one of the dependencies is required during native image build time. **Actual behavior** Both of the dependencies are needed, which increases build time.

26a7116f67938744c43acb83f19c2dc50ada26f6

8a4119a9edf5ba1c0c96990d613d23cdc6f4754b

https://github.com/quarkusio/quarkus/compare/26a7116f67938744c43acb83f19c2dc50ada26f6...8a4119a9edf5ba1c0c96990d613d23cdc6f4754b

diff --git a/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AbstractAmazonServiceProcessor.java b/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AbstractAmazonServiceProcessor.java index 46b7ae6cf69..a678c2ecff1 100644 --- a/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AbstractAmazonServiceProcessor.java +++ b/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AbstractAmazonServiceProcessor.java @@ -88,8 +88,11 @@ public void createTransportBuilders(List<AmazonClientBuildItem> amazonClients, RuntimeValue<SdkAsyncHttpClient.Builder> asyncTransport = null; if (client.getSyncClassName().isPresent()) { - syncTransport = recorder.configureSync(configName(), buildSyncConfig, - syncConfig); + if (buildSyncConfig.type == SyncHttpClientBuildTimeConfig.SyncClientType.APACHE) { + syncTransport = recorder.configureSyncApacheHttpClient(configName(), syncConfig); + } else { + syncTransport = recorder.configureSyncUrlConnectionHttpClient(configName(), syncConfig); + } } if (client.getAsyncClassName().isPresent()) { diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientTransportRecorder.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientTransportRecorder.java index 91f64f34be6..60f1d7684d2 100644 --- a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientTransportRecorder.java +++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientTransportRecorder.java @@ -5,7 +5,6 @@ import java.util.HashSet; import java.util.Optional; -import io.quarkus.amazon.common.runtime.SyncHttpClientBuildTimeConfig.SyncClientType; import io.quarkus.runtime.RuntimeValue; import io.quarkus.runtime.annotations.Recorder; import software.amazon.awssdk.http.SdkHttpClient; @@ -24,55 +23,6 @@ @Recorder public class AmazonClientTransportRecorder { - public RuntimeValue<SdkHttpClient.Builder> configureSync(String clientName, SyncHttpClientBuildTimeConfig buildConfig, - RuntimeValue<SyncHttpClientConfig> syncConfigRuntime) { - - SdkHttpClient.Builder syncBuilder; - SyncHttpClientConfig syncConfig = syncConfigRuntime.getValue(); - - validateTlsManagersProvider(clientName, syncConfig.tlsManagersProvider, "sync"); - - if (buildConfig.type == SyncClientType.APACHE) { - Builder builder = ApacheHttpClient.builder(); - validateApacheClientConfig(clientName, syncConfig); - - builder.connectionTimeout(syncConfig.connectionTimeout); - builder.connectionAcquisitionTimeout(syncConfig.apache.connectionAcquisitionTimeout); - builder.connectionMaxIdleTime(syncConfig.apache.connectionMaxIdleTime); - syncConfig.apache.connectionTimeToLive.ifPresent(builder::connectionTimeToLive); - builder.expectContinueEnabled(syncConfig.apache.expectContinueEnabled); - builder.maxConnections(syncConfig.apache.maxConnections); - builder.socketTimeout(syncConfig.socketTimeout); - builder.useIdleConnectionReaper(syncConfig.apache.useIdleConnectionReaper); - - if (syncConfig.apache.proxy.enabled && syncConfig.apache.proxy.endpoint.isPresent()) { - ProxyConfiguration.Builder proxyBuilder = ProxyConfiguration.builder() - .endpoint(syncConfig.apache.proxy.endpoint.get()); - syncConfig.apache.proxy.username.ifPresent(proxyBuilder::username); - syncConfig.apache.proxy.password.ifPresent(proxyBuilder::password); - syncConfig.apache.proxy.nonProxyHosts.ifPresent(c -> c.forEach(proxyBuilder::addNonProxyHost)); - syncConfig.apache.proxy.ntlmDomain.ifPresent(proxyBuilder::ntlmDomain); - syncConfig.apache.proxy.ntlmWorkstation.ifPresent(proxyBuilder::ntlmWorkstation); - syncConfig.apache.proxy.preemptiveBasicAuthenticationEnabled - .ifPresent(proxyBuilder::preemptiveBasicAuthenticationEnabled); - - builder.proxyConfiguration(proxyBuilder.build()); - } - getTlsKeyManagersProvider(syncConfig.tlsManagersProvider).ifPresent(builder::tlsKeyManagersProvider); - - syncBuilder = builder; - } else { - UrlConnectionHttpClient.Builder builder = UrlConnectionHttpClient.builder(); - builder.connectionTimeout(syncConfig.connectionTimeout); - builder.socketTimeout(syncConfig.socketTimeout); - getTlsKeyManagersProvider(syncConfig.tlsManagersProvider).ifPresent(builder::tlsKeyManagersProvider); - - syncBuilder = builder; - } - - return new RuntimeValue<>(syncBuilder); - } - public RuntimeValue<SdkAsyncHttpClient.Builder> configureAsync(String clientName, RuntimeValue<NettyHttpClientConfig> asyncConfigRuntime) { NettyNioAsyncHttpClient.Builder builder = NettyNioAsyncHttpClient.builder(); @@ -126,6 +76,50 @@ public RuntimeValue<SdkAsyncHttpClient.Builder> configureAsync(String clientName return new RuntimeValue<>(builder); } + public RuntimeValue<SdkHttpClient.Builder> configureSyncUrlConnectionHttpClient(String clientName, + RuntimeValue<SyncHttpClientConfig> syncConfigRuntime) { + SyncHttpClientConfig syncConfig = syncConfigRuntime.getValue(); + validateTlsManagersProvider(clientName, syncConfig.tlsManagersProvider, "sync"); + UrlConnectionHttpClient.Builder builder = UrlConnectionHttpClient.builder(); + builder.connectionTimeout(syncConfig.connectionTimeout); + builder.socketTimeout(syncConfig.socketTimeout); + getTlsKeyManagersProvider(syncConfig.tlsManagersProvider).ifPresent(builder::tlsKeyManagersProvider); + return new RuntimeValue<>(builder); + } + + public RuntimeValue<SdkHttpClient.Builder> configureSyncApacheHttpClient(String clientName, + RuntimeValue<SyncHttpClientConfig> syncConfigRuntime) { + SyncHttpClientConfig syncConfig = syncConfigRuntime.getValue(); + validateTlsManagersProvider(clientName, syncConfig.tlsManagersProvider, "sync"); + Builder builder = ApacheHttpClient.builder(); + validateApacheClientConfig(clientName, syncConfig); + + builder.connectionTimeout(syncConfig.connectionTimeout); + builder.connectionAcquisitionTimeout(syncConfig.apache.connectionAcquisitionTimeout); + builder.connectionMaxIdleTime(syncConfig.apache.connectionMaxIdleTime); + syncConfig.apache.connectionTimeToLive.ifPresent(builder::connectionTimeToLive); + builder.expectContinueEnabled(syncConfig.apache.expectContinueEnabled); + builder.maxConnections(syncConfig.apache.maxConnections); + builder.socketTimeout(syncConfig.socketTimeout); + builder.useIdleConnectionReaper(syncConfig.apache.useIdleConnectionReaper); + + if (syncConfig.apache.proxy.enabled && syncConfig.apache.proxy.endpoint.isPresent()) { + ProxyConfiguration.Builder proxyBuilder = ProxyConfiguration.builder() + .endpoint(syncConfig.apache.proxy.endpoint.get()); + syncConfig.apache.proxy.username.ifPresent(proxyBuilder::username); + syncConfig.apache.proxy.password.ifPresent(proxyBuilder::password); + syncConfig.apache.proxy.nonProxyHosts.ifPresent(c -> c.forEach(proxyBuilder::addNonProxyHost)); + syncConfig.apache.proxy.ntlmDomain.ifPresent(proxyBuilder::ntlmDomain); + syncConfig.apache.proxy.ntlmWorkstation.ifPresent(proxyBuilder::ntlmWorkstation); + syncConfig.apache.proxy.preemptiveBasicAuthenticationEnabled + .ifPresent(proxyBuilder::preemptiveBasicAuthenticationEnabled); + + builder.proxyConfiguration(proxyBuilder.build()); + } + getTlsKeyManagersProvider(syncConfig.tlsManagersProvider).ifPresent(builder::tlsKeyManagersProvider); + return new RuntimeValue<>(builder); + } + private Optional<TlsKeyManagersProvider> getTlsKeyManagersProvider(TlsManagersProviderConfig config) { if (config.fileStore != null && config.fileStore.path.isPresent() && config.fileStore.type.isPresent()) { return Optional.of(config.type.create(config));

['extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AbstractAmazonServiceProcessor.java', 'extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientTransportRecorder.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/11781/11780

quarkusio

quarkus

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

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

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

fixes

Flyway migrations does not work anymore on JDK8 after upgrade to 1.7.1.Final

**Describe the bug** Flyway migration does not work anymore on quarkus 1.7.1 with jdk 8 when executing from inside a jar Reproducer: https://github.com/rmanibus/quarkus-reproducer ``` # with open-jdk 8 (it works in jdk 14): mvn clean install java -jar target/code-with-quarkus-1.0.0-SNAPSHOT-runner.jar ``` This seems to have been introduced by https://github.com/quarkusio/quarkus/pull/11300 **Expected behavior** Flyway migrations are executed **Actual behavior** The application throws with: ``` --/ __ \\/ / / / _ | / _ \\/ //_/ / / / __/ -/ /_/ / /_/ / __ |/ , _/ ,< / /_/ /\\ \\ --\\___\\_\\____/_/ |_/_/|_/_/|_|\\____/___/ 2020-09-01 15:31:30,945 INFO [org.fly.cor.int.lic.VersionPrinter] (main) Flyway Community Edition 6.5.3 by Redgate 2020-09-01 15:31:31,103 INFO [org.fly.cor.int.dat.DatabaseFactory] (main) Database: jdbc:h2:mem:secondary (H2 1.4) 2020-09-01 15:31:31,235 INFO [org.fly.cor.int.sch.JdbcTableSchemaHistory] (main) Creating Schema History table "PUBLIC"."flyway_schema_history" ... 2020-09-01 15:31:31,304 ERROR [io.qua.application] (main) Failed to start application (with profile prod): org.flywaydb.core.api.FlywayException: Unable to obtain inputstream for resource: db/migration/h2-global/../h2-global/V1.0.1__Quarkus.sql at org.flywaydb.core.internal.resource.classpath.ClassPathResource.read(ClassPathResource.java:90) at org.flywaydb.core.internal.resolver.ChecksumCalculator.calculateChecksumForResource(ChecksumCalculator.java:67) at org.flywaydb.core.internal.resolver.ChecksumCalculator.calculate(ChecksumCalculator.java:46) at org.flywaydb.core.internal.resolver.sql.SqlMigrationResolver.getChecksumForLoadableResource(SqlMigrationResolver.java:143) at org.flywaydb.core.internal.resolver.sql.SqlMigrationResolver.addMigrations(SqlMigrationResolver.java:181) at org.flywaydb.core.internal.resolver.sql.SqlMigrationResolver.resolveMigrations(SqlMigrationResolver.java:88) at org.flywaydb.core.internal.resolver.sql.SqlMigrationResolver.resolveMigrations(SqlMigrationResolver.java:44) at org.flywaydb.core.internal.resolver.CompositeMigrationResolver.collectMigrations(CompositeMigrationResolver.java:127) at org.flywaydb.core.internal.resolver.CompositeMigrationResolver.doFindAvailableMigrations(CompositeMigrationResolver.java:109) at org.flywaydb.core.internal.resolver.CompositeMigrationResolver.resolveMigrations(CompositeMigrationResolver.java:95) at org.flywaydb.core.internal.resolver.CompositeMigrationResolver.resolveMigrations(CompositeMigrationResolver.java:46) at org.flywaydb.core.internal.info.MigrationInfoServiceImpl.refresh(MigrationInfoServiceImpl.java:130) at org.flywaydb.core.internal.command.DbMigrate.migrateGroup(DbMigrate.java:185) at org.flywaydb.core.internal.command.DbMigrate.access$100(DbMigrate.java:54) at org.flywaydb.core.internal.command.DbMigrate$2.call(DbMigrate.java:162) at org.flywaydb.core.internal.command.DbMigrate$2.call(DbMigrate.java:159) at org.flywaydb.core.internal.jdbc.TableLockingExecutionTemplate$1.call(TableLockingExecutionTemplate.java:38) at org.flywaydb.core.internal.jdbc.TransactionalExecutionTemplate.execute(TransactionalExecutionTemplate.java:66) at org.flywaydb.core.internal.jdbc.TableLockingExecutionTemplate.execute(TableLockingExecutionTemplate.java:33) at org.flywaydb.core.internal.database.base.Connection.lock(Connection.java:129) at org.flywaydb.core.internal.schemahistory.JdbcTableSchemaHistory.lock(JdbcTableSchemaHistory.java:140) at org.flywaydb.core.internal.command.DbMigrate.migrateAll(DbMigrate.java:159) at org.flywaydb.core.internal.command.DbMigrate.migrate(DbMigrate.java:137) at org.flywaydb.core.Flyway$1.execute(Flyway.java:206) at org.flywaydb.core.Flyway$1.execute(Flyway.java:158) at org.flywaydb.core.Flyway.execute(Flyway.java:527) at org.flywaydb.core.Flyway.migrate(Flyway.java:158) at io.quarkus.flyway.runtime.FlywayRecorder.doStartActions(FlywayRecorder.java:54) at io.quarkus.deployment.steps.FlywayProcessor$createBeansAndStartActions-1520831253.deploy_0(FlywayProcessor$createBeansAndStartActions-1520831253.zig:91) at io.quarkus.deployment.steps.FlywayProcessor$createBeansAndStartActions-1520831253.deploy(FlywayProcessor$createBeansAndStartActions-1520831253.zig:40) at io.quarkus.runner.ApplicationImpl.doStart(ApplicationImpl.zig:553) at io.quarkus.runtime.Application.start(Application.java:90) at io.quarkus.runtime.ApplicationLifecycleManager.run(ApplicationLifecycleManager.java:92) at io.quarkus.runtime.Quarkus.run(Quarkus.java:61) at io.quarkus.runtime.Quarkus.run(Quarkus.java:38) at io.quarkus.runtime.Quarkus.run(Quarkus.java:106) ```

0255e3672057bb610521a14e5e819f32f3563131

fb29de4f28070099055defff30910744fba126d1

https://github.com/quarkusio/quarkus/compare/0255e3672057bb610521a14e5e819f32f3563131...fb29de4f28070099055defff30910744fba126d1

diff --git a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java index 1344f7e5342..000729c1541 100644 --- a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java +++ b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java @@ -252,7 +252,7 @@ private Set<String> getApplicationMigrationsFromPath(final String location, fina try (final Stream<Path> pathStream = Files.walk(rootPath)) { return pathStream.filter(Files::isRegularFile) - .map(it -> Paths.get(location, rootPath.relativize(it).toString()).toString()) + .map(it -> Paths.get(location, rootPath.relativize(it).toString()).normalize().toString()) // we don't want windows paths here since the paths are going to be used as classpath paths anyway .map(it -> it.replace('\\\\', '/')) .peek(it -> LOGGER.debugf("Discovered path: %s", it))

['extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.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/10019/9753

quarkusio

quarkus

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

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

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

fixes

Building GraphQL quickstart generates warnings that should be avoided

We shouldn't have these warnings when building a GraphQL application: ``` [WARNING] [io.quarkus.deployment.steps.ReflectiveHierarchyStep] Unable to properly register the hierarchy of the following classes for reflection as they are not in the Jandex index: - java.lang.Boolean - java.lang.Double - java.lang.Enum - java.lang.Integer - java.lang.Object - java.lang.String - java.time.LocalDate - java.util.List Consider adding them to the index either by creating a Jandex index for your dependency via the Maven plugin, an empty META-INF/beans.xml or quarkus.index-dependency properties.");. ```

cc65ca85f9611bbb577e31392f7a295c9d69e135

40ea18287eaf9b62c5b55e9429e5368ba353788b

https://github.com/quarkusio/quarkus/compare/cc65ca85f9611bbb577e31392f7a295c9d69e135...40ea18287eaf9b62c5b55e9429e5368ba353788b

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java index 94f38b2cb35..481a9b9dcc9 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java @@ -76,9 +76,15 @@ public static class DefaultIgnorePredicate implements Predicate<DotName> { static final Set<String> WHITELISTED_FROM_IGNORED_PACKAGES = new HashSet<>( Arrays.asList("java.math.BigDecimal", "java.math.BigInteger")); + static final List<String> PRIMITIVE = Arrays.asList("boolean", "byte", + "char", "short", "int", "long", "float", "double"); + @Override public boolean test(DotName dotName) { String name = dotName.toString(); + if (PRIMITIVE.contains(name)) { + return true; + } for (String containerPackageName : DEFAULT_IGNORED_PACKAGES) { if (name.startsWith(containerPackageName)) { return !WHITELISTED_FROM_IGNORED_PACKAGES.contains(name); diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java index 71901a6a2e1..6f0295b4c26 100644 --- a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java +++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java @@ -13,7 +13,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.function.Predicate; import java.util.jar.JarEntry; import java.util.jar.JarFile; @@ -62,7 +61,6 @@ import io.smallrye.graphql.cdi.config.ConfigKey; import io.smallrye.graphql.cdi.config.GraphQLConfig; import io.smallrye.graphql.cdi.producer.GraphQLProducer; -import io.smallrye.graphql.execution.Classes; import io.smallrye.graphql.schema.Annotations; import io.smallrye.graphql.schema.SchemaBuilder; import io.smallrye.graphql.schema.model.Argument; @@ -151,7 +149,7 @@ void buildExecutionService( for (String c : getClassesToRegisterForReflection(schema)) { DotName name = DotName.createSimple(c); org.jboss.jandex.Type type = org.jboss.jandex.Type.create(name, org.jboss.jandex.Type.Kind.CLASS); - reflectiveHierarchyProducer.produce(new ReflectiveHierarchyBuildItem(type, index, GraphQLIgnorePredicate.INSTANCE)); + reflectiveHierarchyProducer.produce(new ReflectiveHierarchyBuildItem(type, index)); } // Make sure the GraphQL Java classes needed for introspection can work in native mode @@ -486,14 +484,4 @@ public void run() { } } } - - public static class GraphQLIgnorePredicate implements Predicate<DotName> { - - public static final GraphQLIgnorePredicate INSTANCE = new GraphQLIgnorePredicate(); - - @Override - public boolean test(DotName t) { - return Classes.isPrimitive(t.toString()) || t.toString().startsWith("java.net."); - } - } }

['extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java', 'core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.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/12224/12223

quarkusio

quarkus

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

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

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

fixes

Kafka-streams dev mode broken

**Describe the bug** Kafka-streams dev mode is not working anymore when an update of the application is detected. **Expected behavior** If a project source file is updated, the dev-mode recompiles the project and is able to relaunch the application to continue to work **Actual behavior** The PR #11540 introduced a [boolean flag](https://github.com/quarkusio/quarkus/pull/11540/files#diff-b1ea2a75cf0dc3e000fb088c2e58d4e8R55) to prevent kafka-streams to start if the application is stopping prematurely. Once this flag set kafka-streams won't be restarted in any situation. **To Reproduce** This would be reproductible with the kafka-streams quickstart

77b772c6dc4d44649fa6b03b1b824bac9abfea5d

12c66131b67525c5f563a5eb1d027519aff16031

https://github.com/quarkusio/quarkus/compare/77b772c6dc4d44649fa6b03b1b824bac9abfea5d...12c66131b67525c5f563a5eb1d027519aff16031

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 1037b6dc61f..b9587c916da 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 @@ -63,6 +63,7 @@ public class KafkaStreamsProducer { public KafkaStreamsProducer(KafkaStreamsSupport kafkaStreamsSupport, KafkaStreamsRuntimeConfig runtimeConfig, Instance<Topology> topology, Instance<KafkaClientSupplier> kafkaClientSupplier, Instance<StateListener> stateListener, Instance<StateRestoreListener> globalStateRestoreListener) { + shutdown = false; // No producer for Topology -> nothing to do if (topology.isUnsatisfied()) { LOGGER.debug("No Topology producer; Kafka Streams will not be started");

['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/12181/12116

quarkusio

quarkus

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

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

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

fixes

No suitable driver found for Postgresql with TestContainers since Quarkus 1.8

**Describe the bug** I have a TestContainers test that pings a Postgres DB. This test does not actually use Quarkus but I realized that it was working in 1.7.3 and failing in 1.8. It is not a stopper for me (as I said, I realized I should have taken the `@QuarkusTest` annotation) but it sounds that something has been introduced that it makes this test fail (this test has been working since Quarkus 1.6 at least). **Expected behavior** The test should pass as in 1.7.3 **Actual behavior** The test fail with: ``` java.sql.SQLException: No suitable driver found for jdbc:postgresql://localhost:32831/vintageStoreDB?loggerLevel=OFF at org.acme.PingPostgreSQLTest.shouldPingPostgreSQL(PingPostgreSQLTest.java:32) ``` **To Reproduce** Generate a brand new Quarkus 1.7.3-Final app with the Postgres extension. Then, add the TestContainers dependency: ``` <properties> ... <testcontainers.version>1.14.3</testcontainers.version> </properties> <dependency> <groupId>org.testcontainers</groupId> <artifactId>postgresql</artifactId> <version>${testcontainers.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>junit-jupiter</artifactId> <version>${testcontainers.version}</version> <scope>test</scope> </dependency> ``` Now create a new Test ``` @QuarkusTest @Testcontainers public class PingPostgreSQLTest { @Container public static PostgreSQLContainer pg = new PostgreSQLContainer<>("postgres:12.4") .withDatabaseName("vintageStoreDB") .withUsername("vintage") .withPassword("vintage") .withExposedPorts(5432); @Test public void shouldPingPostgreSQL() throws Exception { pg.start(); try (Connection con = DriverManager.getConnection(pg.getJdbcUrl(), pg.getUsername(), pg.getPassword()); Statement st = con.createStatement(); ResultSet rs = st.executeQuery("SELECT VERSION()")) { if (rs.next()) { assertTrue(rs.getString(1).contains("PostgreSQL 12")); } else { throw new Exception(); } } pg.stop(); } } ``` This test just uses TestContainers to ping a Postgres db. It doesn't use any Quarkus. In fact, if you leave the `@QuarkusTest` annotation it also works. Then, move to Quarkus 1.8.0, it fails. **Configuration** The test with 1.7.3 works even without any `application.properties` file declaring a Postgres driver or JDBC URL. Because it is now failing with 1.8 I tried to add `quarkus.datasource.db-kind=postgresql` and so on. **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Darwin iMac-Pro-de-Antonio.local 19.6.0 Darwin Kernel Version 19.6.0: Thu Jun 18 20:49:00 PDT 2020; root:xnu-6153.141.1~1/RELEASE_X86_64 x86_64 - Output of `java -version`: java version "11.0.6" 2020-01-14 LTS - GraalVM version (if different from Java): - Quarkus version or git rev: 1.8.0-Final - Build tool (ie. output of `mvnw --version` or `gradlew --version`): 3.6.3_1 **Additional context** (Add any other context about the problem here.)

b355df2af042544603d451839d8657e431ca5287

dbbebc0e62377e1d111c284bb7f9a3add6922e16

https://github.com/quarkusio/quarkus/compare/b355df2af042544603d451839d8657e431ca5287...dbbebc0e62377e1d111c284bb7f9a3add6922e16

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DriverRemover.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DriverRemover.java index 283ea4c8af9..99176b1dff7 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DriverRemover.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DriverRemover.java @@ -10,13 +10,21 @@ public class DriverRemover implements Runnable { private static final Logger log = Logger.getLogger(DriverRemover.class); + final ClassLoader goingAwayCl; + + public DriverRemover(ClassLoader goingAwayCl) { + this.goingAwayCl = goingAwayCl; + } + @Override public void run() { Enumeration<Driver> drivers = DriverManager.getDrivers(); while (drivers.hasMoreElements()) { Driver driver = drivers.nextElement(); try { - DriverManager.deregisterDriver(driver); + if (driver.getClass().getClassLoader() == goingAwayCl) { + DriverManager.deregisterDriver(driver); + } } catch (SQLException t) { log.error("Failed to deregister driver", t); } diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java index 61dae72b5b6..c7ffad2f2e9 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java @@ -8,6 +8,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.security.ProtectionDomain; +import java.sql.Driver; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -84,6 +85,7 @@ public class QuarkusClassLoader extends ClassLoader implements Closeable { } private boolean closed; + private volatile boolean driverLoaded; private QuarkusClassLoader(Builder builder) { //we need the parent to be null @@ -397,8 +399,12 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE if (classPathElementResource != null) { //can happen if the class loader was closed byte[] data = classPathElementResource.getData(); definePackage(name, classPathElement); - return defineClass(name, data, 0, data.length, + Class<?> cl = defineClass(name, data, 0, data.length, protectionDomains.computeIfAbsent(classPathElement, (ce) -> ce.getProtectionDomain(this))); + if (Driver.class.isAssignableFrom(cl)) { + driverLoaded = true; + } + return cl; } } @@ -481,14 +487,17 @@ public void close() { } closed = true; } - //DriverManager only lets you remove drivers with the same CL as the caller - //so we need do define the cleaner in this class loader - try (InputStream is = getClass().getResourceAsStream("DriverRemover.class")) { - byte[] data = JarClassPathElement.readStreamContents(is); - Runnable r = (Runnable) defineClass(DriverRemover.class.getName(), data, 0, data.length).newInstance(); - r.run(); - } catch (Exception e) { - log.debug("Failed to clean up DB drivers"); + if (driverLoaded) { + //DriverManager only lets you remove drivers with the same CL as the caller + //so we need do define the cleaner in this class loader + try (InputStream is = getClass().getResourceAsStream("DriverRemover.class")) { + byte[] data = JarClassPathElement.readStreamContents(is); + Runnable r = (Runnable) defineClass(DriverRemover.class.getName(), data, 0, data.length) + .getConstructor(ClassLoader.class).newInstance(this); + r.run(); + } catch (Exception e) { + log.debug("Failed to clean up DB drivers"); + } } for (ClassPathElement element : elements) { //note that this is a 'soft' close

['independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DriverRemover.java', 'independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.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/12156/12136

quarkusio

quarkus

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

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

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

fixes

ServiceConfigurationError with "not a subtype" for external library in dev mode

**Describe the bug** I get several ServiceConfigurationError exceptions with "not a subtype" message when initializing the GeoTools library suite, but only in dev mode. I've verified that the classes in the error messages are both included in the project, but also that they are in different jars (e.g. interface "CRSFactory" in gt-opengis, and "ReferencingObjectFactory" that implements CRSFactory in gt-referencing). **Expected behavior** No errors even in dev mode. **Actual behavior** Several error messages like this when GeoTools is first used: "java.util.ServiceConfigurationError: org.opengis.referencing.crs.CRSFactory: org.geotools.referencing.factory.ReferencingObjectFactory not a subtype" **To Reproduce** Steps to reproduce the behavior: 1. Start attached project 2. Access http://localhost:8080/test 3. Check console for error messages **Configuration** No application.properties in use **Screenshots** (If applicable, add screenshots to help explain your problem.) **Environment (please complete the following information):** - Output of `uname -a`: Linux 5.7.15-100.fc31.x86_64 #1 SMP Tue Aug 11 17:18:01 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux - Output of `java -version`: openjdk 11.0.8 2020-07-14 / OpenJDK Runtime Environment 18.9 (build 11.0.8+10) / OpenJDK 64-Bit Server VM 18.9 (build 11.0.8+10, mixed mode, sharing) - Quarkus version: 1.7.3.Final - Build tool: Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) **Additional context** I've created the smallest possible test case here, so there's no difference in behaviour between dev and prod mode, except from the error messages. In my application I get bugs in dev mode because some of the services from the libraries won't load. I've looked at https://quarkus.io/guides/class-loading-reference without finding a solution. I tried to use <parentFirstArtifact> with quarkus-bootstrap-maven-plugin (and include the complete dependency graph for "gt-referencing"), but that didn't have any effect. **Stack trace** `2020-09-16 14:11:53,917 WARNING [org.geo.uti.factory] (executor-thread-1) 8: java.util.ServiceConfigurationError: org.opengis.referencing.crs.CRSFactory: org.geotools.referencing.factory.ReferencingObjectFactory not a subtype at java.base/java.util.ServiceLoader.fail(ServiceLoader.java:588) at java.base/java.util.ServiceLoader$LazyClassPathLookupIterator.hasNextService(ServiceLoader.java:1236) at java.base/java.util.ServiceLoader$LazyClassPathLookupIterator.hasNext(ServiceLoader.java:1264) at java.base/java.util.ServiceLoader$2.hasNext(ServiceLoader.java:1299) at java.base/java.util.ServiceLoader$3.hasNext(ServiceLoader.java:1384) at org.geotools.util.factory.FactoryRegistry.register(FactoryRegistry.java:950) at org.geotools.util.factory.FactoryRegistry.scanForPlugins(FactoryRegistry.java:859) at org.geotools.util.factory.FactoryRegistry.scanForPluginsIfNeeded(FactoryRegistry.java:889) at org.geotools.util.factory.FactoryRegistry.getUnfilteredFactories(FactoryRegistry.java:289) at org.geotools.util.factory.FactoryRegistry.getFactoryImplementation(FactoryRegistry.java:497) at org.geotools.util.factory.FactoryRegistry.getFactory(FactoryRegistry.java:420) at org.geotools.util.factory.FactoryCreator.getFactory(FactoryCreator.java:138) at org.geotools.referencing.ReferencingFactoryFinder.getFactory(ReferencingFactoryFinder.java:200) at org.geotools.referencing.ReferencingFactoryFinder.getCRSFactory(ReferencingFactoryFinder.java:291) at org.geotools.referencing.factory.ReferencingFactoryContainer.getCRSFactory(ReferencingFactoryContainer.java:249) at org.geotools.referencing.factory.ReferencingFactoryContainer.initialize(ReferencingFactoryContainer.java:175) at org.geotools.referencing.factory.ReferencingFactoryContainer.getImplementationHints(ReferencingFactoryContainer.java:195) at org.geotools.util.factory.FactoryRegistry.usesAcceptableHints(FactoryRegistry.java:620) at org.geotools.util.factory.FactoryRegistry.isAcceptable(FactoryRegistry.java:575) at org.geotools.util.factory.FactoryRegistry.lambda$getFactoryImplementation$2(FactoryRegistry.java:504) at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:176) at java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:177) at java.base/java.util.Spliterators$IteratorSpliterator.tryAdvance(Spliterators.java:1812) at java.base/java.util.stream.ReferencePipeline.forEachWithCancel(ReferencePipeline.java:127) at java.base/java.util.stream.AbstractPipeline.copyIntoWithCancel(AbstractPipeline.java:502) at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:488) at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474) at java.base/java.util.stream.FindOps$FindOp.evaluateSequential(FindOps.java:150) at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234) at java.base/java.util.stream.ReferencePipeline.findFirst(ReferencePipeline.java:543) at org.geotools.util.factory.FactoryRegistry.getFactoryImplementation(FactoryRegistry.java:505) at org.geotools.util.factory.FactoryRegistry.getFactory(FactoryRegistry.java:420) at org.geotools.util.factory.FactoryCreator.getFactory(FactoryCreator.java:138) at org.geotools.referencing.factory.ReferencingFactoryContainer.instance(ReferencingFactoryContainer.java:162) at org.geotools.referencing.factory.epsg.FactoryUsingWKT.<init>(FactoryUsingWKT.java:142) at org.geotools.referencing.factory.epsg.FactoryUsingWKT.<init>(FactoryUsingWKT.java:136) at org.geotools.referencing.factory.epsg.FactoryUsingWKT.<init>(FactoryUsingWKT.java:126) 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.util.ServiceLoader$ProviderImpl.newInstance(ServiceLoader.java:779) at java.base/java.util.ServiceLoader$ProviderImpl.get(ServiceLoader.java:721) at java.base/java.util.ServiceLoader$3.next(ServiceLoader.java:1394) at org.geotools.util.factory.FactoryRegistry.register(FactoryRegistry.java:953) at org.geotools.util.factory.FactoryRegistry.scanForPlugins(FactoryRegistry.java:859) at org.geotools.util.factory.FactoryRegistry.scanForPluginsIfNeeded(FactoryRegistry.java:889) at org.geotools.util.factory.FactoryRegistry.getFactories(FactoryRegistry.java:251) at org.geotools.referencing.ReferencingFactoryFinder.getFactories(ReferencingFactoryFinder.java:183) at org.geotools.referencing.ReferencingFactoryFinder.getCRSAuthorityFactories(ReferencingFactoryFinder.java:453) at org.geotools.referencing.DefaultAuthorityFactory.getSupportedCodes(DefaultAuthorityFactory.java:124) at org.geotools.referencing.CRS.getSupportedCodes(CRS.java:379) at org.acme.ExampleResource.test(ExampleResource.java:18) `

631268056f59ae55e39d7280e049512a422401b7

847ece98fa44615530d6a49aeffdad6e7adba337

https://github.com/quarkusio/quarkus/compare/631268056f59ae55e39d7280e049512a422401b7...847ece98fa44615530d6a49aeffdad6e7adba337

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 ce34e442a0a..e2c54c2029a 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java @@ -38,6 +38,7 @@ import java.util.jar.Manifest; import java.util.stream.Collectors; import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; import java.util.zip.ZipOutputStream; import org.apache.maven.artifact.Artifact; @@ -75,6 +76,7 @@ import org.eclipse.aether.util.artifact.JavaScopes; import io.quarkus.bootstrap.model.AppArtifactKey; +import io.quarkus.bootstrap.model.AppModel; import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; @@ -93,6 +95,7 @@ */ @Mojo(name = "dev", defaultPhase = LifecyclePhase.PREPARE_PACKAGE, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME) public class DevMojo extends AbstractMojo { + private static final String EXT_PROPERTIES_PATH = "META-INF/quarkus-extension.properties"; /** * running any one of these phases means the compile phase will have been run, if these have @@ -717,11 +720,35 @@ void prepare(final boolean triggerCompile) throws Exception { //in most cases these are not used, however they need to be present for some //parent-first cases such as logging + //first we go through and get all the parent first artifacts + Set<AppArtifactKey> parentFirstArtifacts = new HashSet<>(); + for (Artifact appDep : project.getArtifacts()) { + if (appDep.getArtifactHandler().getExtension().equals("jar") && appDep.getFile().isFile()) { + try (ZipFile file = new ZipFile(appDep.getFile())) { + ZipEntry entry = file.getEntry(EXT_PROPERTIES_PATH); + if (entry != null) { + Properties p = new Properties(); + try (InputStream inputStream = file.getInputStream(entry)) { + p.load(inputStream); + String parentFirst = p.getProperty(AppModel.PARENT_FIRST_ARTIFACTS); + if (parentFirst != null) { + String[] artifacts = parentFirst.split(","); + for (String artifact : artifacts) { + parentFirstArtifacts.add(new AppArtifactKey(artifact.split(":"))); + } + } + } + + } + } + } + } for (Artifact appDep : project.getArtifacts()) { // only add the artifact if it's present in the dev mode context // we need this to avoid having jars on the classpath multiple times - if (!devModeContext.getLocalArtifacts().contains(new AppArtifactKey(appDep.getGroupId(), appDep.getArtifactId(), - appDep.getClassifier(), appDep.getArtifactHandler().getExtension()))) { + AppArtifactKey key = new AppArtifactKey(appDep.getGroupId(), appDep.getArtifactId(), + appDep.getClassifier(), appDep.getArtifactHandler().getExtension()); + if (!devModeContext.getLocalArtifacts().contains(key) && parentFirstArtifacts.contains(key)) { addToClassPaths(classPathManifest, appDep.getFile()); } } diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java index a9c1a96ef67..de336cb2d6e 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java @@ -70,7 +70,7 @@ protected static String[] split(String str, String[] parts, int fromIndex) { protected final String classifier; protected final String type; - protected AppArtifactKey(String[] parts) { + public AppArtifactKey(String[] parts) { this.groupId = parts[0]; this.artifactId = parts[1]; if (parts.length == 2 || parts[2] == null) {

['devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java', 'independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.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/12103/12102

quarkusio

quarkus

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

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

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

fixes

Hang in build when upgrading to 1.8.0 when library class' superclass is not present on classpath

**Describe the bug** My application builds with 1.7.3, but with 1.8.0 the quarkus:build step hangs after printing out a warning: [WARNING] [io.quarkus.arc.processor.BeanArchives] Failed to index org.apache.cxf.phase.AbstractPhaseInterceptor: Class does not exist in ClassLoader QuarkusClassLoader:Deployment Class Loader One of the libraries we depend on has an optional dependency on CXF. We do not use the XML parts of that library, so the AbstractPhaseInterceptor subclass the library defines is never loaded, and do not have CXF on the app classpath. Stopping it in a debugger, the problem appears to be in the loop at https://github.com/quarkusio/quarkus/blob/master/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.java#L102 superName is "org.apache.cxf.phase.AbstractPhaseInterceptor", and superClass = index.getClassByName() return null. Since it is null, it skips the if block, and loops around again without changing superName, so the the same thing repeats. If getClassByName() it probably needs to break out of the loop, maybe returning false? I can work around this by adding that library (and the other couple of similar ones) as optional dependencies to my app as well, so they are on the build classpath. **Expected behavior** Build does not hang **Actual behavior** Build hangs **To Reproduce** I haven't manage to get it down to a simple reproducer yet **Environment (please complete the following information):** Quarkus 1.8.0.

3579849ffaa67d6a8f9099557249ad2dd2d44169

3b04c8d8ca2fc0da7b9e4714c2dba8ea035fd54d

https://github.com/quarkusio/quarkus/compare/3579849ffaa67d6a8f9099557249ad2dd2d44169...3b04c8d8ca2fc0da7b9e4714c2dba8ea035fd54d

diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.java index ad84d645737..eb6eaf51c25 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.java @@ -98,12 +98,14 @@ private boolean requiresContainerServices(ClassInfo clazz, Set<DotName> containe if (index != null) { DotName superName = clazz.superName(); while (superName != null && !superName.equals(DotNames.OBJECT)) { - ClassInfo superClass = index.getClassByName(superName); + final ClassInfo superClass = index.getClassByName(superName); if (superClass != null) { - if (hasContainerAnnotation(clazz, containerAnnotationNames)) { + if (hasContainerAnnotation(superClass, containerAnnotationNames)) { return true; } superName = superClass.superName(); + } else { + superName = null; } } }

['extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.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/12095/12087

quarkusio

quarkus

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

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

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

fixes

quarkus.http[s].test-port system properties are lost on app restart triggered by @TestProfile

**Describe the bug** If you set e.g. `<quarkus.http.test-port>0</quarkus.http.test-port>` in `systemPropertyVariables` of `maven-surefire-plugin` and you have at least one `@QuarkusTest` *without* `@TestProfile` and one `@QuarkusTest` *with* `@TestProfile` then the port is not picked up by that second test (if run after the test without `@TestProfile`). The reason for this lies in [VertxHttpRecorder](https://github.com/quarkusio/quarkus/blob/1.7.2.Final/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java): It is (re-?)setting the port properties here: https://github.com/quarkusio/quarkus/blob/1.7.2.Final/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java#L898-L902 and it is *clearing* the port properties here: https://github.com/quarkusio/quarkus/blob/1.7.2.Final/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java#L916-L930 (I saw in the debugger that the recorder is setting the actual effective port, e.g. 62138) That clearing occurs on shutdown which is triggered by the test extension because it finds a `@TestProfile`. The app instance that is then booted up after that cannot (obviously) see the original port properties anymore, falling back to the default (or I guess to yaml/properties in case port properties are set there). **Expected behavior** Port system properties must survive restarts triggered by `@TestProfile`. **Actual behavior** Port system properties are lost on first restart by a `@TestProfile`. **To Reproduce** Steps to reproduce the behavior: 1. clone https://github.com/famod/quarkus-quickstarts 2. switch to issue-12087-port-sysprop-lost diff: https://github.com/quarkusio/quarkus-quickstarts/compare/master..famod:issue-12087-port-sysprop-lost 3. cd getting-started-testing 4. mvn clean test will show that random port is only used for the first test (second one uses profile): ``` [INFO] Running org.acme.getting.started.testing.GreetingResourceTest 2020-09-14 22:30:53,552 INFO [io.quarkus] (main) Quarkus 1.7.3.Final on JVM started in 1.743s. Listening on: http://0.0.0.0:51063 2020-09-14 22:30:53,555 INFO [io.quarkus] (main) Profile test activated. 2020-09-14 22:30:53,555 INFO [io.quarkus] (main) Installed features: [cdi, resteasy] [INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.031 s - in org.acme.getting.started.testing.GreetingResourceTest [INFO] Running org.acme.getting.started.testing.GreetingServiceTest 2020-09-14 22:30:54,585 INFO [io.quarkus] (main) Quarkus stopped in 0.021s 2020-09-14 22:30:56,357 INFO [io.quarkus] (main) Quarkus 1.7.3.Final on JVM started in 1.585s. Listening on: http://0.0.0.0:8081 2020-09-14 22:30:56,357 INFO [io.quarkus] (main) Profile test activated. 2020-09-14 22:30:56,357 INFO [io.quarkus] (main) Installed features: [cdi, resteasy] [INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.017 s - in org.acme.getting.started.testing.GreetingServiceTest [INFO] Running org.acme.getting.started.testing.StaticContentTest 2020-09-14 22:30:56,599 INFO [io.quarkus] (main) Quarkus stopped in 0.015s 2020-09-14 22:30:58,120 INFO [io.quarkus] (main) Quarkus 1.7.3.Final on JVM started in 1.389s. Listening on: http://0.0.0.0:8081 2020-09-14 22:30:58,120 INFO [io.quarkus] (main) Profile test activated. 2020-09-14 22:30:58,120 INFO [io.quarkus] (main) Installed features: [cdi, resteasy] ``` **Configuration** n/a **Environment (please complete the following information):** - Output of `uname -a` or `ver`: `MINGW64_NT-10.0-18363 XXX 3.0.7-338.x86_64 2019-11-21 23:07 UTC x86_64 Msys` - Output of `java -version`: `OpenJDK 64-Bit Server VM AdoptOpenJDK (build 11.0.7+10, mixed mode)` - GraalVM version (if different from Java): n/a - Quarkus version or git rev: `1.7.2.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.)

30dea713a00333d0243302bae85528e7d2851fe5

338f62f7d33da049f5184a2c74be77ebf16ada4c

https://github.com/quarkusio/quarkus/compare/30dea713a00333d0243302bae85528e7d2851fe5...338f62f7d33da049f5184a2c74be77ebf16ada4c

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 b0b95c35bb9..ccbcb37b71c 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 @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; @@ -784,6 +785,7 @@ private static class WebDeploymentVerticle extends AbstractVerticle { private final LaunchMode launchMode; private volatile boolean clearHttpProperty = false; private volatile boolean clearHttpsProperty = false; + private volatile Map<String, String> portPropertiesToRestore; private final HttpConfiguration.InsecureRequests insecureRequests; public WebDeploymentVerticle(HttpServerOptions httpOptions, HttpServerOptions httpsOptions, @@ -892,14 +894,21 @@ private void setupTcpHttpServer(HttpServer httpServer, HttpServerOptions options clearHttpProperty = true; schema = "http"; } + portPropertiesToRestore = new HashMap<>(); String portPropertyValue = String.valueOf(actualPort); String portPropertyName = (launchMode == LaunchMode.TEST ? "quarkus." + schema + ".test-port" : "quarkus." + schema + ".port"); - System.setProperty(portPropertyName, portPropertyValue); + String prevPortPropertyValue = System.setProperty(portPropertyName, portPropertyValue); + if (prevPortPropertyValue != null) { + portPropertiesToRestore.put(portPropertyName, prevPortPropertyValue); + } if (launchMode.isDevOrTest()) { // set the profile property as well to make sure we don't have any inconsistencies - System.setProperty(propertyWithProfilePrefix(portPropertyName), - portPropertyValue); + portPropertyName = propertyWithProfilePrefix(portPropertyName); + prevPortPropertyValue = System.setProperty(portPropertyName, portPropertyValue); + if (prevPortPropertyValue != null) { + portPropertiesToRestore.put(portPropertyName, prevPortPropertyValue); + } } // Set in HttpOptions to output the port in the Timing class options.setPort(actualPort); @@ -928,6 +937,9 @@ public void stop(Future<Void> stopFuture) { System.clearProperty(propertyWithProfilePrefix(portPropertyName)); } } + if (portPropertiesToRestore != null && !portPropertiesToRestore.isEmpty()) { + System.getProperties().putAll(portPropertiesToRestore); + } final AtomicInteger remainingCount = new AtomicInteger(0); if (httpServer != null) {

['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/12051/12043

quarkusio

quarkus

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

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

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

fixes

Unsatisfied dependency for type io.vertx.db2client.DB2Pool and qualifiers with Quarkus master, works with 1.8.0.Final

I see Unsatisfied dependency for type io.vertx.db2client.DB2Pool and qualifiers with Quarkus master (6588419c63) when running daily GH CI check on https://github.com/quarkus-qe/beefy-scenarios. Works well with 1.8.0.Final. ```java java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.arc.deployment.ArcProcessor#validate threw an exception: javax.enterprise.inject.spi.DeploymentException: javax.enterprise.inject.UnsatisfiedResolutionException: Unsatisfied dependency for type io.vertx.db2client.DB2Pool and qualifiers [@Default] - java member: io.quarkus.reactive.db2.client.runtime.DB2PoolProducer#db2Pool - declared on CLASS bean [types=[java.lang.Object, io.quarkus.reactive.db2.client.runtime.DB2PoolProducer], qualifiers=[@Default, @Any], target=io.quarkus.reactive.db2.client.runtime.DB2PoolProducer] at io.quarkus.arc.processor.BeanDeployment.processErrors(BeanDeployment.java:1018) at io.quarkus.arc.processor.BeanDeployment.init(BeanDeployment.java:238) at io.quarkus.arc.processor.BeanProcessor.initialize(BeanProcessor.java:122) at io.quarkus.arc.deployment.ArcProcessor.validate(ArcProcessor.java:393) 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:936) at io.quarkus.builder.BuildContext.run(BuildContext.java:277) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2046) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1578) 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:479) Caused by: javax.enterprise.inject.UnsatisfiedResolutionException: Unsatisfied dependency for type io.vertx.db2client.DB2Pool and qualifiers [@Default] - java member: io.quarkus.reactive.db2.client.runtime.DB2PoolProducer#db2Pool - declared on CLASS bean [types=[java.lang.Object, io.quarkus.reactive.db2.client.runtime.DB2PoolProducer], qualifiers=[@Default, @Any], target=io.quarkus.reactive.db2.client.runtime.DB2PoolProducer] at io.quarkus.arc.processor.Beans.resolveInjectionPoint(Beans.java:504) at io.quarkus.arc.processor.BeanInfo.init(BeanInfo.java:363) at io.quarkus.arc.processor.BeanDeployment.init(BeanDeployment.java:230) ... 14 more ``` Reproducer (expecting Quarkus master was built beforehand): ```bash git clone https://github.com/quarkus-qe/beefy-scenarios.git cd beefy-scenarios mvn clean verify -pl 002-quarkus-all-extensions ``` Running with Quarkus 1.8.0.Final works fine (`mvn clean verify -pl 002-quarkus-all-extensions/ -Dquarkus.platform.version=1.8.0.Final -Dquarkus-plugin.version=1.8.0.Final`).

7f61df425aeff2942daf2f20f98f1e9c20c82f3d

9bedfd477748d2b3607bb44faf275eaf79cf4101

https://github.com/quarkusio/quarkus/compare/7f61df425aeff2942daf2f20f98f1e9c20c82f3d...9bedfd477748d2b3607bb44faf275eaf79cf4101

diff --git a/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java b/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java index 5485b7909f5..c6120a44c8a 100644 --- a/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java +++ b/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java @@ -4,6 +4,7 @@ import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.SyntheticBeanBuildItem; +import io.quarkus.arc.processor.DotNames; import io.quarkus.datasource.common.runtime.DatabaseKind; import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig; import io.quarkus.datasource.runtime.DataSourcesRuntimeConfig; @@ -30,9 +31,24 @@ class ReactiveDB2ClientProcessor { + /** + * The producer needs to be produced in a separate method to avoid a circular dependency (the Vert.x instance creation + * consumes the AdditionalBeanBuildItems). + */ @BuildStep - AdditionalBeanBuildItem registerBean() { - return AdditionalBeanBuildItem.unremovableOf(DB2PoolProducer.class); + void poolProducer( + BuildProducer<AdditionalBeanBuildItem> additionalBeans, + DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig, + DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig) { + if (!createPool(dataSourcesBuildTimeConfig, dataSourceReactiveBuildTimeConfig)) { + return; + } + + additionalBeans.produce(new AdditionalBeanBuildItem.Builder() + .addBeanClass(DB2PoolProducer.class) + .setUnremovable() + .setDefaultScope(DotNames.APPLICATION_SCOPED) + .build()); } @BuildStep @@ -53,12 +69,7 @@ ServiceStartBuildItem build(BuildProducer<FeatureBuildItem> feature, // Make sure the DB2PoolProducer is initialized before the StartupEvent is fired ServiceStartBuildItem serviceStart = new ServiceStartBuildItem("reactive-db2-client"); - if (!dataSourcesBuildTimeConfig.defaultDataSource.dbKind.isPresent()) { - return serviceStart; - } - - if (!DatabaseKind.isDB2(dataSourcesBuildTimeConfig.defaultDataSource.dbKind.get()) - || !dataSourceReactiveBuildTimeConfig.enabled) { + if (!createPool(dataSourcesBuildTimeConfig, dataSourceReactiveBuildTimeConfig)) { return serviceStart; } @@ -82,8 +93,30 @@ ServiceStartBuildItem build(BuildProducer<FeatureBuildItem> feature, } @BuildStep - HealthBuildItem addHealthCheck(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig) { - return new HealthBuildItem("io.quarkus.reactive.db2.client.runtime.health.ReactiveDB2DataSourceHealthCheck", - dataSourcesBuildTimeConfig.healthEnabled); + void addHealthCheck( + BuildProducer<HealthBuildItem> healthChecks, + DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig, + DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig) { + if (!createPool(dataSourcesBuildTimeConfig, dataSourceReactiveBuildTimeConfig)) { + return; + } + + healthChecks + .produce(new HealthBuildItem("io.quarkus.reactive.db2.client.runtime.health.ReactiveDB2DataSourceHealthCheck", + dataSourcesBuildTimeConfig.healthEnabled)); + } + + private static boolean createPool(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig, + DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig) { + if (!dataSourcesBuildTimeConfig.defaultDataSource.dbKind.isPresent()) { + return false; + } + + if (!DatabaseKind.isDB2(dataSourcesBuildTimeConfig.defaultDataSource.dbKind.get()) + || !dataSourceReactiveBuildTimeConfig.enabled) { + return false; + } + + return true; } } diff --git a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolProducer.java b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolProducer.java index 7b0734a0516..581e27cfbd1 100644 --- a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolProducer.java +++ b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolProducer.java @@ -1,13 +1,11 @@ package io.quarkus.reactive.db2.client.runtime; -import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Singleton; import io.vertx.db2client.DB2Pool; -@ApplicationScoped public class DB2PoolProducer { @Inject diff --git a/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java b/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java index 231b72fc32b..8361db90854 100644 --- a/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java +++ b/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java @@ -4,6 +4,7 @@ import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.SyntheticBeanBuildItem; +import io.quarkus.arc.processor.DotNames; import io.quarkus.datasource.common.runtime.DatabaseKind; import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig; import io.quarkus.datasource.runtime.DataSourcesRuntimeConfig; @@ -28,12 +29,26 @@ import io.vertx.mysqlclient.MySQLPool; import io.vertx.sqlclient.Pool; -@SuppressWarnings("deprecation") class ReactiveMySQLClientProcessor { + /** + * The producer needs to be produced in a separate method to avoid a circular dependency (the Vert.x instance creation + * consumes the AdditionalBeanBuildItems). + */ @BuildStep - AdditionalBeanBuildItem registerBean() { - return AdditionalBeanBuildItem.unremovableOf(MySQLPoolProducer.class); + void poolProducer( + BuildProducer<AdditionalBeanBuildItem> additionalBeans, + DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig, + DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig) { + if (!createPool(dataSourcesBuildTimeConfig, dataSourceReactiveBuildTimeConfig)) { + return; + } + + additionalBeans.produce(new AdditionalBeanBuildItem.Builder() + .addBeanClass(MySQLPoolProducer.class) + .setUnremovable() + .setDefaultScope(DotNames.APPLICATION_SCOPED) + .build()); } @BuildStep @@ -54,13 +69,7 @@ ServiceStartBuildItem build(BuildProducer<FeatureBuildItem> feature, // Make sure the MySQLPoolProducer is initialized before the StartupEvent is fired ServiceStartBuildItem serviceStart = new ServiceStartBuildItem("reactive-mysql-client"); - if (!dataSourcesBuildTimeConfig.defaultDataSource.dbKind.isPresent()) { - return serviceStart; - } - - if ((!DatabaseKind.isMySQL(dataSourcesBuildTimeConfig.defaultDataSource.dbKind.get()) - && !DatabaseKind.isMariaDB(dataSourcesBuildTimeConfig.defaultDataSource.dbKind.get())) - || !dataSourceReactiveBuildTimeConfig.enabled) { + if (!createPool(dataSourcesBuildTimeConfig, dataSourceReactiveBuildTimeConfig)) { return serviceStart; } @@ -84,8 +93,31 @@ ServiceStartBuildItem build(BuildProducer<FeatureBuildItem> feature, } @BuildStep - HealthBuildItem addHealthCheck(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig) { - return new HealthBuildItem("io.quarkus.reactive.mysql.client.runtime.health.ReactiveMySQLDataSourceHealthCheck", - dataSourcesBuildTimeConfig.healthEnabled); + void addHealthCheck( + BuildProducer<HealthBuildItem> healthChecks, + DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig, + DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig) { + if (!createPool(dataSourcesBuildTimeConfig, dataSourceReactiveBuildTimeConfig)) { + return; + } + + healthChecks.produce( + new HealthBuildItem("io.quarkus.reactive.mysql.client.runtime.health.ReactiveMySQLDataSourceHealthCheck", + dataSourcesBuildTimeConfig.healthEnabled)); + } + + private static boolean createPool(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig, + DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig) { + if (!dataSourcesBuildTimeConfig.defaultDataSource.dbKind.isPresent()) { + return false; + } + + if ((!DatabaseKind.isMySQL(dataSourcesBuildTimeConfig.defaultDataSource.dbKind.get()) + && !DatabaseKind.isMariaDB(dataSourcesBuildTimeConfig.defaultDataSource.dbKind.get())) + || !dataSourceReactiveBuildTimeConfig.enabled) { + return false; + } + + return true; } } diff --git a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolProducer.java b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolProducer.java index a949a9e8119..5e74ebc088b 100644 --- a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolProducer.java +++ b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolProducer.java @@ -1,6 +1,5 @@ package io.quarkus.reactive.mysql.client.runtime; -import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Singleton; @@ -9,7 +8,6 @@ import io.vertx.mysqlclient.MySQLPool; -@ApplicationScoped public class MySQLPoolProducer { private static final Logger LOGGER = Logger.getLogger(MySQLPoolProducer.class); diff --git a/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java b/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java index 320d4308e51..e12f2d93026 100644 --- a/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java +++ b/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java @@ -4,6 +4,7 @@ import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.SyntheticBeanBuildItem; +import io.quarkus.arc.processor.DotNames; import io.quarkus.datasource.common.runtime.DatabaseKind; import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig; import io.quarkus.datasource.runtime.DataSourcesRuntimeConfig; @@ -29,12 +30,26 @@ import io.vertx.pgclient.PgPool; import io.vertx.sqlclient.Pool; -@SuppressWarnings("deprecation") class ReactivePgClientProcessor { + /** + * The producer needs to be produced in a separate method to avoid a circular dependency (the Vert.x instance creation + * consumes the AdditionalBeanBuildItems). + */ @BuildStep - AdditionalBeanBuildItem registerBean() { - return AdditionalBeanBuildItem.unremovableOf(PgPoolProducer.class); + void poolProducer( + BuildProducer<AdditionalBeanBuildItem> additionalBeans, + DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig, + DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig) { + if (!createPool(dataSourcesBuildTimeConfig, dataSourceReactiveBuildTimeConfig)) { + return; + } + + additionalBeans.produce(new AdditionalBeanBuildItem.Builder() + .addBeanClass(PgPoolProducer.class) + .setUnremovable() + .setDefaultScope(DotNames.APPLICATION_SCOPED) + .build()); } @BuildStep @@ -62,12 +77,7 @@ ServiceStartBuildItem build(BuildProducer<FeatureBuildItem> feature, // Make sure the PgPoolProducer is initialized before the StartupEvent is fired ServiceStartBuildItem serviceStart = new ServiceStartBuildItem("reactive-pg-client"); - if (!dataSourcesBuildTimeConfig.defaultDataSource.dbKind.isPresent()) { - return serviceStart; - } - - if (!DatabaseKind.isPostgreSQL(dataSourcesBuildTimeConfig.defaultDataSource.dbKind.get()) - || !dataSourceReactiveBuildTimeConfig.enabled) { + if (!createPool(dataSourcesBuildTimeConfig, dataSourceReactiveBuildTimeConfig)) { return serviceStart; } @@ -91,8 +101,29 @@ ServiceStartBuildItem build(BuildProducer<FeatureBuildItem> feature, } @BuildStep - HealthBuildItem addHealthCheck(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig) { - return new HealthBuildItem("io.quarkus.reactive.pg.client.runtime.health.ReactivePgDataSourceHealthCheck", - dataSourcesBuildTimeConfig.healthEnabled); + void addHealthCheck( + BuildProducer<HealthBuildItem> healthChecks, + DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig, + DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig) { + if (!createPool(dataSourcesBuildTimeConfig, dataSourceReactiveBuildTimeConfig)) { + return; + } + + healthChecks.produce(new HealthBuildItem("io.quarkus.reactive.pg.client.runtime.health.ReactivePgDataSourceHealthCheck", + dataSourcesBuildTimeConfig.healthEnabled)); + } + + private static boolean createPool(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig, + DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig) { + if (!dataSourcesBuildTimeConfig.defaultDataSource.dbKind.isPresent()) { + return false; + } + + if (!DatabaseKind.isPostgreSQL(dataSourcesBuildTimeConfig.defaultDataSource.dbKind.get()) + || !dataSourceReactiveBuildTimeConfig.enabled) { + return false; + } + + return true; } } diff --git a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolProducer.java b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolProducer.java index c997c62f1c1..c79bf0e51df 100644 --- a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolProducer.java +++ b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolProducer.java @@ -1,6 +1,5 @@ package io.quarkus.reactive.pg.client.runtime; -import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Singleton; @@ -9,7 +8,6 @@ import io.vertx.pgclient.PgPool; -@ApplicationScoped public class PgPoolProducer { private static final Logger LOGGER = Logger.getLogger(PgPoolProducer.class); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java index e91806b1ee6..7084fbc4619 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java @@ -12,6 +12,7 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.annotation.Priority; +import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Initialized; import javax.enterprise.context.control.ActivateRequestContext; import javax.enterprise.event.Event; @@ -82,6 +83,7 @@ public final class DotNames { public static final DotName ALTERNATIVE_PRIORITY = create(AlternativePriority.class); public static final DotName DEFAULT_BEAN = create(DefaultBean.class); public static final DotName SINGLETON = create(Singleton.class); + public static final DotName APPLICATION_SCOPED = create(ApplicationScoped.class); public static final DotName STEREOTYPE = create(Stereotype.class); public static final DotName TYPED = create(Typed.class); public static final DotName VETOED = create(Vetoed.class); @@ -117,7 +119,7 @@ private DotNames() { * Note that this method does not attempt to detect a nested class because the computing cache is shared with the * {@link #create(String)} variant and so the results would be inconsistent. Therefore, this method should only be used for * top-level classes. - * + * * @param clazz * @return the computed dot name */ @@ -129,7 +131,7 @@ static DotName create(Class<?> clazz) { * Note that the dollar sign is a valid character for class names so we cannot detect a nested class here. Therefore, this * method returns a dot name for which {@link DotName#local()} returns {@code Foo$Bar} for the parameter * "com.foo.Foo$Bar". - * + * * @param name * @return the computed dot name */ @@ -145,7 +147,7 @@ static DotName create(String name) { } /** - * + * * @param clazz * @return the simple name for the given top-level or nested class */ @@ -175,7 +177,7 @@ public static String simpleName(DotName dotName) { * method returns "Foo$Bar" for the parameter "com.foo.Foo$Bar". Use {@link #simpleName(ClassInfo)} when you need to * distinguish * the nested classes. - * + * * @param name * @return the simple name */

['extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java', 'extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolProducer.java', 'extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java', 'extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolProducer.java', 'extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolProducer.java', 'extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.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/11955/11944

quarkusio

quarkus

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

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

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

close

Gradle: Cannot push containers to multiple repositories due to task caching

**Describe the bug** Currently the `quarkus-container-image-jib` extension does not support multiple registry urls to push images to. Therefore I'm running the following command build & push images twice. ``` ./gradlew assemble -Dquarkus.container-image.push=true -Dquarkus.container-image.registry=$REGISTRY -Dquarkus.container-image.username=$REGISTRY_USER -Dquarkus.container-image.password=$REGISTRY_PASSWORD ``` However, when you run the command the second time, with a different registry, it is not executed due to gradle task caching. I think the push task should either not be cached or it should check if the registry url has changed. **Expected behavior** Running the build & push of jib container building with different registries should push the image to both registries. **Actual behavior** After the first run, the second time, the build&push task is seen as "UP TO DATE" by gradle and therefore not run for the second registry.

ee6296a65a5d78aacac623fff0ebb10909b63c8b

62a2315c3699258a9909007926a712d1b8851c4a

https://github.com/quarkusio/quarkus/compare/ee6296a65a5d78aacac623fff0ebb10909b63c8b...62a2315c3699258a9909007926a712d1b8851c4a

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java index f2f857f5054..8b7493f00b8 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java @@ -1,6 +1,7 @@ package io.quarkus.gradle.tasks; import java.io.File; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -78,6 +79,29 @@ public FileCollection getClasspath() { .plus(mainSourceSet.getResources()); } + @Input + public Map<Object, Object> getQuarkusBuildSystemProperties() { + Map<Object, Object> quarkusSystemProperties = new HashMap<>(); + for (Map.Entry<Object, Object> systemProperty : System.getProperties().entrySet()) { + if (systemProperty.getKey().toString().startsWith("quarkus.") && + systemProperty.getValue() instanceof Serializable) { + quarkusSystemProperties.put(systemProperty.getKey(), systemProperty.getValue()); + } + } + return quarkusSystemProperties; + } + + @Input + public Map<String, String> getQuarkusBuildEnvProperties() { + Map<String, String> quarkusEnvProperties = new HashMap<>(); + for (Map.Entry<String, String> systemProperty : System.getenv().entrySet()) { + if (systemProperty.getKey() != null && systemProperty.getKey().startsWith("QUARKUS_")) { + quarkusEnvProperties.put(systemProperty.getKey(), systemProperty.getValue()); + } + } + return quarkusEnvProperties; + } + @OutputFile public File getRunnerJar() { return new File(getProject().getBuildDir(), extension().finalName() + "-runner.jar"); diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java index d7291434b4c..ed23140ec1c 100644 --- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java +++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java @@ -133,6 +133,21 @@ public void canDetectOutputChangeWhenBuilding() throws Exception { assertThat(runnerJar).exists(); } + @Test + public void canDetectSystemPropertyChangeWhenBuilding() throws Exception { + createProject(SourceType.JAVA); + + BuildResult firstBuild = runGradleWrapper(projectRoot, "quarkusBuild", "--stacktrace"); + + assertThat(firstBuild.getTasks().get(":quarkusBuild")).isEqualTo(BuildResult.SUCCESS_OUTCOME); + assertThat(projectRoot.toPath().resolve("build").resolve("foo-1.0.0-SNAPSHOT-runner.jar")).exists(); + + BuildResult secondBuild = runGradleWrapper(projectRoot, "quarkusBuild", "-Dquarkus.package.type=fast-jar"); + + assertThat(secondBuild.getTasks().get(":quarkusBuild")).isEqualTo(BuildResult.SUCCESS_OUTCOME); + assertThat(projectRoot.toPath().resolve("build").resolve("quarkus-app")).exists(); + } + @Test public void canRunTest() throws Exception { createProject(SourceType.JAVA);

['devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java', 'integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.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/11808/11807

quarkusio

quarkus

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

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

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

closes

FormAuthenticationMechanism needs to handle exceptions to avoid requests without response.

Exceptions in `io.quarkus.vertx.http.runtime.security.PersistentLoginManager.save()` are not being handled correctly by the caller. This means that if an exception happens, the request will never be fulfilled. You can see this in action in #11768. `subscribe().with()` callback in `FormAuthenticationMechanism.runFormAuth` needs to check if any exceptions happen and fail the uni if so. I've got a patch for this already that I'll be sending shortly.

f23f4ca4f7b34e2121e2606ce59e2291749b5028

7bc0033bc423551d632ee4243886de462491bb60

https://github.com/quarkusio/quarkus/compare/f23f4ca4f7b34e2121e2606ce59e2291749b5028...7bc0033bc423551d632ee4243886de462491bb60

diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/FormAuthenticationMechanism.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/FormAuthenticationMechanism.java index e0b2e65a238..74d6962fb87 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/FormAuthenticationMechanism.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/FormAuthenticationMechanism.java @@ -74,17 +74,22 @@ public void handle(Void event) { .subscribe().with(new Consumer<SecurityIdentity>() { @Override public void accept(SecurityIdentity identity) { - loginManager.save(identity, exchange, null); - if (redirectAfterLogin || exchange.getCookie(locationCookie) != null) { - handleRedirectBack(exchange); - //we have authenticated, but we want to just redirect back to the original page - //so we don't actually authenticate the current request - //instead we have just set a cookie so the redirected request will be authenticated - } else { - exchange.response().setStatusCode(200); - exchange.response().end(); + try { + loginManager.save(identity, exchange, null); + if (redirectAfterLogin || exchange.getCookie(locationCookie) != null) { + handleRedirectBack(exchange); + //we have authenticated, but we want to just redirect back to the original page + //so we don't actually authenticate the current request + //instead we have just set a cookie so the redirected request will be authenticated + } else { + exchange.response().setStatusCode(200); + exchange.response().end(); + } + uniEmitter.complete(null); + } catch (Throwable t) { + log.error("Unable to complete post authentication", t); + uniEmitter.fail(t); } - uniEmitter.complete(null); } }, new Consumer<Throwable>() { @Override

['extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/FormAuthenticationMechanism.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/11936/11892

quarkusio

quarkus

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

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

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

fixes

Adding @IfBuildProfile("prod") annotation to one grpc service throws away all other services

**Describe the bug** I have multiple grpc services defined in my proto file and corresponding implementations in java code. If I mark one implementation with annotation `@IfBuildProfile("prod")` and run application with prod profile, all other services disappear, grpcurl shows only one single service which I marked with annotation. **Expected behavior** All defined services should still be available in application including annotated service and all unannotated ones. **Actual behavior** Application starts with just one grpc service, the one I marked with `@IfBuildProfile("prod")` annotation **To Reproduce** Steps to reproduce the behavior: 1. Create two services in your proto file. Implement them In application. Run and check that both services are available (by calling them or by listing with `./grpcurl -plaintext localhost:9000 list` 2. Mark one service with `@IfBuildProfile("prod")` annotation 3. Run application with prod profile and try to call unmarked service. It will fail. Or try listing with `./grpcurl -plaintext localhost:9000 list` and you will see only one service (don't forget about `quarkus.grpc.server.enable-reflection-service = true`) **Configuration** ```properties # Add your application.properties here, if applicable. quarkus.grpc.server.port = 9000 quarkus.grpc.server.enable-reflection-service = true ``` **Environment (please complete the following information):** - Quarkus version or git rev: 1.7.1.Final **Additional context** My digging shows that `io.quarkus.grpc.runtime.GrpcContainer` injects services as `Instance<BindableService> services;` If any of the BindableService beans have some priority set it is prioritized over other BindableServices and all other services are thrown away. IfBuildProfile annotation is counted as "alternative priority" and it survives filtering in `ArcContainerImpl.resolve(Set<Bean<? extends X>> beans)` method

180b01fc6404e9b51bb416accb668354cfb196ab

ba1315f571c391f7356aeec8ed7c6b6405e2116e

https://github.com/quarkusio/quarkus/compare/180b01fc6404e9b51bb416accb668354cfb196ab...ba1315f571c391f7356aeec8ed7c6b6405e2116e

diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeEnabledProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeEnabledProcessor.java index d93b1788df7..596f1437b7a 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeEnabledProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeEnabledProcessor.java @@ -18,6 +18,7 @@ import org.jboss.logging.Logger; import io.quarkus.arc.processor.AnnotationsTransformer; +import io.quarkus.arc.processor.AnnotationsTransformer.TransformationContext; import io.quarkus.arc.processor.DotNames; import io.quarkus.arc.processor.Transformation; import io.quarkus.arc.profile.IfBuildProfile; @@ -146,18 +147,18 @@ public void transform(TransformationContext ctx) { if (ctx.isClass()) { DotName classDotName = target.asClass().name(); if (classTargets.containsKey(classDotName)) { - transformBean(target, ctx.transform(), classTargets.get(classDotName)); + transformBean(target, ctx, classTargets.get(classDotName)); } } else if (ctx.isMethod()) { MethodInfo method = target.asMethod(); if (methodTargets.containsKey(method)) { - transformBean(target, ctx.transform(), methodTargets.get(method)); + transformBean(target, ctx, methodTargets.get(method)); } } else if (ctx.isField()) { FieldInfo field = target.asField(); String uniqueFieldName = toUniqueString(field); if (fieldTargets.containsKey(uniqueFieldName)) { - transformBean(target, ctx.transform(), fieldTargets.get(uniqueFieldName)); + transformBean(target, ctx, fieldTargets.get(uniqueFieldName)); } } } @@ -168,32 +169,18 @@ private String toUniqueString(FieldInfo field) { return field.declaringClass().name().toString() + "." + field.name(); } - private void transformBean(AnnotationTarget target, Transformation transform, boolean enable) { - if (enable) { - enableBean(transform); - } else { - disableBean(target, transform); + private void transformBean(AnnotationTarget target, TransformationContext ctx, boolean enabled) { + if (!enabled) { + Transformation transform = ctx.transform(); + if (target.kind() == Kind.CLASS) { + // Veto the class + transform.add(DotNames.VETOED); + } else { + // Add @Alternative to the producer + transform.add(DotNames.ALTERNATIVE); + } + transform.done(); } - transform.done(); - } - - private void enableBean(Transformation transform) { - transform.add(DotNames.ALTERNATIVE_PRIORITY, - createAlternativePriority()); } - private AnnotationValue createAlternativePriority() { - // use Integer.MAX_VALUE - 1 to avoid having conflicts with enabling beans via config - return AnnotationValue.createIntegerValue("value", Integer.MAX_VALUE - 1); - } - - private void disableBean(AnnotationTarget target, Transformation transform) { - if (target.kind() == Kind.CLASS) { - // Veto the class - transform.add(DotNames.VETOED); - } else { - // Add @Alternative to the producer - transform.add(DotNames.ALTERNATIVE); - } - } }

['extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeEnabledProcessor.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/11930/11647

quarkusio

quarkus

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

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

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

fixes

Fast-Jar + quarkus.arc.remove-unused-beans=false causes ClassNotFoundException

**Describe the bug** The exact issue is easy to reproduce with the standard quarkus start project. 1. Add the following depnednecy to the pom.xml: ``` <dependency> <groupId>org.apache.myfaces.core.extensions.quarkus</groupId> <artifactId>myfaces-quarkus</artifactId> <version>2.3-next-M3</version> </dependency> ``` 2. Add the following combination of settings to the application.properties: ``` quarkus.package.type=fast-jar quarkus.arc.remove-unused-beans=false ``` 3. mvn package && java -jar target/quarkus-app/quarkus-run.jar **Expected behavior** The application should start without problems **Actual behavior** ``` Exception in thread "main" java.lang.reflect.InvocationTargetException at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at io.quarkus.bootstrap.runner.QuarkusEntryPoint.doRun(QuarkusEntryPoint.java:43) at io.quarkus.bootstrap.runner.QuarkusEntryPoint.main(QuarkusEntryPoint.java:24) Caused by: java.lang.ExceptionInInitializerError at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.lang.reflect.Constructor.newInstance(Constructor.java:423) at java.lang.Class.newInstance(Class.java:442) at io.quarkus.runtime.Quarkus.run(Quarkus.java:60) at io.quarkus.runtime.Quarkus.run(Quarkus.java:38) at io.quarkus.runtime.Quarkus.run(Quarkus.java:106) at io.quarkus.runner.GeneratedMain.main(GeneratedMain.zig:29) ... 6 more Caused by: java.lang.RuntimeException: Failed to start quarkus at io.quarkus.runner.ApplicationImpl.<clinit>(ApplicationImpl.zig:222) ... 15 more Caused by: java.lang.RuntimeException: Failed to initialize Arc at io.quarkus.arc.Arc.initialize(Arc.java:26) at io.quarkus.arc.runtime.ArcRecorder.getContainer(ArcRecorder.java:35) at io.quarkus.deployment.steps.ArcProcessor$generateResources1649676420.deploy_0(ArcProcessor$generateResources1649676420.zig:76) at io.quarkus.deployment.steps.ArcProcessor$generateResources1649676420.deploy(ArcProcessor$generateResources1649676420.zig:40) at io.quarkus.runner.ApplicationImpl.<clinit>(ApplicationImpl.zig:180) ... 15 more Caused by: java.lang.NoClassDefFoundError: javax/servlet/ServletContext_8154c10ea529795d38da9083f05136178578d788_Synthetic_Bean at io.quarkus.arc.setup.Default_ComponentsProvider.addBeans3(Default_ComponentsProvider.zig:1352) at io.quarkus.arc.setup.Default_ComponentsProvider.getComponents(Default_ComponentsProvider.zig:48) at io.quarkus.arc.impl.ArcContainerImpl.<init>(ArcContainerImpl.java:109) at io.quarkus.arc.Arc.initialize(Arc.java:20) ... 19 more Caused by: java.lang.ClassNotFoundException: javax.servlet.ServletContext_8154c10ea529795d38da9083f05136178578d788_Synthetic_Bean at java.net.URLClassLoader.findClass(URLClassLoader.java:381) at java.lang.ClassLoader.loadClass(ClassLoader.java:424) at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:335) at java.lang.ClassLoader.loadClass(ClassLoader.java:357) at io.quarkus.bootstrap.runner.RunnerClassLoader.loadClass(RunnerClassLoader.java:56) at io.quarkus.bootstrap.runner.RunnerClassLoader.loadClass(RunnerClassLoader.java:43) ... 23 more ``` I am unsure if the issue is with the myfaces quarkus extension in specific, but at least i see the problem when i use it. The exception goes away when i either remove the myfaces dependency, or do not build a fast jar. So, building and running the regular runner-jar works without problem. **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Linux dev-vm.local 3.10.0-862.11.6.el7.x86_64 #1 SMP Tue Aug 14 21:49:04 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux - Output of `java -version`: java version "1.8.0_151" Java(TM) SE Runtime Environment (build 1.8.0_151-b12) Java HotSpot(TM) 64-Bit Server VM (build 25.151-b12, mixed mode) - Quarkus version or git rev: 1.7.0.Final - Build tool (ie. output of `mvnw --version` or `gradlew --version`): Apache Maven 3.6.3

65c5a32e6b26b0351965818fc58d5db64566cea4

527ec857d81c0ace17244d98319a0963c7dbfb9a

https://github.com/quarkusio/quarkus/compare/65c5a32e6b26b0351965818fc58d5db64566cea4...527ec857d81c0ace17244d98319a0963c7dbfb9a

diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java index d6bf167acdb..43d3c2f9c4a 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java @@ -53,7 +53,11 @@ public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundExce } String packageName = getPackageNameFromClassName(name); if (parentFirstPackages.contains(packageName)) { - return getParent().loadClass(name); + try { + return getParent().loadClass(name); + } catch (ClassNotFoundException e) { + //fall through + } } synchronized (getClassLoadingLock(name)) { Class<?> loaded = findLoadedClass(name);

['independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.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/11928/11857

quarkusio

quarkus

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

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

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

fixes

quarkus.debug.transformed-classes-dir does not work anymore

This regression was introduced in: https://github.com/quarkusio/quarkus/commit/9d3fa16a74c1b9354352843aab28ce71b3c95350#diff-db1d39a812769ff88e14c8dd8e39c0c4

2a6241b7bbb8dcb6e7523e58dd8cc53d1b9630e7

7e05c1acc4752ede4c7ec18ec6d4ec325106d300

https://github.com/quarkusio/quarkus/compare/2a6241b7bbb8dcb6e7523e58dd8cc53d1b9630e7...7e05c1acc4752ede4c7ec18ec6d4ec325106d300

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java index b561d6ce92e..3277275a2d0 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java @@ -1,5 +1,7 @@ package io.quarkus.deployment.steps; +import java.io.File; +import java.io.FileOutputStream; import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; @@ -22,6 +24,7 @@ import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassWriter; +import io.quarkus.bootstrap.BootstrapDebug; import io.quarkus.bootstrap.classloading.ClassPathElement; import io.quarkus.bootstrap.classloading.QuarkusClassLoader; import io.quarkus.deployment.QuarkusClassWriter; @@ -104,7 +107,22 @@ public TransformedClassesBuildItem.TransformedClass call() throws Exception { visitor = i.apply(className, visitor); } cr.accept(visitor, 0); - return new TransformedClassesBuildItem.TransformedClass(className, writer.toByteArray(), + byte[] data = writer.toByteArray(); + if (BootstrapDebug.DEBUG_TRANSFORMED_CLASSES_DIR != null) { + File debugPath = new File(BootstrapDebug.DEBUG_TRANSFORMED_CLASSES_DIR); + if (!debugPath.exists()) { + debugPath.mkdir(); + } + File classFile = new File(debugPath, className.replace(".", "/") + ".class"); + classFile.getParentFile().mkdirs(); + try (FileOutputStream classWriter = new FileOutputStream(classFile)) { + classWriter.write(data); + } catch (Exception e) { + log.errorf(e, "Failed to write transformed class %s", className); + } + log.infof("Wrote transformed class to %s", classFile.getAbsolutePath()); + } + return new TransformedClassesBuildItem.TransformedClass(className, data, classFileName, eager.contains(className)); } finally { Thread.currentThread().setContextClassLoader(old);

['core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.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/11854/11853

quarkusio

quarkus

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

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

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

fixes

Quarkus cli test failing

**Describe the bug** The `io.quarkus.cli.CliTest.testAddListRemove` is failing unrelated to the changes I was working on https://github.com/quarkusio/quarkus/pull/11852 https://github.com/quarkusio/quarkus/runs/1066539001 **Expected behavior** The test to pass. **Actual behavior** ```log [ERROR] Tests run: 7, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 169.318 s <<< FAILURE! - in io.quarkus.cli.CliTest [ERROR] io.quarkus.cli.CliTest.testAddListRemove Time elapsed: 1.703 s <<< FAILURE! org.opentest4j.AssertionFailedError: expected: <quarkus-resteasy> but was: <> at org.junit.jupiter.api.AssertionUtils.fail(AssertionUtils.java:55) at org.junit.jupiter.api.AssertionUtils.failNotEqual(AssertionUtils.java:62) at org.junit.jupiter.api.AssertEquals.assertEquals(AssertEquals.java:182) at org.junit.jupiter.api.AssertEquals.assertEquals(AssertEquals.java:177) at org.junit.jupiter.api.Assertions.assertEquals(Assertions.java:1124) at io.quarkus.cli.CliTest.testAddListRemove(CliTest.java:90) 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:564) at org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:686) ```

66acdbf31ce276d2806aee67fa72ad441fda0149

37b1e1d72ba412723d4f2dc66c52cee0765fb3e7

https://github.com/quarkusio/quarkus/compare/66acdbf31ce276d2806aee67fa72ad441fda0149...37b1e1d72ba412723d4f2dc66c52cee0765fb3e7

diff --git a/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptor.java b/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptor.java index 2ff1acb8385..456c26eab6b 100644 --- a/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptor.java +++ b/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptor.java @@ -73,7 +73,7 @@ void setQuarkusVersion(String quarkusVersion) { } private MessageWriter getLog() { - return log == null ? log = MessageWriter.DEFAULT : log; + return log == null ? log = MessageWriter.info() : log; } @Override diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartInputBuilder.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartInputBuilder.java index 51de75f3990..545736cae36 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartInputBuilder.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartInputBuilder.java @@ -14,7 +14,7 @@ public class CodestartInputBuilder { Collection<AppArtifactKey> dependencies = new ArrayList<>(); Collection<String> codestarts = new ArrayList<>(); Map<String, Object> data = new HashMap<>(); - MessageWriter messageWriter = MessageWriter.DEFAULT; + MessageWriter messageWriter = MessageWriter.info(); CodestartInputBuilder(CodestartResourceLoader resourceLoader) { this.resourceLoader = resourceLoader; diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartProcessorTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartProcessorTest.java index 2cd845e06db..08367ee191c 100644 --- a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartProcessorTest.java +++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartProcessorTest.java @@ -20,7 +20,7 @@ void checkSelectedDefaultStrategy() { spec.put("*", "replace"); final CodestartProcessor processor = new CodestartProcessor( - MessageWriter.DEFAULT, + MessageWriter.info(), Mockito.mock(CodestartResourceLoader.class), "a", Paths.get("test"), @@ -37,7 +37,7 @@ void checkDefaultStrategy() { spec.put("test/foo.tt", "forbidden"); final CodestartProcessor processor = new CodestartProcessor( - MessageWriter.DEFAULT, + MessageWriter.info(), Mockito.mock(CodestartResourceLoader.class), "a", Paths.get("test"), diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java index f8824e4f723..4470fa21e42 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java @@ -18,7 +18,7 @@ public QuarkusCommandInvocation(QuarkusProject quarkusProject) { } public QuarkusCommandInvocation(final QuarkusProject quarkusProject, final Map<String, Object> values) { - this(quarkusProject, values, MessageWriter.DEFAULT); + this(quarkusProject, values, MessageWriter.info()); } public QuarkusCommandInvocation(final QuarkusProject quarkusProject, final Map<String, Object> values, diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/QuarkusJsonPlatformDescriptorLoaderContext.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/QuarkusJsonPlatformDescriptorLoaderContext.java index 5d6d4c21111..56e316c529b 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/QuarkusJsonPlatformDescriptorLoaderContext.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/QuarkusJsonPlatformDescriptorLoaderContext.java @@ -12,7 +12,7 @@ public abstract class QuarkusJsonPlatformDescriptorLoaderContext implements Quar protected final ResourceLoader resourceLoader; public QuarkusJsonPlatformDescriptorLoaderContext(ArtifactResolver artifactResolver) { - this(artifactResolver, MessageWriter.DEFAULT); + this(artifactResolver, MessageWriter.info()); } public QuarkusJsonPlatformDescriptorLoaderContext(ArtifactResolver artifactResolver, MessageWriter log) { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/config/QuarkusPlatformConfig.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/config/QuarkusPlatformConfig.java index 9c3ed94512f..30517d22ddc 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/config/QuarkusPlatformConfig.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/config/QuarkusPlatformConfig.java @@ -31,7 +31,7 @@ public Builder setMessageWriter(MessageWriter msgWriter) { } private MessageWriter getMessageWriter() { - return log == null ? log = MessageWriter.DEFAULT : log; + return log == null ? log = MessageWriter.info() : log; } public Builder setPlatformDescriptor(QuarkusPlatformDescriptor platformDescr) { diff --git a/independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/MessageWriter.java b/independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/MessageWriter.java index 4fb31a47375..a5e8cb8252a 100644 --- a/independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/MessageWriter.java +++ b/independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/MessageWriter.java @@ -4,8 +4,6 @@ public interface MessageWriter { - MessageWriter DEFAULT = info(); - static MessageWriter info() { return new DefaultMessageWriter(); } diff --git a/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/QuarkusJsonPlatformDescriptorResolver.java b/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/QuarkusJsonPlatformDescriptorResolver.java index 26ff5338c74..1e1e753b317 100644 --- a/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/QuarkusJsonPlatformDescriptorResolver.java +++ b/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/QuarkusJsonPlatformDescriptorResolver.java @@ -176,7 +176,7 @@ public QuarkusPlatformDescriptor resolveBundled() { private void ensureLoggerInitialized() { if (log == null) { - log = MessageWriter.DEFAULT; + log = MessageWriter.info(); } } diff --git a/independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/QuarkusJsonPlatformDescriptorResolverTest.java b/independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/QuarkusJsonPlatformDescriptorResolverTest.java index 8438e602944..5c316204287 100644 --- a/independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/QuarkusJsonPlatformDescriptorResolverTest.java +++ b/independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/QuarkusJsonPlatformDescriptorResolverTest.java @@ -25,7 +25,7 @@ public class QuarkusJsonPlatformDescriptorResolverTest extends ResolverSetupClea private static Path testDir; - private MessageWriter log = MessageWriter.DEFAULT; + private MessageWriter log = MessageWriter.info(); @BeforeEach @Override

['independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartInputBuilder.java', 'independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartProcessorTest.java', 'independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java', 'independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/QuarkusJsonPlatformDescriptorLoaderContext.java', 'independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/QuarkusJsonPlatformDescriptorResolverTest.java', 'independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/config/QuarkusPlatformConfig.java', 'devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptor.java', 'independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/QuarkusJsonPlatformDescriptorResolver.java', 'independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/MessageWriter.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/11825/11815

quarkusio

quarkus

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

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

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

fixes

Range check makes the release fail

https://github.com/quarkusio/quarkus/pull/11259/files doesn't work when doing the release. I will revert it for now in the 1.8 branch. ``` [ERROR] AddExtensionMojoTest.testAddMultipleDependency:65 » MojoExecution Failed to in... [ERROR] AddExtensionMojoTest.testAddSingleDependency:51 » MojoExecution Failed to init... [ERROR] AddExtensionsMojoTest>AddExtensionMojoTest.testAddMultipleDependency:65 » MojoExecution [ERROR] AddExtensionsMojoTest>AddExtensionMojoTest.testAddSingleDependency:51 » MojoExecution ``` ``` Caused by: java.lang.IllegalStateException: Failed to load the bundled platform artifacts at io.quarkus.platform.descriptor.resolver.json.QuarkusJsonPlatformDescriptorResolver.resolveJsonArtifactFromBom(QuarkusJsonPlatformDescriptorResolver.java:367) at io.quarkus.platform.descriptor.resolver.json.QuarkusJsonPlatformDescriptorResolver.resolveJsonDescriptor(QuarkusJsonPlatformDescriptorResolver.java:233) at io.quarkus.platform.descriptor.resolver.json.QuarkusJsonPlatformDescriptorResolver.resolve(QuarkusJsonPlatformDescriptorResolver.java:158) at io.quarkus.platform.descriptor.resolver.json.QuarkusJsonPlatformDescriptorResolver.resolveLatestFromBom(QuarkusJsonPlatformDescriptorResolver.java:128) at io.quarkus.maven.CreateUtils.resolvePlatformDescriptor(CreateUtils.java:101) at io.quarkus.maven.QuarkusProjectMojoBase.resolvePlatformDescriptor(QuarkusProjectMojoBase.java:112) ... 68 more Caused by: io.quarkus.platform.descriptor.resolver.json.VersionNotAvailableException: Failed to resolve the latest version of io.quarkus:quarkus-bom::pom:[1.8-snapshot, 1.9) at io.quarkus.platform.descriptor.resolver.json.QuarkusJsonPlatformDescriptorResolver.loadFromBomCoords(QuarkusJsonPlatformDescriptorResolver.java:387) at io.quarkus.platform.descriptor.resolver.json.QuarkusJsonPlatformDescriptorResolver.resolveJsonArtifactFromBom(QuarkusJsonPlatformDescriptorResolver.java:364) ... 73 more ```

cabdee4ad35c2a65f71bc5339530dcd663755773

dbf6014c6ff36628bd5ca956a3847a193fee9fc3

https://github.com/quarkusio/quarkus/compare/cabdee4ad35c2a65f71bc5339530dcd663755773...dbf6014c6ff36628bd5ca956a3847a193fee9fc3

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateUtils.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateUtils.java index 20677c4ffcc..495267a6a7d 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/CreateUtils.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateUtils.java @@ -85,9 +85,8 @@ static QuarkusPlatformDescriptor resolvePlatformDescriptor(final String bomGroup DefaultArtifactVersion pluginVersion = new DefaultArtifactVersion(baseVersion); int majorVer = pluginVersion.getMajorVersion(); int minorVer = pluginVersion.getMinorVersion(); - version = "[" + majorVer + "." + minorVer + "-snapshot, " + majorVer + "." + (minorVer + 1) + ")"; + version = "[" + majorVer + "." + minorVer + "-alpha, " + majorVer + "." + (minorVer + 1) + ")"; } - } final QuarkusPlatformDescriptor platform;

['devtools/maven/src/main/java/io/quarkus/maven/CreateUtils.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/11817/11806

quarkusio

quarkus

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

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

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

fixes

Serialization of RestEasy JAXB wrapped collections fails in native mode

**Describe the bug** When using the `org.jboss.resteasy.annotations.providers.jaxb.Wrapped` annotation in JAX-RS resource to force a specific Collection wrapping XML tag, the collection it not serialized in native mode. However it works as expected in JVM mode. I use the following code: ```java @GET @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_XML}) @Wrapped(element="pastries") public List<Pastry> getPastries() { return PastryRepository.getPastries(); } ``` **Expected behavior** When calling my REST endpoint, I expect something like: ```xml <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <pastries> <pastry><name>Tartelette Fraise</name><price>2.0</price><size>S</size><status>available</status></pastry> <pastry><name>Eclair Cafe</name><price>2.5</price><size>M</size><status>available</status></pastry> <pastry><name>Millefeuille</name><price>4.4</price><size>L</size><status>available</status></pastry> </pastries> ``` and that's the result I have when testing in JVM mode. **Actual behavior** When running in native mode, I have the following result: ```xml <?xml version="1.0" encoding="UTF-8" standalone="yes"?><pastries/> ``` When calling REST endpoint that returns single entity (ex: `/pastry/{name}`), JAXB serialization works as expected even in native mode. **To Reproduce** Steps to reproduce the behavior: 1. Create a `Pastry` bean annotated with `@RegisterForReflection` and `@XmlRootElement` 2. Create a JAX-RS `PastryResource` with a method annotated with `@Wrapped(element="pastries")` and returning a List of Pastry 3. Compile your app in native mode and invoke the JAX-RS endpoint. I have a demo project here: https://github.com/microcks/api-lifecycle/tree/master/api-pastry-demo/api-implementations/quarkus-api-pastry but it already contains the workaround I found (see below). You will have to remove it first for reproducing the failure. **Configuration** No properties added. **Environment:** - Output of `uname -a` or `ver`: `Darwin lbroudou1-mac 18.7.0 Darwin Kernel Version 18.7.0: Tue Aug 20 16:57:14 PDT 2019; root:xnu-4903.271.2~2/RELEASE_X86_64 x86_64` - Output of `java -version`: `OpenJDK Runtime Environment AdoptOpenJDK (build 11.0.8+10)` - GraalVM version (if different from Java): used the docker image for native compilation - Quarkus version or git rev: `1.7.1.Final` - Build tool (ie. output of `mvnw --version` or `gradlew --version`): `Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)` **Workaround** Found a workaround by adding a `reflection-config.json` file and the adhoc native compilation flag. Once added the annotation is well managed in native mode and the serialization works as expected. ```json [ { "name" : "org.jboss.resteasy.plugins.providers.jaxb.JaxbCollection", "allDeclaredConstructors" : true, "allPublicConstructors" : true, "allDeclaredMethods" : true, "allPublicMethods" : true, "allDeclaredFields" : true, "allPublicFields" : true }, { "name" : "javax.xml.bind.annotation.W3CDomHandler", "allDeclaredConstructors" : true, "allPublicConstructors" : true, "allDeclaredMethods" : true, "allPublicMethods" : true, "allDeclaredFields" : true, "allPublicFields" : true } ] ``` I think that this setup should be managed within `resteasy-jaxb` extension as this is a common use-case in RestEasy. If that makes sense for you, I could contribute a PR.

cabdee4ad35c2a65f71bc5339530dcd663755773

b318c9030c8cd5ca2b93d7b1cda5596d8f4ffa89

https://github.com/quarkusio/quarkus/compare/cabdee4ad35c2a65f71bc5339530dcd663755773...b318c9030c8cd5ca2b93d7b1cda5596d8f4ffa89

diff --git a/extensions/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java b/extensions/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java index efa692c91b4..f9492324c8e 100755 --- a/extensions/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java +++ b/extensions/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java @@ -1,14 +1,52 @@ package io.quarkus.resteasy.jaxb.deployment; +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.List; + +import org.jboss.jandex.DotName; +import org.jboss.jandex.IndexView; +import org.jboss.resteasy.annotations.providers.jaxb.Wrapped; +import org.jboss.resteasy.annotations.providers.jaxb.WrappedMap; + import io.quarkus.deployment.Feature; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; public class ResteasyJaxbProcessor { + private static final List<Class<? extends Annotation>> RESTEASY_JAXB_ANNOTATIONS = Arrays.asList( + Wrapped.class, + WrappedMap.class); + + @BuildStep + void processAnnotations(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, + CombinedIndexBuildItem combinedIndexBuildItem) { + IndexView index = combinedIndexBuildItem.getIndex(); + + // Handle RESTEasy annotations usage. + for (Class annotationClazz : RESTEASY_JAXB_ANNOTATIONS) { + DotName annotation = DotName.createSimple(annotationClazz.getName()); + + if (!index.getAnnotations(annotation).isEmpty()) { + addReflectiveClass(reflectiveClass, true, true, "org.jboss.resteasy.plugins.providers.jaxb.JaxbCollection"); + addReflectiveClass(reflectiveClass, true, true, "org.jboss.resteasy.plugins.providers.jaxb.JaxbMap"); + addReflectiveClass(reflectiveClass, true, true, "javax.xml.bind.annotation.W3CDomHandler"); + break; + } + } + } + @BuildStep void build(BuildProducer<FeatureBuildItem> feature) { feature.produce(new FeatureBuildItem(Feature.RESTEASY_JAXB)); } + + private void addReflectiveClass(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, boolean methods, boolean fields, + String... className) { + reflectiveClass.produce(new ReflectiveClassBuildItem(methods, fields, className)); + } } diff --git a/extensions/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java b/extensions/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java index f1e44da341e..bb04058c164 100644 --- a/extensions/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java +++ b/extensions/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java @@ -1,11 +1,18 @@ package io.quarkus.resteasy.jaxb.deployment; +import static org.hamcrest.Matchers.is; + +import java.util.Arrays; +import java.util.List; + import javax.ws.rs.Consumes; +import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.jboss.resteasy.annotations.providers.jaxb.Wrapped; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; @@ -34,6 +41,15 @@ public void testProducesXML() { .contentType(MediaType.APPLICATION_XML) .extract().as(Bar.class); Assertions.assertEquals(new Bar("open", "bar"), res); + + RestAssured.given() + .contentType(ContentType.TEXT) + .when().get("/foo") + .then() + .log().ifValidationFails() + .statusCode(200) + .contentType(MediaType.APPLICATION_XML) + .body("bars.bar.size()", is(2)); } @Path("/foo") @@ -46,6 +62,14 @@ public Bar post(String bar) { final String[] s = bar.split(" "); return new Bar(s[0], s[1]); } - } + @GET + @Consumes(MediaType.TEXT_PLAIN) + @Produces(MediaType.APPLICATION_XML) + @Wrapped(element = "bars") + public List<Bar> list() { + return Arrays.asList(new Bar("name_1", "description_1"), + new Bar("name_2", "description_2")); + } + } }

['extensions/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java', 'extensions/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java']

{'.java': 2}