Datasets:

tiginamaria

/

bug-localization

like 2

quarkusio/quarkus/3125/3091

quarkusio

quarkus

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

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

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

fixes

No redirect to index.html in subdirectory when running as uberjar

**Describe the bug** I have a custom index.html in my /src/main/resources/META-INF/resources/subdirectory/ directory. I get automaticly redirected to this index.html, when I run the quarkus using quarkus:dev, and access localhost:8080/subdirectory. Running as uberjar, when I try to access the "localhost:8080/subdirectory" page, i get a Not Found Error. **Expected behavior** index.html is automaticly used when i just access "localhost:8080/subdirectory", in quarkus:dev and uberjar mode. quarkus:dev should at least have the same behavior in that regard to running as jar. **Actual behavior** index.html does not get used automaticly when running as uberjar. **To Reproduce** Steps to reproduce the behavior: 1. Create a new project, with an index.html in /src/main/resources/META-INF/resources/subdirectory/ 2. Run usin "compile quarkus:dev" 3. Access localhost:8080/subdirectory 4. You get automaticly redirected to the index 5. Build the project as uberjar. 6. Start the jar 7. Access localhost:8080/subdirectory 8. You do not get automaticly redirected to the index **Environment (please complete the following information):** - MSYS_NT-10.0 NANB7NLNVP2 2.10.0(0.325/5/3) 2018-06-13 23:34 x86_64 Msys - java version "1.8.0_211" -- Java(TM) SE Runtime Environment (build 1.8.0_211-b12) -- Java HotSpot(TM) 64-Bit Server VM (build 25.211-b12, mixed mode) - Quarkus 0.18.0

83354368cf1eb8bac61b68d3de17bccb7c85a2b0

2234e3e6014d5b6f971d05b824d5c5536a4f1378

https://github.com/quarkusio/quarkus/compare/83354368cf1eb8bac61b68d3de17bccb7c85a2b0...2234e3e6014d5b6f971d05b824d5c5536a4f1378

diff --git a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowStaticResourcesBuildStep.java b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowStaticResourcesBuildStep.java index bdc6a79c615..251fef00654 100644 --- a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowStaticResourcesBuildStep.java +++ b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowStaticResourcesBuildStep.java @@ -60,7 +60,7 @@ public void accept(Path path) { return; } Path rel = resource.relativize(path); - if (Files.isDirectory(rel)) { + if (Files.isDirectory(path)) { knownDirectories.add(rel.toString()); } else { knownFiles.add(rel.toString());

['extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowStaticResourcesBuildStep.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/3508/3462

quarkusio

quarkus

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

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

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

fixes

TypeNotPresentException during entity augmentation

**Describe the bug** I'm seeing Maven build failures from the package phase (and later phases) due to entity class augmentation failures. **Expected behavior** Jar files are created for the project. **Actual behavior** No jar files are created. This is failing on an entity that is catching a `NoResultException` or a `NonUniqueResultException`. These classes are in the dependency tree of the project, and show up in the class path and constructed class loader during the build. **To Reproduce** Run `./mvnw clean package` on the attached example project. **Screenshots** ``` [INFO] [io.quarkus.deployment.QuarkusAugmentor] Quarkus augmentation completed in 2155ms [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 7.066 s [INFO] Finished at: 2019-08-08T10:03:17-04:00 [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal io.quarkus:quarkus-maven-plugin:0.20.0:build (default) on project getting-started: Failed to build a runnable JAR: Failed to build a runner jar: Failed to augment application classes: java.lang.TypeNotPresentException: Type javax/persistence/NoResultException not present: javax.persistence.NoResultException -> [Help 1] ``` **Environment (please complete the following information):** - Output of `uname -a` or `ver`: `Linux **** 5.0.0-23-generic #24-Ubuntu SMP Mon Jul 29 15:36:44 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux` - Output of `java -version`: ``` openjdk version "11.0.4" 2019-07-16 OpenJDK Runtime Environment (build 11.0.4+11-post-Ubuntu-1ubuntu219.04) OpenJDK 64-Bit Server VM (build 11.0.4+11-post-Ubuntu-1ubuntu219.04, mixed mode, sharing) ``` - GraalVM version (if different from Java): n/a (not using GraalVM) - Quarkus version or git rev: 0.20.0 **Additional context** It looks like when `HibernateEnhancingClassVisitor` is constructed, it does not pass along the class loader to the new instance of `ClassWriter`. It somehow gets a different class loader, which knows nothing about the carefully constructed class loader from Quarkus, so it throws a `ClassNotFound` exception when it processes the entity class, trying to find `NoResultException` or `NonUniqueResultException`.

2c7975034ad4ac02513d1b6af38e53cf5a3d73a7

1d97e23526eeac603dccc1fdbc7368fc1c70bf19

https://github.com/quarkusio/quarkus/compare/2c7975034ad4ac02513d1b6af38e53cf5a3d73a7...1d97e23526eeac603dccc1fdbc7368fc1c70bf19

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/QuarkusClassWriter.java b/core/deployment/src/main/java/io/quarkus/deployment/QuarkusClassWriter.java index 198829dc44c..1b32a46a504 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/QuarkusClassWriter.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/QuarkusClassWriter.java @@ -15,6 +15,10 @@ public QuarkusClassWriter(final ClassReader classReader, final int flags) { super(classReader, flags); } + public QuarkusClassWriter(final int flags) { + super(flags); + } + @Override protected String getCommonSuperClass(String type1, String type2) { ClassLoader cl = getClassLoader(); diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateEntityEnhancer.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateEntityEnhancer.java index 6b0a88f6893..6d618920e57 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateEntityEnhancer.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateEntityEnhancer.java @@ -10,6 +10,8 @@ import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; +import io.quarkus.deployment.QuarkusClassWriter; + /** * Used to transform bytecode by registering to * io.quarkus.deployment.ProcessorContext#addByteCodeTransformer(java.util.function.Function). @@ -38,7 +40,7 @@ private class HibernateEnhancingClassVisitor extends ClassVisitor { private final Enhancer enhancer; public HibernateEnhancingClassVisitor(String className, ClassVisitor outputClassVisitor) { - super(Opcodes.ASM7, new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS)); + super(Opcodes.ASM7, new QuarkusClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS)); this.className = className; this.outputClassVisitor = outputClassVisitor; //note that as getLoadingClassLoader is resolved immediately this can't be created until transform time

['extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateEntityEnhancer.java', 'core/deployment/src/main/java/io/quarkus/deployment/QuarkusClassWriter.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/3736/3730

quarkusio

quarkus

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

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

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

fixes

[Jaeger] Metrics are wrongly added to base metrics

**Describe the bug** The Jaeger metrics are displayed as **base** metrics, but they should be **vendor** metrics as **base** metrics should only be the one listed on the [MP metrics specification](https://github.com/eclipse/microprofile-metrics/blob/master/spec/src/main/asciidoc/required-metrics.adoc) **Expected behavior** Jaeger metrics are displayed under **vendor** metrics. **Actual behavior** Jaeger metrics are displayed under **base** metrics. **To Reproduce** Steps to reproduce the behavior: 1. Add `quarkus-smallrye-metrics` extension. 2. Add `quarkus-smallrye-opentracing` extension. 3. Navigate to the `/metrics/base` endpoint you will see Jaeger metrics. **Environment (please complete the following information):** - Quarkus version or git rev: 0.21.1 **Additional context** This has been discuss with @jmartisk that agreed it's a bug. If I have some time this week I will works on a PR for this as it should be very simple to fix :)

9bf8398e45107a31588437e7912c3c60a9c2c62c

8cb8704cf42c7bca8c9bbbd6028dd8b6bc6978e8

https://github.com/quarkusio/quarkus/compare/9bf8398e45107a31588437e7912c3c60a9c2c62c...8cb8704cf42c7bca8c9bbbd6028dd8b6bc6978e8

diff --git a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMetricsFactory.java b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMetricsFactory.java index 03897450fe3..d28a1f02326 100644 --- a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMetricsFactory.java +++ b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMetricsFactory.java @@ -17,7 +17,7 @@ public class QuarkusJaegerMetricsFactory implements MetricsFactory { - MetricRegistry registry = MetricRegistries.get(MetricRegistry.Type.BASE); + MetricRegistry registry = MetricRegistries.get(MetricRegistry.Type.VENDOR); @Override public Counter createCounter(final String name, final Map<String, String> tags) {

['extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMetricsFactory.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/3712/3710

quarkusio

quarkus

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

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

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

fixes

[Smallrye Metrics] Some memory pool metrics are missing

**Describe the bug** When using quarkus-smallrye-metric extension, some memory pool metrics are missing. Looking at the code in `SmallRyeMetricsRecorder.memoryPoolMetrics` it registers metrics for all pools. Running Java 11 I have the following pools ``` CodeHeap 'non-nmethods' Metaspace Compressed Class Space G1 Eden Space G1 Old Gen G1 Survivor Space CodeHeap 'non-profiled nmethods' ``` But only metrics for three pools are displayed: ``` "memoryPool.usage.max;name=G1 Old Gen": 9825056, "memoryPool.usage.max;name=G1 Survivor Space": 16777216, "memoryPool.usage.max;name=G1 Eden Space": 157286400, "memoryPool.usage;name=G1 Eden Space": 0, "memoryPool.usage;name=G1 Survivor Space": 14680064, "memoryPool.usage;name=G1 Old Gen": 0, ``` All non-heap memory pools are missing. **Expected behavior** Metrics for all memory pools should be displayed when going to the /metrics endpoint. **Actual behavior** Some memory pool metrics are missing. **To Reproduce** Steps to reproduce the behavior: 1. Add quarkus-smallrye-metric extension to your project. 2. Go to /metrics endpoint. **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Linux 5.0.0-25-generic #26-Ubuntu SMP Thu Aug 1 12:04:58 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux - Output of `java -version`: openjdk version "11.0.4" 2019-07-16 - Quarkus version or git rev: master

5ca74add8aac8534bee45204bf814257c3097bb0

96b8cebb735786cf1b367dc9534b41f0f2129789

https://github.com/quarkusio/quarkus/compare/5ca74add8aac8534bee45204bf814257c3097bb0...96b8cebb735786cf1b367dc9534b41f0f2129789

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 d5f1bdac04d..ed09afc43f7 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 @@ -354,10 +354,20 @@ private void memoryPoolMetrics(MetricRegistry registry, List<String> names) { .build(); for (MemoryPoolMXBean mp : mps) { if (mp.getCollectionUsage() != null && mp.getPeakUsage() != null) { + // this will be the case for the heap memory pools registry.register(usageMetadata, new LambdaGauge(() -> mp.getCollectionUsage().getUsed()), new Tag("name", mp.getName())); names.add(usageMetadata.getName()); + registry.register(maxMetadata, new LambdaGauge(() -> mp.getPeakUsage().getUsed()), + new Tag("name", mp.getName())); + names.add(maxMetadata.getName()); + } else if (mp.getUsage() != null && mp.getPeakUsage() != null) { + // this will be the case for the non-heap memory pools + registry.register(usageMetadata, new LambdaGauge(() -> mp.getUsage().getUsed()), + new Tag("name", mp.getName())); + names.add(usageMetadata.getName()); + registry.register(maxMetadata, new LambdaGauge(() -> mp.getPeakUsage().getUsed()), new Tag("name", mp.getName())); names.add(maxMetadata.getName());

['extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.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/3701/3409

quarkusio

quarkus

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

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

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

fixes

Build failure on hot reload [Development environment]

**Bug Description** In the application.properties, I'm using the wildcard to config database user, password, url... for 2 environments (dev, prod) examples: - %dev.quarkus.datasource.password=xxxxxxxx - %prod.quarkus.datasource.password=xxxxxxxx In the development environment using `mvnw compile quarkus:dev:` the first build is ok, work's fine . But, when i change any class and try to send a request, the hot reload throws an Exception: `2019-08-02 11:37:49,564 ERROR [io.qua.dev.DevModeMain] (executor-thread-12) Failed to start quarkus: java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.deployment.steps.ConfigurationSetup#initializeConfiguration threw an exception: java.util.NoSuchElementException: Property quarkus.datasource.password not found at io.quarkus.runner.RuntimeRunner.run(RuntimeRunner.java:141) at io.quarkus.dev.DevModeMain.doStart(DevModeMain.java:171) at io.quarkus.dev.DevModeMain.restartApp(DevModeMain.java:198) at io.quarkus.dev.RuntimeUpdatesProcessor.doScan(RuntimeUpdatesProcessor.java:109) at io.quarkus.undertow.deployment.devmode.UndertowHotReplacementSetup.handleHotDeploymentRequest(UndertowHotReplacementSetup.java:67) at io.quarkus.undertow.deployment.devmode.UndertowHotReplacementSetup$1$1.handleRequest(UndertowHotReplacementSetup.java:56) at io.undertow.server.Connectors.executeRootHandler(Connectors.java:364) at io.undertow.server.HttpServerExchange$1.run(HttpServerExchange.java:830) at io.quarkus.runtime.CleanableExecutor$CleaningRunnable.run(CleanableExecutor.java:224) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2011) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1535) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1426) at org.jboss.threads.DelegatingRunnable.run(DelegatingRunnable.java:29) at org.jboss.threads.ThreadLocalResettingRunnable.run(ThreadLocalResettingRunnable.java:29) at java.lang.Thread.run(Thread.java:745) at org.jboss.threads.JBossThread.run(JBossThread.java:479) Caused by: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.deployment.steps.ConfigurationSetup#initializeConfiguration threw an exception: java.util.NoSuchElementException: Property quarkus.datasource.password not found at io.quarkus.builder.Execution.run(Execution.java:108) at io.quarkus.builder.BuildExecutionBuilder.execute(BuildExecutionBuilder.java:121) at io.quarkus.deployment.QuarkusAugmentor.run(QuarkusAugmentor.java:115) at io.quarkus.runner.RuntimeRunner.run(RuntimeRunner.java:107) ... 18 more Caused by: java.util.NoSuchElementException: Property quarkus.datasource.password not found at io.smallrye.config.SmallRyeConfig.getValue(SmallRyeConfig.java:89) at io.quarkus.deployment.steps.ConfigurationSetup.initializeConfiguration(ConfigurationSetup.java:225) 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:483) at io.quarkus.deployment.ExtensionLoader$1.execute(ExtensionLoader.java:768) at io.quarkus.builder.BuildContext.run(BuildContext.java:415) at io.quarkus.builder.BuildContext$$Lambda$116/2101929518.run(Unknown Source) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2011) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1535) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1426) ... 2 more` **To Reproduce** Steps to reproduce the behavior: 1. Make database configuration for dev and prod in application.properties 2. Start api in dev mode `mvnw compile quarkus:dev:` 3. Change any class in project to make a hot reload 4. Make a request and take a look on log **Configuration** ```properties # %dev.quarkus.datasource.password=xxxxxxxx # %prod.quarkus.datasource.password=xxxxxxxx ``` **Environment ** - Quarkus version or git rev: 0.20.0 My question is: This is a bug or any new configuration needed ?

9430e89910aa16b771e1caa06c1ec09ab2562774

99f5b697bf9764b34906602860a8b315e891f652

https://github.com/quarkusio/quarkus/compare/9430e89910aa16b771e1caa06c1ec09ab2562774...99f5b697bf9764b34906602860a8b315e891f652

diff --git a/core/devmode/src/main/java/io/quarkus/dev/DevModeMain.java b/core/devmode/src/main/java/io/quarkus/dev/DevModeMain.java index 97da87b9aa3..f264b68200f 100644 --- a/core/devmode/src/main/java/io/quarkus/dev/DevModeMain.java +++ b/core/devmode/src/main/java/io/quarkus/dev/DevModeMain.java @@ -255,9 +255,12 @@ public void stop() { } public void close() { - stop(); - for (HotReplacementSetup i : hotReplacement) { - i.close(); + try { + stop(); + } finally { + for (HotReplacementSetup i : hotReplacement) { + i.close(); + } } } } 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 19da83a928b..157e78d1bb0 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/Application.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/Application.java @@ -4,6 +4,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.LockSupport; +import org.eclipse.microprofile.config.spi.ConfigProviderResolver; import org.graalvm.nativeimage.ImageInfo; import org.wildfly.common.Assert; import org.wildfly.common.lock.Locks; @@ -37,6 +38,12 @@ public abstract class Application { private volatile boolean shutdownRequested; private static volatile Application currentApplication; + /** + * The generated config code will install a new resolver, we save the original one here and make sure + * to restore it on shutdown. + */ + private final static ConfigProviderResolver originalResolver = ConfigProviderResolver.instance(); + /** * Construct a new instance. */ @@ -151,6 +158,7 @@ public final void stop() { doStop(); } finally { currentApplication = null; + ConfigProviderResolver.setInstance(originalResolver); stateLock.lock(); try { state = ST_STOPPED;

['core/runtime/src/main/java/io/quarkus/runtime/Application.java', 'core/devmode/src/main/java/io/quarkus/dev/DevModeMain.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/3683/3681

quarkusio

quarkus

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

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

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

fixes

CORS Allowed-Headers shouldn't be case sensitive

**Describe the bug** CORS config `quarkus.http.cors.headers` shouldn't be case sensitive, since [HTTP headers are case-insensitive](https://tools.ietf.org/html/rfc2616#section-4.2). **Expected behavior** Setting `quarkus.http.cors.headers=Content-Type` on `application.properties` should cause [pre-flight `OPTIONS` http requests](https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request) with `Access-Control-Request-Headers: content-type` to return a response with header `Access-Control-Allow-Headers: content-type`. **Actual behavior** Lower case allow-headers `content-type` is not returned when client asks for camel-case `Content-Type`. **To Reproduce** Steps to reproduce the behavior: 1. [Configure the Quarkus CORS filter](https://quarkus.io/guides/undertow-reference#cors-filter) with `quarkus.http.cors.headers=Content-Typet` 2. Make a pre-flight `OPTIONS` request with the header `Access-Control-Request-Headers: content-type` 3. Notice the missing `Access-Control-Allow-Headers: content-type` in the response headers. **Configuration** ```properties #CORS quarkus.http.cors=true quarkus.http.cors.headers=Content-Type ``` **Environment (please complete the following information):** - Quarkus version or git rev: 0.21.1 **Additional context** HTTP headers are case-insensitive, from [RFC 2616 - Hypertext Transfer Protocol -- HTTP/1.1, section 4.2 - Message Headers](https://tools.ietf.org/html/rfc2616#section-4.2),.

2f519a49cdb6ecfa81874e9e1cb7a4d6423c3a23

6194bf9ff08cee3c405a3f8ea017260ed8e8cb38

https://github.com/quarkusio/quarkus/compare/2f519a49cdb6ecfa81874e9e1cb7a4d6423c3a23...6194bf9ff08cee3c405a3f8ea017260ed8e8cb38

diff --git a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/cors/CORSFilter.java b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/cors/CORSFilter.java index 05810ec5170..74460bcda01 100644 --- a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/cors/CORSFilter.java +++ b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/cors/CORSFilter.java @@ -1,6 +1,9 @@ package io.quarkus.vertx.web.runtime.cors; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; +import java.util.regex.Pattern; import java.util.stream.Collectors; import io.vertx.core.Handler; @@ -12,6 +15,8 @@ public class CORSFilter implements Handler<RoutingContext> { + private static final Pattern COMMA_SEPARATED_SPLIT_REGEX = Pattern.compile("\\\\s*,\\\\s*"); + // This is set in the recorder at runtime. // Must be static because the filter is created(deployed) at build time and runtime config is still not available final CORSConfig corsConfig; @@ -20,34 +25,46 @@ public CORSFilter(CORSConfig corsConfig) { this.corsConfig = corsConfig; } - private void processRequestedHeaders(HttpServerResponse response, String requestedHeaders) { + private void processRequestedHeaders(HttpServerResponse response, String allowHeadersValue) { if (corsConfig.headers.isEmpty()) { - response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, requestedHeaders); + response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, allowHeadersValue); } else { - final String validRequestHeaders = corsConfig.headers - .stream() - .filter(requestedHeaders::contains) - .collect(Collectors.joining(",")); + List<String> requestedHeaders = new ArrayList<>(); + for (String requestedHeader : COMMA_SEPARATED_SPLIT_REGEX.split(allowHeadersValue)) { + requestedHeaders.add(requestedHeader.toLowerCase()); + } + + List<String> validRequestedHeaders = new ArrayList<>(); + for (String configHeader : corsConfig.headers) { + if (requestedHeaders.contains(configHeader.toLowerCase())) { + validRequestedHeaders.add(configHeader); + } + } - if (!validRequestHeaders.isEmpty()) { - response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, validRequestHeaders); + if (!validRequestedHeaders.isEmpty()) { + response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, String.join(",", validRequestedHeaders)); } } } - private void processMethods(HttpServerResponse response, String requestedMethods) { + private void processMethods(HttpServerResponse response, String allowMethodsValue) { if (corsConfig.methods.isEmpty()) { - response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, requestedMethods); + response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, allowMethodsValue); } else { + List<String> requestedMethods = new ArrayList<>(); + for (String requestedMethod : COMMA_SEPARATED_SPLIT_REGEX.split(allowMethodsValue)) { + requestedMethods.add(requestedMethod.toLowerCase()); + } - final String validRequestedMethods = corsConfig.methods - .stream() - .filter(method -> requestedMethods.contains(method.name())) - .map(HttpMethod::name) - .collect(Collectors.joining(",")); + List<String> validRequestedMethods = new ArrayList<>(); + for (HttpMethod configMethod : corsConfig.methods) { + if (requestedMethods.contains(configMethod.name().toLowerCase())) { + validRequestedMethods.add(configMethod.name()); + } + } if (!validRequestedMethods.isEmpty()) { - response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, validRequestedMethods); + response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, String.join(",", validRequestedMethods)); } } }

['extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/cors/CORSFilter.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/3613/3448

quarkusio

quarkus

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

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

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

fixes

Cleanup on live reload also removes generated classes

**Describe the bug** Generated classes are removed during live reload. **Expected behavior** Generated classes are not deleted. **To Reproduce** Steps to reproduce the behavior: 1. `git clone https://github.com/antoniomacri/quarkus-rocker-class-cleanup.git` 2. `mvn install` 3. `ll target/classes/views` -> `HostingPage.class` 4. `mvn quarkus:dev` (+ `mvn install` + F5 on `http://localhost:8080/`) 5. `ll target/classes/views` -> `HostingPage.class` deleted **Environment:** - Output of `java -version`: 1.8 - Quarkus version or git rev: 0.20.0

184ce49db24a76ffed6129dc58d18c213aaabe57

1dfc5850b250818d48c8f9306252cabb1a1cb8e2

https://github.com/quarkusio/quarkus/compare/184ce49db24a76ffed6129dc58d18c213aaabe57...1dfc5850b250818d48c8f9306252cabb1a1cb8e2

diff --git a/core/devmode/src/main/java/io/quarkus/dev/RuntimeUpdatesProcessor.java b/core/devmode/src/main/java/io/quarkus/dev/RuntimeUpdatesProcessor.java index 064b89633b2..65280e047e2 100644 --- a/core/devmode/src/main/java/io/quarkus/dev/RuntimeUpdatesProcessor.java +++ b/core/devmode/src/main/java/io/quarkus/dev/RuntimeUpdatesProcessor.java @@ -202,12 +202,8 @@ private boolean checkForClassFilesChangesInModule(DevModeContext.ModuleInfo modu for (Path classFilePath : classFilePaths) { final Path sourceFilePath = retrieveSourceFilePathForClassFile(classFilePath, moduleChangedSourceFiles, module); - if (sourceFilePath == null) { - Files.deleteIfExists(classFilePath); - classFilePathToSourceFilePath.remove(classFilePath); - hasChanges = true; - } else { - final long classFileModificationTime = Files.getLastModifiedTime(classFilePath).toMillis(); + final long classFileModificationTime = Files.getLastModifiedTime(classFilePath).toMillis(); + if (sourceFilePath != null) { if (Files.notExists(sourceFilePath)) { // Source file has been deleted. Delete class and restart Files.deleteIfExists(classFilePath); @@ -226,6 +222,8 @@ private boolean checkForClassFilesChangesInModule(DevModeContext.ModuleInfo modu hasChanges = true; } } + } else if (classFileModificationTime > lastChange) { + hasChanges = true; } } }

['core/devmode/src/main/java/io/quarkus/dev/RuntimeUpdatesProcessor.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/3601/3596

quarkusio

quarkus

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

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

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

fixes

MicroProfile JWT application works with Payara Micro, Thorntail, TomEE and fails with Quarkus

Hello, I am working on adding Quarkus runtime to https://start.microprofile.io/ project generator, [MicroProfile Starter issue 195](https://github.com/eclipse/microprofile-starter/issues/195), [Quarkus issue 1310](https://github.com/quarkusio/quarkus/issues/1310). I seem to be having a weird issue with our JWT example that fails with Quarkus unless Java code is modified. I do realize Quarkus is neither MP22 nor MP30 TCK compliant at the time of writing. For the propose of the exercise, I work with MP22 as seen below. I will show an example that works and then I break it by removing Quarkus specific hack. ## Generate and build the starter example ### Quarkus * ```curl -O -J 'https://starter.karms.biz/api/project?mpVersion=MP22&supportedServer=QUARKUS&selectedSpecs=JWT_AUTH'``` * ```unzip demo.zip -d q_jwt``` * Split into two terminals, one for service-a and the other for service-b * ```cd q_jwt/demo/service-a``` * ```mvn clean compile quarkus:build && java -jar target/demo-runner.jar``` * ```cd q_jwt/demo/service-b``` * ```mvn clean compile quarkus:build && java -Dquarkus.http.port=8180 -jar target/demo-runner.jar``` * ``` curl -i http://localhost:8080/data/secured/test``` ```Claim value within JWT of 'custom-value' : Protected Resource; Custom value : "Jessie specific value"``` That is the expected outcome :heavy_check_mark:. Service A acts as a client to Service B and the contents of the claim is "Jessie specific value". ### Thorntail * ```rm -rf demo.zip``` * ```curl -O -J 'https://starter.karms.biz/api/project?mpVersion=MP22&supportedServer=THORNTAIL_V2&selectedSpecs=JWT_AUTH'``` * ```unzip demo.zip -d t_jwt``` * ```cd t_jwt/demo/service-a``` * ```mvn clean package && java -jar target/demo-thorntail.jar``` * ```cd t_jwt/demo/service-b``` * ```mvn clean package && java -jar target/demo-thorntail.jar -Dswarm.port.offset=100``` * ```curl -i http://localhost:8080/data/secured/test``` ```Claim value within JWT of 'custom-value' : Protected Resource; Custom value : Jessie specific value``` Both Thorntail and Quarkus work :heavy_check_mark: . **The problem is the Java code had to be adapted for Quarkus with a hack...** See the difference between classes that are supposed to be the same: ```diff q_jwt/demo/service-b/src/main/java/com/example/demo/secure/ProtectedController.java t_jwt/demo/service-b/src/main/java/com/example/demo/secure/ProtectedController.java``` **Pertinent part:** ``` < return "Protected Resource; Custom value : " + (Object) custom.getValue(); --- > return "Protected Resource; Custom value : " + custom.getValue(); ``` Quarkus cannot cast ```org.glassfish.json.JsonStringImpl``` to ```java.lang.String```, hence the ```(Object)``` cast. Let's copy Thorntail code to Quarkus and run it again: ### Quarkus fails :x: * ```mv q_jwt/demo/service-b/src/main/java/com/example/demo/secure/ProtectedController.java q_jwt/demo/service-b/src/main/java/com/example/demo/secure/ProtectedController.java.backup``` * ```cp t_jwt/demo/service-b/src/main/java/com/example/demo/secure/ProtectedController.java q_jwt/demo/service-b/src/main/java/com/example/demo/secure/ProtectedController.java``` And we run Quarkus example again: * ```cd q_jwt/demo/service-a``` * ```mvn clean compile quarkus:build && java -jar target/demo-runner.jar``` * ```cd q_jwt/demo/service-b``` * ```mvn clean compile quarkus:build && java -Dquarkus.http.port=8180 -jar target/demo-runner.jar``` * ```curl -i http://localhost:8080/data/secured/test``` ``` <h1 class="container">Internal Server Error</h1> <div class="exception-message"> <h2 class="container">java.lang.ClassCastException: org.glassfish.json.JsonStringImpl cannot be cast to java.base/java.lang.StringError id 91aa7964-4a51-4087-8070-11794337b74c-1</h2> </div> ``` #### Logs: ``` 2019-08-20 14:30:11,842 INFO [io.quarkus] (main) Quarkus 0.20.0 started in 0.784s. Listening on: http://[::]:8180 2019-08-20 14:30:11,865 INFO [io.quarkus] (main) Installed features: [cdi, resteasy, security, smallrye-jwt] 2019-08-20 14:30:20,699 ERROR [io.und.req.io] (executor-thread-1) Exception handling request 91aa7964-4a51-4087-8070-11794337b74c-1 to /data/protected: org.jboss.resteasy.spi.UnhandledException: java.lang.ClassCastException: org.glassfish.json.JsonStringImpl cannot be cast to java.base/java.lang.String 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:209) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:496) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$invoke$4(SynchronousDispatcher.java:252) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$preprocess$0(SynchronousDispatcher.java:153) at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:363) at org.jboss.resteasy.core.SynchronousDispatcher.preprocess(SynchronousDispatcher.java:156) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:238) at org.jboss.resteasy.plugins.server.servlet.ServletContainerDispatcher.service(ServletContainerDispatcher.java:249) at org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:60) at org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:55) at javax.servlet.http.HttpServlet.service(HttpServlet.java:791) at io.undertow.servlet.handlers.ServletHandler.handleRequest(ServletHandler.java:74) at io.undertow.servlet.handlers.security.ServletSecurityRoleHandler.handleRequest(ServletSecurityRoleHandler.java:62) at io.undertow.servlet.handlers.ServletChain$1.handleRequest(ServletChain.java:68) at io.undertow.servlet.handlers.ServletDispatchingHandler.handleRequest(ServletDispatchingHandler.java:36) at io.quarkus.elytron.security.runtime.SecurityContextPrincipalHandler.handleRequest(SecurityContextPrincipalHandler.java:24) at io.undertow.servlet.handlers.security.SSLInformationAssociationHandler.handleRequest(SSLInformationAssociationHandler.java:132) 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:64) 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.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:292) at io.undertow.servlet.handlers.ServletInitialHandler.access$100(ServletInitialHandler.java:81) at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:138) at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:135) 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$8$1$1.call(UndertowDeploymentRecorder.java:489) at io.undertow.servlet.handlers.ServletInitialHandler.dispatchRequest(ServletInitialHandler.java:272) at io.undertow.servlet.handlers.ServletInitialHandler.access$000(ServletInitialHandler.java:81) at io.undertow.servlet.handlers.ServletInitialHandler$1.handleRequest(ServletInitialHandler.java:104) at io.undertow.server.Connectors.executeRootHandler(Connectors.java:364) at io.undertow.server.HttpServerExchange$1.run(HttpServerExchange.java:830) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2011) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1535) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1395) 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:831) at org.jboss.threads.JBossThread.run(JBossThread.java:479) Caused by: java.lang.ClassCastException: org.glassfish.json.JsonStringImpl cannot be cast to java.base/java.lang.String at com.example.demo.secure.ProtectedController.getJWTBasedValue(ProtectedController.java:26) at com.example.demo.secure.ProtectedController_ClientProxy.getJWTBasedValue(ProtectedController_ClientProxy.zig:54) 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:569) at org.jboss.resteasy.core.MethodInjectorImpl.invoke(MethodInjectorImpl.java:151) at org.jboss.resteasy.core.MethodInjectorImpl.lambda$invoke$3(MethodInjectorImpl.java:122) at java.base/java.util.concurrent.CompletableFuture.uniApplyNow(CompletableFuture.java:680) at java.base/java.util.concurrent.CompletableFuture.uniApplyStage(CompletableFuture.java:658) at java.base/java.util.concurrent.CompletableFuture.thenApply(CompletableFuture.java:2094) at java.base/java.util.concurrent.CompletableFuture.thenApply(CompletableFuture.java:143) at org.jboss.resteasy.core.MethodInjectorImpl.invoke(MethodInjectorImpl.java:122) at org.jboss.resteasy.core.ResourceMethodInvoker.internalInvokeOnTarget(ResourceMethodInvoker.java:580) at org.jboss.resteasy.core.ResourceMethodInvoker.invokeOnTargetAfterFilter(ResourceMethodInvoker.java:454) at org.jboss.resteasy.core.ResourceMethodInvoker.lambda$invokeOnTarget$2(ResourceMethodInvoker.java:408) at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:363) at org.jboss.resteasy.core.ResourceMethodInvoker.invokeOnTarget(ResourceMethodInvoker.java:410) at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:379) at org.jboss.resteasy.core.ResourceMethodInvoker.lambda$invoke$1(ResourceMethodInvoker.java:353) at java.base/java.util.concurrent.CompletableFuture.uniComposeStage(CompletableFuture.java:1106) at java.base/java.util.concurrent.CompletableFuture.thenCompose(CompletableFuture.java:2235) at java.base/java.util.concurrent.CompletableFuture.thenCompose(CompletableFuture.java:143) at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:353) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:477) ... 44 more ``` **It is noteworthy, that Thorntail's code works with TomEE and Payara Micro while it fails with Quarkus.** Ideas? Hints? Thoughts on the JWT example app?

61f8ad9ceba93bf282d41129ba9a1e9c54ca571d

bb5699450a49bea1990b15c02f20be1e6f7a538b

https://github.com/quarkusio/quarkus/compare/61f8ad9ceba93bf282d41129ba9a1e9c54ca571d...bb5699450a49bea1990b15c02f20be1e6f7a538b

diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCallerPrincipalUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCallerPrincipalUnitTest.java index 4ebdad105f5..9ee3c7c28bf 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCallerPrincipalUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCallerPrincipalUnitTest.java @@ -9,7 +9,6 @@ import javax.json.JsonArray; import javax.json.JsonNumber; import javax.json.JsonObject; -import javax.json.JsonString; import org.eclipse.microprofile.jwt.Claims; import org.jose4j.jwt.JwtClaims; @@ -62,8 +61,7 @@ public void testAllClaims() throws InvalidJwtException { Assertions.assertEquals(Json.createValue(4.4), customDoubleArray.getJsonNumber(4)); // "customString": "customStringValue", - JsonString customString = principal.getClaim("customString"); - Assertions.assertEquals(Json.createValue("customStringValue"), customString); + Assertions.assertEquals("customStringValue", principal.getClaim("customString")); // "customInteger": 123456789, JsonNumber customInteger = principal.getClaim("customInteger"); Assertions.assertEquals(Json.createValue(123456789), customInteger); diff --git a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/ElytronJwtCallerPrincipal.java b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/ElytronJwtCallerPrincipal.java index 5116636f334..f16ab8153b0 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/ElytronJwtCallerPrincipal.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/ElytronJwtCallerPrincipal.java @@ -1,8 +1,5 @@ package io.quarkus.smallrye.jwt.runtime.auth; -import javax.json.JsonStructure; - -import org.eclipse.microprofile.jwt.Claims; import org.jose4j.jwt.JwtClaims; import org.wildfly.security.authz.Attributes; @@ -46,15 +43,4 @@ public String getName() { return customPrincipalName != null ? customPrincipalName : super.getName(); } - @Override - protected Object getClaimValue(String claimName) { - Object value = super.getClaimValue(claimName); - - Claims claimType = getClaimType(claimName); - if (claimType == Claims.UNKNOWN && !(value instanceof JsonStructure)) { - value = wrapClaimValue(value); - } - - return value; - } }

['extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCallerPrincipalUnitTest.java', 'extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/ElytronJwtCallerPrincipal.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/3597/2063

quarkusio

quarkus

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

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

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

fixes

QuarkusNative now depends on Docker while building from Gradle?

This is kinda of a question more than a bug report or something. I was able to successfully try to use quarkus `0.13.1` to build a sample application, but what I found strange is that even though I have set (as I did in `0.12.0`) the `GRAALVM_HOME` variable, now it is using docker to build the application. Is there an option to disable the need of using docker to build the native binary?

4fdfa0dba34267a8733626f6dbbd8bac2ed77274

dd6b89a1ec5ee2c4503a2a51097bcb0000c46c3e

https://github.com/quarkusio/quarkus/compare/4fdfa0dba34267a8733626f6dbbd8bac2ed77274...dd6b89a1ec5ee2c4503a2a51097bcb0000c46c3e

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java index 8ec05064312..b8d0ade47a1 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java @@ -56,7 +56,7 @@ public class QuarkusNative extends QuarkusTask { private String nativeImageXmx; - private String containerRuntime = "docker"; + private String containerRuntime; private String containerRuntimeOptions;

['devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.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/3570/3565

quarkusio

quarkus

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

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

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

fixes

Add META-INF/io.netty.versions.properties to the uberJar ignore list

> [WARNING] [io.quarkus.creator.phase.runnerjar.RunnerJarPhase] Duplicate entry META-INF/io.netty.versions.properties entry from io.netty:netty-handler::jar:4.1.34.Final(compile) will be ignored. Existing file was provided by io.netty:netty-codec::jar:4.1.34.Final(compile) > [WARNING] [io.quarkus.creator.phase.runnerjar.RunnerJarPhase] Duplicate entry META-INF/io.netty.versions.properties entry from io.netty:netty-common::jar:4.1.34.Final(compile) will be ignored. Existing file was provided by io.netty:netty-codec::jar:4.1.34.Final(compile) > [WARNING] [io.quarkus.creator.phase.runnerjar.RunnerJarPhase] Duplicate entry META-INF/io.netty.versions.properties entry from io.netty:netty-transport::jar:4.1.34.Final(compile) will be ignored. Existing file was provided by io.netty:netty-codec::jar:4.1.34.Final(compile)

e51ecb98b252168c404560af476049442323db2b

d30e8a5a135f9ea57b2d94777e714957278669b5

https://github.com/quarkusio/quarkus/compare/e51ecb98b252168c404560af476049442323db2b...d30e8a5a135f9ea57b2d94777e714957278669b5

diff --git a/core/creator/src/main/java/io/quarkus/creator/phase/runnerjar/RunnerJarPhase.java b/core/creator/src/main/java/io/quarkus/creator/phase/runnerjar/RunnerJarPhase.java index ebb7980c50b..0e0eb4d3683 100644 --- a/core/creator/src/main/java/io/quarkus/creator/phase/runnerjar/RunnerJarPhase.java +++ b/core/creator/src/main/java/io/quarkus/creator/phase/runnerjar/RunnerJarPhase.java @@ -77,6 +77,7 @@ public class RunnerJarPhase implements AppCreationPhase<RunnerJarPhase>, RunnerJ "META-INF/README.md", "META-INF/DEPENDENCIES", "META-INF/beans.xml", + "META-INF/io.netty.versions.properties", "META-INF/quarkus-config-roots.list", "META-INF/quarkus-javadoc.properties", "META-INF/quarkus-extension.properties",

['core/creator/src/main/java/io/quarkus/creator/phase/runnerjar/RunnerJarPhase.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/3561/3560

quarkusio

quarkus

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

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

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

fixes

java.nio.file.NoSuchFileException thrown for string delimited with ':' (path) supplied by Gradle when multiple source path used (e.g. Kotlin of generated sourceSet)

**Describe the bug** java.nio.file.NoSuchFileException thrown for string delimited with ':' (path) supplied by Gradle when multiple source path used (e.g. Kotlin of generated sourceSet). **To Reproduce** Steps to reproduce the behavior: 1. `git clone -b quarkus-spring-mvc [email protected]:soberich/marvel.git` 2. `./gradlew -x test app:quarkusDev` **stacktrace** ```console Exception in thread "main" java.nio.file.NoSuchFileException: /Users/Projects/marvel-github/spi/build/classes/java/main:/Users/Projects/marvel-github/spi/build/classes/kotlin/main:/Users/Projects/marvel-github/spi/build/tmp/kapt3/classes/main at sun.nio.fs.UnixException.translateToIOException(UnixException.java:86) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:102) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:107) at sun.nio.fs.UnixFileAttributeViews$Basic.readAttributes(UnixFileAttributeViews.java:55) at sun.nio.fs.UnixFileSystemProvider.readAttributes(UnixFileSystemProvider.java:144) at java.nio.file.Files.readAttributes(Files.java:1737) at java.nio.file.FileTreeWalker.getAttributes(FileTreeWalker.java:219) at java.nio.file.FileTreeWalker.visit(FileTreeWalker.java:276) at java.nio.file.FileTreeWalker.walk(FileTreeWalker.java:322) at java.nio.file.FileTreeIterator.<init>(FileTreeIterator.java:72) at java.nio.file.Files.walk(Files.java:3574) at java.nio.file.Files.walk(Files.java:3625) at io.quarkus.dev.RuntimeUpdatesProcessor.checkForClassFilesChangesInModule(RuntimeUpdatesProcessor.java:196) ```

19a6067c0fb40710e8ad90839257b38d8e7ee798

d6a9b6ba7b3c5607fc1fa467481f5fa8e1de3397

https://github.com/quarkusio/quarkus/compare/19a6067c0fb40710e8ad90839257b38d8e7ee798...d6a9b6ba7b3c5607fc1fa467481f5fa8e1de3397

diff --git a/core/devmode/src/main/java/io/quarkus/dev/RuntimeUpdatesProcessor.java b/core/devmode/src/main/java/io/quarkus/dev/RuntimeUpdatesProcessor.java index 65280e047e2..d2284fd27ad 100644 --- a/core/devmode/src/main/java/io/quarkus/dev/RuntimeUpdatesProcessor.java +++ b/core/devmode/src/main/java/io/quarkus/dev/RuntimeUpdatesProcessor.java @@ -192,38 +192,40 @@ private boolean checkForClassFilesChangesInModule(DevModeContext.ModuleInfo modu } try { - final Path moduleClassesPath = Paths.get(module.getClassesPath()); - try (final Stream<Path> classesStream = Files.walk(moduleClassesPath)) { - final Set<Path> classFilePaths = classesStream - .parallel() - .filter(path -> path.toString().endsWith(CLASS_EXTENSION)) - .collect(Collectors.toSet()); - - for (Path classFilePath : classFilePaths) { - final Path sourceFilePath = retrieveSourceFilePathForClassFile(classFilePath, moduleChangedSourceFiles, - module); - final long classFileModificationTime = Files.getLastModifiedTime(classFilePath).toMillis(); - if (sourceFilePath != null) { - if (Files.notExists(sourceFilePath)) { - // Source file has been deleted. Delete class and restart - Files.deleteIfExists(classFilePath); - classFilePathToSourceFilePath.remove(classFilePath); - hasChanges = true; - } else { - classFilePathToSourceFilePath.put(classFilePath, sourceFilePath); - if (classFileModificationTime > lastChange) { - // At least one class was recently modified. Restart. - hasChanges = true; - } else if (moduleChangedSourceFiles.contains(sourceFilePath)) { - // Source file has been modified, we delete the .class files as they are going to - //be recompiled anyway, this allows for simple cleanup of inner classes + for (String folder : module.getClassesPath().split(File.pathSeparator)) { + final Path moduleClassesPath = Paths.get(folder); + try (final Stream<Path> classesStream = Files.walk(moduleClassesPath)) { + final Set<Path> classFilePaths = classesStream + .parallel() + .filter(path -> path.toString().endsWith(CLASS_EXTENSION)) + .collect(Collectors.toSet()); + + for (Path classFilePath : classFilePaths) { + final Path sourceFilePath = retrieveSourceFilePathForClassFile(classFilePath, moduleChangedSourceFiles, + module); + final long classFileModificationTime = Files.getLastModifiedTime(classFilePath).toMillis(); + if (sourceFilePath != null) { + if (!sourceFilePath.toFile().exists()) { + // Source file has been deleted. Delete class and restart Files.deleteIfExists(classFilePath); classFilePathToSourceFilePath.remove(classFilePath); hasChanges = true; + } else { + classFilePathToSourceFilePath.put(classFilePath, sourceFilePath); + if (classFileModificationTime > lastChange) { + // At least one class was recently modified. Restart. + hasChanges = true; + } else if (moduleChangedSourceFiles.contains(sourceFilePath)) { + // Source file has been modified, we delete the .class files as they are going to + //be recompiled anyway, this allows for simple cleanup of inner classes + Files.deleteIfExists(classFilePath); + classFilePathToSourceFilePath.remove(classFilePath); + hasChanges = true; + } } + } else if (classFileModificationTime > lastChange) { + hasChanges = true; } - } else if (classFileModificationTime > lastChange) { - hasChanges = true; } } } @@ -249,7 +251,7 @@ private Optional<String> matchingHandledExtension(Path p) { private String getFileExtension(File file) { String name = file.getName(); - int lastIndexOf = name.lastIndexOf("."); + int lastIndexOf = name.lastIndexOf('.'); if (lastIndexOf == -1) { return ""; // empty extension } @@ -273,7 +275,7 @@ private Set<String> checkForFileChange() { for (String path : watchedFilePaths.keySet()) { Path file = root.resolve(path); - if (Files.exists(file)) { + if (file.toFile().exists()) { try { long value = Files.getLastModifiedTime(file).toMillis(); Long existing = watchedFileTimestamps.get(file); @@ -332,7 +334,7 @@ public RuntimeUpdatesProcessor setWatchedFilePaths(Map<String, Boolean> watchedF Path root = Paths.get(rootPath); for (String path : watchedFilePaths.keySet()) { Path config = root.resolve(path); - if (Files.exists(config)) { + if (config.toFile().exists()) { try { watchedFileTimestamps.put(config, Files.getLastModifiedTime(config).toMillis()); } catch (IOException e) {

['core/devmode/src/main/java/io/quarkus/dev/RuntimeUpdatesProcessor.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/3504/3505

quarkusio

quarkus

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

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

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

fixes

Kubernetes client extension native: IntOrString$Serializer has no default (no arg) constructor

**Describe the bug** I have a Quarkus app which manipulates K8s resources using the standard extension for the Fabric8 client. It works fine in OpenJDK. When I run it in native mode, I get a cryptic error from Jackson. Vaguely reminiscent of #3077, but distinct, and not due to use of watches. **Expected behavior** Call works as in regular JVM mode. **Actual behavior** I get ``` io.fabric8.kubernetes.client.KubernetesClientException: Operation: [replace] for kind: [StatefulSet] with name: […] in namespace: […] failed. at io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation.lambda$replace$1(HasMetadataOperation.java:101) at io.fabric8.kubernetes.api.model.apps.DoneableStatefulSet.done(DoneableStatefulSet.java:27) at io.fabric8.kubernetes.api.model.apps.DoneableStatefulSet.done(DoneableStatefulSet.java:6) at io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation.replace(HasMetadataOperation.java:105) at io.fabric8.kubernetes.client.dsl.internal.RollableScalableResourceOperation.replace(RollableScalableResourceOperation.java:159) at io.fabric8.kubernetes.client.dsl.internal.RollableScalableResourceOperation.replace(RollableScalableResourceOperation.java:42) at io.fabric8.kubernetes.client.dsl.base.BaseOperation.createOrReplace(BaseOperation.java:387) at io.fabric8.kubernetes.client.dsl.base.BaseOperation.createOrReplace(BaseOperation.java:382) at … Caused by: com.fasterxml.jackson.databind.JsonMappingException: Class io.fabric8.kubernetes.api.model.IntOrString$Serializer has no default (no arg) constructor (through reference chain: io.fabric8.kubernetes.api.model.apps.StatefulSet["spec"]->io.fabric8.kubernetes.api.model.apps.StatefulSetSpec["template"]->io.fabric8.kubernetes.api.model.PodTemplateSpec["spec"]->io.fabric8.kubernetes.api.model.PodSpec["containers"]->java.util.ArrayList[0]->io.fabric8.kubernetes.api.model.Container["livenessProbe"]->io.fabric8.kubernetes.api.model.Probe["httpGet"]->io.fabric8.kubernetes.api.model.HTTPGetAction["port"]) at com.fasterxml.jackson.databind.SerializerProvider.reportMappingProblem(SerializerProvider.java:1223) at com.fasterxml.jackson.databind.SerializerProvider._createAndCacheUntypedSerializer(SerializerProvider.java:1341) at com.fasterxml.jackson.databind.SerializerProvider.findPrimaryPropertySerializer(SerializerProvider.java:668) at com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap.findAndAddPrimarySerializer(PropertySerializerMap.java:64) at com.fasterxml.jackson.databind.ser.BeanPropertyWriter._findAndAddDynamic(BeanPropertyWriter.java:897) at com.fasterxml.jackson.databind.ser.BeanPropertyWriter.serializeAsField(BeanPropertyWriter.java:705) at com.fasterxml.jackson.databind.ser.std.BeanSerializerBase.serializeFields(BeanSerializerBase.java:719) at com.fasterxml.jackson.databind.ser.BeanSerializer.serialize(BeanSerializer.java:155) at com.fasterxml.jackson.databind.ser.BeanPropertyWriter.serializeAsField(BeanPropertyWriter.java:727) at com.fasterxml.jackson.databind.ser.std.BeanSerializerBase.serializeFields(BeanSerializerBase.java:719) at com.fasterxml.jackson.databind.ser.BeanSerializer.serialize(BeanSerializer.java:155) at com.fasterxml.jackson.databind.ser.BeanPropertyWriter.serializeAsField(BeanPropertyWriter.java:727) at com.fasterxml.jackson.databind.ser.std.BeanSerializerBase.serializeFields(BeanSerializerBase.java:719) at com.fasterxml.jackson.databind.ser.BeanSerializer.serialize(BeanSerializer.java:155) at com.fasterxml.jackson.databind.ser.impl.IndexedListSerializer.serializeContents(IndexedListSerializer.java:119) at com.fasterxml.jackson.databind.ser.impl.IndexedListSerializer.serialize(IndexedListSerializer.java:79) at com.fasterxml.jackson.databind.ser.impl.IndexedListSerializer.serialize(IndexedListSerializer.java:18) at com.fasterxml.jackson.databind.ser.BeanPropertyWriter.serializeAsField(BeanPropertyWriter.java:727) at com.fasterxml.jackson.databind.ser.std.BeanSerializerBase.serializeFields(BeanSerializerBase.java:719) at com.fasterxml.jackson.databind.ser.BeanSerializer.serialize(BeanSerializer.java:155) at com.fasterxml.jackson.databind.ser.BeanPropertyWriter.serializeAsField(BeanPropertyWriter.java:727) at com.fasterxml.jackson.databind.ser.std.BeanSerializerBase.serializeFields(BeanSerializerBase.java:719) at com.fasterxml.jackson.databind.ser.BeanSerializer.serialize(BeanSerializer.java:155) at com.fasterxml.jackson.databind.ser.BeanPropertyWriter.serializeAsField(BeanPropertyWriter.java:727) at com.fasterxml.jackson.databind.ser.std.BeanSerializerBase.serializeFields(BeanSerializerBase.java:719) at com.fasterxml.jackson.databind.ser.BeanSerializer.serialize(BeanSerializer.java:155) at com.fasterxml.jackson.databind.ser.BeanPropertyWriter.serializeAsField(BeanPropertyWriter.java:727) at com.fasterxml.jackson.databind.ser.std.BeanSerializerBase.serializeFields(BeanSerializerBase.java:719) at com.fasterxml.jackson.databind.ser.BeanSerializer.serialize(BeanSerializer.java:155) at com.fasterxml.jackson.databind.ser.DefaultSerializerProvider._serialize(DefaultSerializerProvider.java:480) at com.fasterxml.jackson.databind.ser.DefaultSerializerProvider.serializeValue(DefaultSerializerProvider.java:319) at com.fasterxml.jackson.databind.ObjectMapper._configAndWriteValue(ObjectMapper.java:3906) at com.fasterxml.jackson.databind.ObjectMapper.writeValueAsString(ObjectMapper.java:3220) at io.fabric8.kubernetes.client.dsl.base.OperationSupport.handleReplace(OperationSupport.java:270) at io.fabric8.kubernetes.client.dsl.base.OperationSupport.handleReplace(OperationSupport.java:252) at io.fabric8.kubernetes.client.dsl.base.BaseOperation.handleReplace(BaseOperation.java:801) at io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation.lambda$replace$1(HasMetadataOperation.java:99) ... 79 more Caused by: java.lang.IllegalArgumentException: Class io.fabric8.kubernetes.api.model.IntOrString$Serializer has no default (no arg) constructor at com.fasterxml.jackson.databind.util.ClassUtil.createInstance(ClassUtil.java:554) at com.fasterxml.jackson.databind.ser.DefaultSerializerProvider.serializerInstance(DefaultSerializerProvider.java:135) at com.fasterxml.jackson.databind.ser.BasicSerializerFactory.findSerializerFromAnnotation(BasicSerializerFactory.java:489) at com.fasterxml.jackson.databind.ser.BeanSerializerFactory.createSerializer(BeanSerializerFactory.java:136) at com.fasterxml.jackson.databind.SerializerProvider._createUntypedSerializer(SerializerProvider.java:1388) at com.fasterxml.jackson.databind.SerializerProvider._createAndCacheUntypedSerializer(SerializerProvider.java:1336) ... 114 more ``` Note that the class actually does have a no-arg constructor: ``` $ javap -classpath ~/.m2/repository/io/fabric8/kubernetes-model/4.3.1/kubernetes-model-4.3.1.jar 'io.fabric8.kubernetes.api.model.IntOrString$Serializer' Compiled from "IntOrString.java" public class io.fabric8.kubernetes.api.model.IntOrString$Serializer extends com.fasterxml.jackson.databind.JsonSerializer<io.fabric8.kubernetes.api.model.IntOrString> { public io.fabric8.kubernetes.api.model.IntOrString$Serializer(); public void serialize(io.fabric8.kubernetes.api.model.IntOrString, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider) throws java.io.IOException, com.fasterxml.jackson.core.JsonProcessingException; public void serialize(java.lang.Object, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider) throws java.io.IOException; } ``` **To Reproduce** The problematic code does something like ```java @Inject KubernetesClient k8sClient; // … StatefulSet sts = k8sClient.apps().statefulSets().withName(…).get(); sts.getSpec().setReplicas(1); k8sClient.apps().statefulSets().createOrReplace(sts); ``` and am building in `-Pnative` mode using `quay.io/quarkus/centos-quarkus-maven:19.1.1`. The resource in question seems OK acc. to `kubectl get -o json sts/… | jq '.spec.template.spec.containers[0].livenessProbe'`: ```json { "failureThreshold": 3, "httpGet": { "path": "/…", "port": 8080, "scheme": "HTTP" }, "initialDelaySeconds": 300, "periodSeconds": 10, "successThreshold": 1, "timeoutSeconds": 10 } ``` (Can try to produce a minimal test case if the problem is not obvious from what is here already.) **Configuration** No relevant configuration. **Environment (please complete the following information):** Microk8s on Ubuntu. GraalVM as per above image. Quarkus 0.20.0.

a862426165200141c234429e9a691744637f3481

162723b33983c6232d341068eb9120953db98cb9

https://github.com/quarkusio/quarkus/compare/a862426165200141c234429e9a691744637f3481...162723b33983c6232d341068eb9120953db98cb9

diff --git a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java b/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java index 12726d30cc9..87867ae9f50 100644 --- a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java +++ b/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java @@ -87,6 +87,14 @@ public void process(ApplicationIndexBuildItem applicationIndex, CombinedIndexBui .toArray(String[]::new); reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, deserializerClasses)); + final String[] serializerClasses = combinedIndexBuildItem.getIndex() + .getAllKnownSubclasses(DotName.createSimple("com.fasterxml.jackson.databind.JsonSerializer")) + .stream() + .map(c -> c.name().toString()) + .filter(s -> s.startsWith("io.fabric8.kubernetes")) + .toArray(String[]::new); + reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, serializerClasses)); + reflectiveClasses .produce(new ReflectiveClassBuildItem(true, false, "io.fabric8.kubernetes.api.model.IntOrString")); reflectiveClasses

['extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.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/3220/3218

quarkusio

quarkus

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

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

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

fixes

Generated application.properties.example doesn't include CORS property

**Describe the bug** When generating an example application.properties files the `quarkus.http.cors` entry is missing. The other cors related entries are present as expected (i.e. `quarkus.http.cors.exposed-headers`). **Expected behavior** I would expect the example file to include all the available possible properties, including `quarkus.http.cors` along-side a relative comment. **Actual behavior** The `quarkus.http.cors` entry is not present **To Reproduce** Steps to reproduce the behavior: 1. Create a quarkus project `mvn io.quarkus:quarkus-maven-plugin:0.19.1:create` with the default values (or use an existing one) 2. From within the project `cd my-quarkus-project/` generate an `application.properties.example` file `./mvnw quarkus:generate-config` 3. Check the created file `src/main/resources/application.properties.example` for the missing entry. There is not a `quarkus.http.cors` present. The other cors related entries are present: ```bash grep 'cors' src/main/resources/application.properties.example #quarkus.http.cors.exposed-headers= #quarkus.http.cors.headers= #quarkus.http.cors.methods= #quarkus.http.cors.origins= ``` **Environment:** - Quarkus version or git rev: reproduced on quarkus 0.18, 0.19 and 0.19.1 - Maven version: `Apache Maven 3.6.0 (97c98ec64a1fdfee7767ce5ffb20918da4f719f3; 2018-10-24T21:41:47+03:00)` - Maven wrapped version: `Apache Maven 3.6.1 (d66c9c0b3152b2e69ee9bac180bb8fcc8e6af555; 2019-04-04T22:00:29+03:00)`

4e5409d193a1d9aa5f9fb2eae6188bc7f90d0ad0

7c11227eac1411d8a7baf0cdb29013512ed65be6

https://github.com/quarkusio/quarkus/compare/4e5409d193a1d9aa5f9fb2eae6188bc7f90d0ad0...7c11227eac1411d8a7baf0cdb29013512ed65be6

diff --git a/core/creator/src/main/java/io/quarkus/creator/phase/generateconfig/GenerateConfigPhase.java b/core/creator/src/main/java/io/quarkus/creator/phase/generateconfig/GenerateConfigPhase.java index 19f5f5cdfd0..7ac54ba30b4 100644 --- a/core/creator/src/main/java/io/quarkus/creator/phase/generateconfig/GenerateConfigPhase.java +++ b/core/creator/src/main/java/io/quarkus/creator/phase/generateconfig/GenerateConfigPhase.java @@ -118,7 +118,6 @@ private void doProcess(CurateOutcome appState) throws AppCreatorException { runnerClassLoader = new URLClassLoader(cpUrls.toArray(new URL[cpUrls.size()]), getClass().getClassLoader()); ClassLoader old = Thread.currentThread().getContextClassLoader(); - BuildResult result; try { Thread.currentThread().setContextClassLoader(runnerClassLoader); diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java index 4a273b512bb..c2cb9e9da1a 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java @@ -10,6 +10,7 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.BuildTimeConfigurationBuildItem; +import io.quarkus.deployment.builditem.BuildTimeRunTimeFixedConfigurationBuildItem; import io.quarkus.deployment.builditem.ConfigDescriptionBuildItem; import io.quarkus.deployment.builditem.RunTimeConfigurationBuildItem; import io.quarkus.deployment.configuration.ConfigDefinition; @@ -20,7 +21,8 @@ public class ConfigDescriptionBuildStep { @BuildStep List<ConfigDescriptionBuildItem> createConfigDescriptions( RunTimeConfigurationBuildItem runtimeConfig, - BuildTimeConfigurationBuildItem buildTimeConfig) throws Exception { + BuildTimeConfigurationBuildItem buildTimeConfig, + BuildTimeRunTimeFixedConfigurationBuildItem buildTimeRuntimeConfig) throws Exception { Properties javadoc = new Properties(); Enumeration<URL> resources = Thread.currentThread().getContextClassLoader() .getResources("META-INF/quarkus-javadoc.properties"); @@ -32,6 +34,7 @@ List<ConfigDescriptionBuildItem> createConfigDescriptions( List<ConfigDescriptionBuildItem> ret = new ArrayList<>(); processConfig(runtimeConfig.getConfigDefinition(), ret, javadoc); processConfig(buildTimeConfig.getConfigDefinition(), ret, javadoc); + processConfig(buildTimeRuntimeConfig.getConfigDefinition(), ret, javadoc); return ret; } diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpBuildConfig.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpBuildConfig.java index b399b4c329d..b3685ca5dd7 100644 --- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpBuildConfig.java +++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpBuildConfig.java @@ -11,7 +11,7 @@ public class HttpBuildConfig { /** - * The CORS config + * Enable the CORS filter. */ @ConfigItem(name = "cors") public boolean corsEnabled = false;

['core/creator/src/main/java/io/quarkus/creator/phase/generateconfig/GenerateConfigPhase.java', 'core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigDescriptionBuildStep.java', 'extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpBuildConfig.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/3490/3225

quarkusio

quarkus

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

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

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

fix

NPE when trying to build a maven module that has no src folder

``` [ERROR] Failed to execute goal io.quarkus:quarkus-maven-plugin:0.19.1:build (default) on project behavior-definition: Failed to build a runnable JAR: Failed to build a runner jar: NullPointerException -> [Help 1] ``` Error handling should be improved here. Cause: the module had no src folder structure defined

aff962e4bdb0d8e95056dd1013cd6a3ec09d03ca

8b19c7ae1126cdcc3bbd7e648d6a27f2aa423edb

https://github.com/quarkusio/quarkus/compare/aff962e4bdb0d8e95056dd1013cd6a3ec09d03ca...8b19c7ae1126cdcc3bbd7e648d6a27f2aa423edb

diff --git a/core/creator/src/main/java/io/quarkus/creator/phase/augment/AugmentPhase.java b/core/creator/src/main/java/io/quarkus/creator/phase/augment/AugmentPhase.java index ebef51df795..13531a254fb 100644 --- a/core/creator/src/main/java/io/quarkus/creator/phase/augment/AugmentPhase.java +++ b/core/creator/src/main/java/io/quarkus/creator/phase/augment/AugmentPhase.java @@ -208,10 +208,19 @@ public void provideOutcome(AppCreator ctx) throws AppCreatorException { } if (!Files.exists(appClassesDir)) { final Path appJar = appState.getAppArtifact().getPath(); - try { - ZipUtils.unzip(appJar, appClassesDir); - } catch (IOException e) { - throw new AppCreatorException("Failed to unzip " + appJar, e); + //manage project without src directory + if (appJar == null) { + try { + Files.createDirectory(appClassesDir); + } catch (IOException e) { + throw new AppCreatorException("Failed to create classes directory " + appClassesDir, e); + } + } else { + try { + ZipUtils.unzip(appJar, appClassesDir); + } catch (IOException e) { + throw new AppCreatorException("Failed to unzip " + appJar, e); + } } final Path metaInf = appClassesDir.resolve(META_INF); IoUtils.recursiveDelete(metaInf.resolve("maven"));

['core/creator/src/main/java/io/quarkus/creator/phase/augment/AugmentPhase.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/3487/3486

quarkusio

quarkus

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

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

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

fixes

Hot reload: the sources encoding used during recompilation should be dynamic

**Describe the bug** Since #3467 got fixed, we're using a hardcoded `UTF-8` encoding during a hot reload compilation. **Expected behavior** Ideally, the encoding should come dynamically from the `project.build.sourceEncoding` Maven property or a Gradle equivalent.

d79248f9a5ecece092e3b5b5357257e4314c1337

64a97e2b7abcd89d53b7672301f0350a630fb143

https://github.com/quarkusio/quarkus/compare/d79248f9a5ecece092e3b5b5357257e4314c1337...64a97e2b7abcd89d53b7672301f0350a630fb143

diff --git a/core/devmode/src/main/java/io/quarkus/dev/ClassLoaderCompiler.java b/core/devmode/src/main/java/io/quarkus/dev/ClassLoaderCompiler.java index b1cd0b2fce4..bd0b58c0a17 100644 --- a/core/devmode/src/main/java/io/quarkus/dev/ClassLoaderCompiler.java +++ b/core/devmode/src/main/java/io/quarkus/dev/ClassLoaderCompiler.java @@ -133,7 +133,8 @@ public ClassLoaderCompiler(ClassLoader classLoader, classPathElements, new File(i.getProjectDirectory()), new File(sourcePath), - new File(i.getClassesPath()))); + new File(i.getClassesPath()), + context.getSourceEncoding())); }); } } diff --git a/core/devmode/src/main/java/io/quarkus/dev/CompilationProvider.java b/core/devmode/src/main/java/io/quarkus/dev/CompilationProvider.java index b3f3f689ab7..471dd2f714e 100644 --- a/core/devmode/src/main/java/io/quarkus/dev/CompilationProvider.java +++ b/core/devmode/src/main/java/io/quarkus/dev/CompilationProvider.java @@ -1,6 +1,8 @@ package io.quarkus.dev; import java.io.File; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.Collections; import java.util.Set; @@ -24,19 +26,22 @@ class Context { private final File projectDirectory; private final File sourceDirectory; private final File outputDirectory; + private final Charset sourceEncoding; public Context( String name, Set<File> classpath, File projectDirectory, File sourceDirectory, - File outputDirectory) { + File outputDirectory, + String sourceEncoding) { this.name = name; this.classpath = classpath; this.projectDirectory = projectDirectory; this.sourceDirectory = sourceDirectory; this.outputDirectory = outputDirectory; + this.sourceEncoding = sourceEncoding == null ? StandardCharsets.UTF_8 : Charset.forName(sourceEncoding); } public String getName() { @@ -58,5 +63,9 @@ public File getSourceDirectory() { public File getOutputDirectory() { return outputDirectory; } + + public Charset getSourceEncoding() { + return sourceEncoding; + } } } diff --git a/core/devmode/src/main/java/io/quarkus/dev/DevModeContext.java b/core/devmode/src/main/java/io/quarkus/dev/DevModeContext.java index 66abc322235..e2ab7d443cb 100644 --- a/core/devmode/src/main/java/io/quarkus/dev/DevModeContext.java +++ b/core/devmode/src/main/java/io/quarkus/dev/DevModeContext.java @@ -22,6 +22,7 @@ public class DevModeContext implements Serializable { private final List<ModuleInfo> modules = new ArrayList<>(); private final Map<String, String> systemProperties = new HashMap<>(); private final Map<String, String> buildSystemProperties = new HashMap<>(); + private String sourceEncoding; private final List<File> classesRoots = new ArrayList<>(); private File frameworkClassesDir; @@ -45,6 +46,14 @@ public Map<String, String> getBuildSystemProperties() { return buildSystemProperties; } + public String getSourceEncoding() { + return sourceEncoding; + } + + public void setSourceEncoding(String sourceEncoding) { + this.sourceEncoding = sourceEncoding; + } + public List<File> getClassesRoots() { return classesRoots; } diff --git a/core/devmode/src/main/java/io/quarkus/dev/JavaCompilationProvider.java b/core/devmode/src/main/java/io/quarkus/dev/JavaCompilationProvider.java index 4d278df56fe..a4accd940e2 100644 --- a/core/devmode/src/main/java/io/quarkus/dev/JavaCompilationProvider.java +++ b/core/devmode/src/main/java/io/quarkus/dev/JavaCompilationProvider.java @@ -3,7 +3,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -44,7 +43,7 @@ public void compile(Set<File> filesToCompile, Context context) { } DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector<>(); try (StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnostics, null, - StandardCharsets.UTF_8)) { + context.getSourceEncoding())) { fileManager.setLocation(StandardLocation.CLASS_PATH, context.getClasspath()); fileManager.setLocation(StandardLocation.CLASS_OUTPUT, Collections.singleton(context.getOutputDirectory())); diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java index 690974dcc50..5f186ace540 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java @@ -30,12 +30,14 @@ import org.gradle.api.GradleException; import org.gradle.api.Project; +import org.gradle.api.Task; import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.Dependency; import org.gradle.api.artifacts.DependencySet; import org.gradle.api.artifacts.ProjectDependency; import org.gradle.api.artifacts.ResolvedDependency; import org.gradle.api.plugins.Convention; +import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPluginConvention; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.InputDirectory; @@ -43,6 +45,7 @@ import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.SourceSetContainer; import org.gradle.api.tasks.TaskAction; +import org.gradle.api.tasks.compile.JavaCompile; import org.gradle.api.tasks.options.Option; import io.quarkus.bootstrap.model.AppArtifact; @@ -140,6 +143,7 @@ public void startDev() { "Does the project have any source files?"); } DevModeContext context = new DevModeContext(); + context.setSourceEncoding(getSourceEncoding()); try { List<String> args = new ArrayList<>(); args.add(JavaBinFinder.findBin()); @@ -331,6 +335,14 @@ public void run() { } } + private String getSourceEncoding() { + Task javaCompile = getProject().getTasks().getByName(JavaPlugin.COMPILE_JAVA_TASK_NAME); + if (javaCompile != null) { + return ((JavaCompile) javaCompile).getOptions().getEncoding(); + } + return null; + } + private void copyOutputToConsole(InputStream is) { try (InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8); BufferedReader br = new BufferedReader(isr)) { 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 caafb049be5..74c880cd77c 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java @@ -225,6 +225,7 @@ public void execute() throws MojoFailureException, MojoExecutionException { devModeContext.getSystemProperties().put(e.getKey().toString(), (String) e.getValue()); } devModeContext.getBuildSystemProperties().putAll((Map) project.getProperties()); + devModeContext.setSourceEncoding(getSourceEncoding()); final AppModel appModel; try { @@ -368,6 +369,14 @@ public void run() { } } + private String getSourceEncoding() { + Object sourceEncodingProperty = project.getProperties().get("project.build.sourceEncoding"); + if (sourceEncodingProperty != null) { + return (String) sourceEncodingProperty; + } + return null; + } + private void addProject(DevModeContext devModeContext, LocalProject localProject) { String projectDirectory = null;

['devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java', 'core/devmode/src/main/java/io/quarkus/dev/CompilationProvider.java', 'core/devmode/src/main/java/io/quarkus/dev/ClassLoaderCompiler.java', 'core/devmode/src/main/java/io/quarkus/dev/JavaCompilationProvider.java', 'devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java', 'core/devmode/src/main/java/io/quarkus/dev/DevModeContext.java']

{'.java': 6}

Java

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

Apache License 2.0

quarkusio/quarkus/3480/3331

quarkusio

quarkus

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

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

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

closes

NPE when using io.quarkus.cli.commands.CreateProject.doCreateProject() on native image

**Describe the bug** Having NPE when using when using io.quarkus.cli.commands.CreateProject.doCreateProject() on native image. I suppose the template are not automatically included ``` 2019-07-25 11:42:30,588 ERROR [io.und.req.io] (executor-thread-1) Exception handling request de13b80e-5c67-479a-bd61-b2c9b73ba68d-1 to /api/quarkus/download: org.jboss.resteasy.spi.UnhandledException: java.lang.NullPointerException --   | 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:209)   | at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:496)   | at org.jboss.resteasy.core.SynchronousDispatcher.lambda$invoke$4(SynchronousDispatcher.java:252)   | at org.jboss.resteasy.core.SynchronousDispatcher.lambda$preprocess$0(SynchronousDispatcher.java:153)   | at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:363)   | at org.jboss.resteasy.core.SynchronousDispatcher.preprocess(SynchronousDispatcher.java:156)   | at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:238)   | at org.jboss.resteasy.plugins.server.servlet.ServletContainerDispatcher.service(ServletContainerDispatcher.java:249)   | at org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:60)   | at org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher.service(HttpServletDispatcher.java:55)   | at javax.servlet.http.HttpServlet.service(HttpServlet.java:791)   | at io.undertow.servlet.handlers.ServletHandler.handleRequest(ServletHandler.java:74)   | at io.undertow.servlet.handlers.security.ServletSecurityRoleHandler.handleRequest(ServletSecurityRoleHandler.java:62)   | 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:132)   | 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:64)   | 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.AbstractSecurityContextAssociationHandler.handleRequest(AbstractSecurityContextAssociationHandler.java:43)   | at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43)   | at io.quarkus.undertow.runtime.RewriteCorrectingHandlerWrappers$PostWrapper$1.handleRequest(RewriteCorrectingHandlerWrappers.java:51)   | at io.undertow.predicate.PredicatesHandler.handleRequest(PredicatesHandler.java:110)   | at io.undertow.server.handlers.RequestDumpingHandler.handleRequest(RequestDumpingHandler.java:162)   | at io.undertow.predicate.PredicatesHandler.handleRequest(PredicatesHandler.java:93)   | at io.undertow.server.handlers.SetHeaderHandler.handleRequest(SetHeaderHandler.java:90)   | at io.undertow.predicate.PredicatesHandler.handleRequest(PredicatesHandler.java:93)   | at io.quarkus.undertow.runtime.RewriteCorrectingHandlerWrappers$PreWrapper$1.handleRequest(RewriteCorrectingHandlerWrappers.java:31)   | at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43)   | at io.undertow.servlet.handlers.ServletInitialHandler.handleFirstRequest(ServletInitialHandler.java:292)   | at io.undertow.servlet.handlers.ServletInitialHandler.access$100(ServletInitialHandler.java:81)   | at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:138)   | at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:135)   | 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$8$1$1.call(UndertowDeploymentRecorder.java:483)   | at io.undertow.servlet.handlers.ServletInitialHandler.dispatchRequest(ServletInitialHandler.java:272)   | at io.undertow.servlet.handlers.ServletInitialHandler.access$000(ServletInitialHandler.java:81)   | at io.undertow.servlet.handlers.ServletInitialHandler$1.handleRequest(ServletInitialHandler.java:104)   | at io.undertow.server.Connectors.executeRootHandler(Connectors.java:364)   | at io.undertow.server.HttpServerExchange$1.run(HttpServerExchange.java:830)   | at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35)   | at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2011)   | at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1538)   | at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1429)   | at org.jboss.threads.DelegatingRunnable.run(DelegatingRunnable.java:29)   | at org.jboss.threads.ThreadLocalResettingRunnable.run(ThreadLocalResettingRunnable.java:32)   | at java.lang.Thread.run(Thread.java:748)   | at org.jboss.threads.JBossThread.run(JBossThread.java:479)   | at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:473)   | at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:193)   | Caused by: java.lang.NullPointerException   | at java.io.Reader.<init>(Reader.java:78)   | at java.io.InputStreamReader.<init>(InputStreamReader.java:113)   | at io.quarkus.templates.rest.BasicRest.generate(BasicRest.java:119)   | at io.quarkus.templates.rest.BasicRest.initProject(BasicRest.java:98)   | at io.quarkus.templates.rest.BasicRest.generate(BasicRest.java:47)   | at io.quarkus.cli.commands.CreateProject.doCreateProject(CreateProject.java:127)   | at io.launcher.quarkus.LauncherQuarkus.download(LauncherQuarkus.kt:52)   | at io.launcher.quarkus.LauncherQuarkus_Subclass.download$$superaccessor1(LauncherQuarkus_Subclass.zig:120)   | at io.launcher.quarkus.LauncherQuarkus_Subclass$$function$$1.apply(LauncherQuarkus_Subclass$$function$$1.zig:51)   | at io.quarkus.arc.InvocationContextImpl.interceptorChainCompleted(InvocationContextImpl.java:141)   | at io.quarkus.arc.InvocationContextImpl.proceed(InvocationContextImpl.java:161)   | at io.quarkus.hibernate.validator.runtime.interceptor.AbstractMethodValidationInterceptor.validateMethodInvocation(AbstractMethodValidationInterceptor.java:67)   | at io.quarkus.hibernate.validator.runtime.jaxrs.JaxrsEndPointValidationInterceptor.validateMethodInvocation(JaxrsEndPointValidationInterceptor.java:29)   | at io.quarkus.hibernate.validator.runtime.jaxrs.JaxrsEndPointValidationInterceptor_Bean.intercept(JaxrsEndPointValidationInterceptor_Bean.zig:106)   | at io.quarkus.arc.InvocationContextImpl$InterceptorInvocation.invoke(InvocationContextImpl.java:254)   | at io.quarkus.arc.InvocationContextImpl.invokeNext(InvocationContextImpl.java:133)   | at io.quarkus.arc.InvocationContextImpl.proceed(InvocationContextImpl.java:157)   | at io.launcher.quarkus.LauncherQuarkus_Subclass.download(LauncherQuarkus_Subclass.zig:204)   | at java.lang.reflect.Method.invoke(Method.java:498)   | at org.jboss.resteasy.core.MethodInjectorImpl.invoke(MethodInjectorImpl.java:151)   | at org.jboss.resteasy.core.MethodInjectorImpl.lambda$invoke$3(MethodInjectorImpl.java:122)   | at java.util.concurrent.CompletableFuture.uniApply(CompletableFuture.java:602)   | at java.util.concurrent.CompletableFuture.uniApplyStage(CompletableFuture.java:614)   | at java.util.concurrent.CompletableFuture.thenApply(CompletableFuture.java:1983)   | at java.util.concurrent.CompletableFuture.thenApply(CompletableFuture.java:110)   | at org.jboss.resteasy.core.MethodInjectorImpl.invoke(MethodInjectorImpl.java:122)   | at org.jboss.resteasy.core.ResourceMethodInvoker.internalInvokeOnTarget(ResourceMethodInvoker.java:580)   | at org.jboss.resteasy.core.ResourceMethodInvoker.invokeOnTargetAfterFilter(ResourceMethodInvoker.java:454)   | at org.jboss.resteasy.core.ResourceMethodInvoker.lambda$invokeOnTarget$2(ResourceMethodInvoker.java:408)   | at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:363)   | at org.jboss.resteasy.core.ResourceMethodInvoker.invokeOnTarget(ResourceMethodInvoker.java:410)   | at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:379)   | at org.jboss.resteasy.core.ResourceMethodInvoker.lambda$invoke$1(ResourceMethodInvoker.java:353)   | at java.util.concurrent.CompletableFuture.uniComposeStage(CompletableFuture.java:981)   | at java.util.concurrent.CompletableFuture.thenCompose(CompletableFuture.java:2124)   | at java.util.concurrent.CompletableFuture.thenCompose(CompletableFuture.java:110)   | at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:353)   | at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:477)   | ... 52 more ``` **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. Use `doCreateProject` with a valid `CreateProject` in a quarkus project and bind it to a rest endpoint 2. Create a native image 3. Call example: https://github.com/fabric8-launcher/launcher-quarkus/blob/master/src/main/kotlin/io/launcher/quarkus/LauncherQuarkus.kt#L52 **Workaround** ``` <plugin> <groupId>io.quarkus</groupId> <artifactId>quarkus-maven-plugin</artifactId> <version>${version.quarkus}</version> <executions> <execution> <goals> <goal>build</goal> </goals> <configuration> <additionalBuildArgs>-H:IncludeResources=templates/.*</additionalBuildArgs> </configuration> </execution> </executions> </plugin> ```

deb067251db1fadb5527c5baa737dc897df41084

826ffdbf5c9fb8dd909e41fc9418e9940dab809f

https://github.com/quarkusio/quarkus/compare/deb067251db1fadb5527c5baa737dc897df41084...826ffdbf5c9fb8dd909e41fc9418e9940dab809f

diff --git a/devtools/common/src/main/java/io/quarkus/generators/rest/BasicRestProjectGenerator.java b/devtools/common/src/main/java/io/quarkus/generators/rest/BasicRestProjectGenerator.java index bd9c600c8f7..dacd619630b 100644 --- a/devtools/common/src/main/java/io/quarkus/generators/rest/BasicRestProjectGenerator.java +++ b/devtools/common/src/main/java/io/quarkus/generators/rest/BasicRestProjectGenerator.java @@ -5,7 +5,9 @@ import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; +import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; @@ -111,9 +113,15 @@ private void generate(final String templateName, final Map<String, Object> conte throws IOException { if (!writer.exists(outputFilePath)) { String path = templateName.startsWith("/") ? templateName : "/" + templateName; - try (final BufferedReader stream = new BufferedReader( - new InputStreamReader(getClass().getResourceAsStream(path), StandardCharsets.UTF_8))) { - String template = stream.lines().collect(Collectors.joining("\\n")); + URL resource = getClass().getResource(path); + if (resource == null) { + throw new IOException("Template resource is missing: " + path); + } + try ( + InputStream resourceStream = resource.openStream(); + InputStreamReader streamReader = new InputStreamReader(resourceStream, StandardCharsets.UTF_8); + BufferedReader bufferedReader = new BufferedReader(streamReader)) { + String template = bufferedReader.lines().collect(Collectors.joining("\\n")); for (Entry<String, Object> e : context.entrySet()) { if (e.getValue() != null) { // Exclude null values (classname and path can be null) template = template.replace(format("${%s}", e.getKey()), e.getValue().toString());

['devtools/common/src/main/java/io/quarkus/generators/rest/BasicRestProjectGenerator.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/3469/3468

quarkusio

quarkus

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

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

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

fixes

Superfluous metrics are being created from SmallRye internal classes

Classes in `io.smallrye.metrics.interceptors` package are annotated in a way that when scanned as application classes, some metrics will be created out of them, but these are internal classes and are not meant to be scanned for metric annotations. This means we register some metrics unnecessarily, which hinders performance and makes the export contain superfluous metrics whose values will always be 0. An excerpt from such bloated OpenMetrics export: ``` # TYPE application_io_smallrye_metrics_interceptors_MeteredInterceptor_meteredMethod_total counter application_io_smallrye_metrics_interceptors_MeteredInterceptor_meteredMethod_total 0.0 # TYPE application_io_smallrye_metrics_interceptors_MeteredInterceptor_meteredMethod_rate_per_second gauge application_io_smallrye_metrics_interceptors_MeteredInterceptor_meteredMethod_rate_per_second 0.0 # TYPE application_io_smallrye_metrics_interceptors_MeteredInterceptor_meteredMethod_one_min_rate_per_second gauge application_io_smallrye_metrics_interceptors_MeteredInterceptor_meteredMethod_one_min_rate_per_second 0.0 # TYPE application_io_smallrye_metrics_interceptors_MeteredInterceptor_meteredMethod_five_min_rate_per_second gauge application_io_smallrye_metrics_interceptors_MeteredInterceptor_meteredMethod_five_min_rate_per_second 0.0 # TYPE application_io_smallrye_metrics_interceptors_MeteredInterceptor_meteredMethod_fifteen_min_rate_per_second gauge application_io_smallrye_metrics_interceptors_MeteredInterceptor_meteredMethod_fifteen_min_rate_per_second 0.0 ``` This happens for every application that has MP Metrics enabled.

5de2bedd081f7248a6dfac994a0e9967049c4da2

a4b265da08e286522bf4d594c37c75fedd0f5953

https://github.com/quarkusio/quarkus/compare/5de2bedd081f7248a6dfac994a0e9967049c4da2...a4b265da08e286522bf4d594c37c75fedd0f5953

diff --git a/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java index 197cd1bffda..13af72d2877 100644 --- a/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java +++ b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java @@ -167,12 +167,16 @@ void registerMetricsFromAnnotatedMethods(SmallRyeMetricsRecorder metrics, switch (metricAnnotationTarget.kind()) { case METHOD: { MethodInfo method = metricAnnotationTarget.asMethod(); - collectedMetricsMethods.add(method); + if (!method.declaringClass().name().toString().startsWith("io.smallrye.metrics")) { + collectedMetricsMethods.add(method); + } break; } case CLASS: { ClassInfo clazz = metricAnnotationTarget.asClass(); - collectMetricsClassAndSubClasses(index, collectedMetricsClasses, clazz); + if (!clazz.name().toString().startsWith("io.smallrye.metrics")) { + collectMetricsClassAndSubClasses(index, collectedMetricsClasses, clazz); + } break; } } diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsTestCase.java index 4b617105e62..77c03160198 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsTestCase.java @@ -2,6 +2,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; import java.util.concurrent.TimeUnit; @@ -149,6 +150,16 @@ public void testEndpointWithMetricsThrowingException() { .statusCode(404); } + /** + * Verify that no metrics are created from SmallRye internal classes (for example the + * io.smallrye.metrics.interceptors package) + */ + @Test + public void testNoMetricsFromSmallRyeInternalClasses() { + RestAssured.when().get("/metrics/application").then() + .body(not(containsString("io_smallrye_metrics"))); + } + private void assertMetricExactValue(String name, String val) { RestAssured.when().get("/metrics").then() .body(containsString(name + " " + val));

['extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java', 'integration-tests/main/src/test/java/io/quarkus/it/main/MetricsTestCase.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/3464/2786

quarkusio

quarkus

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

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

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

fixes

--docker-build flag seems to have no effect with Gradle plugin

Since 0.15.0 version, when buildNative gradle task is invoked it asks for GRAALVM_HOME environment variable regardless of whether it is being run with --docker-build=true or --docker-build=false **Expected behavior** I would expect the build to not require GRAALVM_HOME set when using docker image as a build environment **Environment (please complete the following information):** - Output of `uname -a` or `ver`: **Linux localhost.localdomain 5.1.7-300.fc30.x86_64 #1 SMP Wed Jun 5 12:32:28 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux** - Output of `java -version`: **openjdk version "1.8.0_212"** - GraalVM version (if different from Java): **graalvm-ce-1.0.0-rc16** - Quarkus version or git rev: **0.16.1**

5de2bedd081f7248a6dfac994a0e9967049c4da2

7050ff1058b1f60a49fb5cc95cc108c7cf62fdf4

https://github.com/quarkusio/quarkus/compare/5de2bedd081f7248a6dfac994a0e9967049c4da2...7050ff1058b1f60a49fb5cc95cc108c7cf62fdf4

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java index 40fe7119d11..8ec05064312 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java @@ -217,9 +217,6 @@ public void setEnableCodeSizeReporting(boolean enableCodeSizeReporting) { @Optional @Input public String getGraalvmHome() { - if (graalvmHome == null || graalvmHome.length() < 1) - throw new GradleException( - "The GRAALVM_HOME environment variable need to be set to your GraalVM root directory to use native mode"); return graalvmHome; }

['devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.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/3421/3419

quarkusio

quarkus

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

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

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

fixes

OAuth2IdentityManager.verify(String id, Credential credential) - infinite loop

OAuth2IdentityManager.verify(String id, Credential credential) has infinite loop / recursive call. link to code: https://github.com/quarkusio/quarkus/blob/master/extensions/elytron-security-oauth2/runtime/src/main/java/io/quarkus/elytron/security/oauth2/runtime/auth/OAuth2IdentityManager.java#L31 @loicmathieu should be current `return verify(null, credential);` changed to `return verify(credential);` ?

76f6ac5b312d9c2a872c9305501f37234a117ee9

9bc7197f215b021cf0e85ececdd877fd4dc5987e

https://github.com/quarkusio/quarkus/compare/76f6ac5b312d9c2a872c9305501f37234a117ee9...9bc7197f215b021cf0e85ececdd877fd4dc5987e

diff --git a/extensions/elytron-security-oauth2/runtime/src/main/java/io/quarkus/elytron/security/oauth2/runtime/auth/OAuth2IdentityManager.java b/extensions/elytron-security-oauth2/runtime/src/main/java/io/quarkus/elytron/security/oauth2/runtime/auth/OAuth2IdentityManager.java index d80f485dbc0..b876f10f978 100644 --- a/extensions/elytron-security-oauth2/runtime/src/main/java/io/quarkus/elytron/security/oauth2/runtime/auth/OAuth2IdentityManager.java +++ b/extensions/elytron-security-oauth2/runtime/src/main/java/io/quarkus/elytron/security/oauth2/runtime/auth/OAuth2IdentityManager.java @@ -29,7 +29,7 @@ public Account verify(Account account) { @Override public Account verify(String id, Credential credential) { - return verify(null, credential); + return null; } @Override

['extensions/elytron-security-oauth2/runtime/src/main/java/io/quarkus/elytron/security/oauth2/runtime/auth/OAuth2IdentityManager.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/3289/3268

quarkusio

quarkus

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

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

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

fixes

Runtime artifact's POM repos aren't propagated to resolve the corresponding deployment deps

**Describe the bug** I'm testing camel extensions against the latest quarkus snapshot to validate the fix for https://github.com/quarkusio/quarkus/issues/3094 and when running the integration tests I see the following error: ``` [INFO] Running org.apache.camel.quarkus.core.CamelTest [ERROR] Tests run: 3, Failures: 0, Errors: 3, Skipped: 0, Time elapsed: 28.218 s <<< FAILURE! - in org.apache.camel.quarkus.core.CamelTest [ERROR] testProperties Time elapsed: 0.008 s <<< ERROR! org.junit.jupiter.api.extension.TestInstantiationException: TestInstanceFactory [io.quarkus.test.junit.QuarkusTestExtension] failed to instantiate test class [org.apache.camel.quarkus.core.CamelTest]: Failed to create the boostrap class loader Caused by: java.lang.IllegalStateException: Failed to create the boostrap class loader Caused by: io.quarkus.bootstrap.BootstrapException: Failed to create the deployment classloader for org.apache.camel.quarkus:camel-quarkus-integration-test-core::jar:0.0.1-SNAPSHOT Caused by: io.quarkus.bootstrap.resolver.AppModelResolverException: Failed to inject extension deployment dependencies for org.apache.camel.quarkus:camel-quarkus-integration-test-core:jar:0.0.1-SNAPSHOT Caused by: io.quarkus.bootstrap.BootstrapDependencyProcessingException: No dependencies collected for Quarkus extension deployment artifact io.quarkus:quarkus-resteasy-deployment:jar:999-SNAPSHOT while at least the corresponding runtime artifact io.quarkus:quarkus-resteasy:jar:999-20190718.021121-60 is expected ``` **To Reproduce** Steps to reproduce the behavior: 1. check-out https://github.com/lburgazzoli/apache-camel-quarkus/tree/test-packages 2. run `./mvnw clean install` **Environment (please complete the following information):** - Output of `uname -a` or `ver`: ``` Linux mars 5.1.17-300.fc30.x86_64 #1 SMP Wed Jul 10 15:20:27 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux ``` - Output of `java -version`: ``` openjdk version "1.8.0_212" OpenJDK Runtime Environment (build 1.8.0_212-b04) OpenJDK 64-Bit Server VM (build 25.212-b04, mixed mode) ``` - GraalVM version (if different from Java): ``` openjdk version "1.8.0_212" OpenJDK Runtime Environment (build 1.8.0_212-20190523183340.buildslave.jdk8u-src-tar--b03) OpenJDK 64-Bit GraalVM CE 19.0.2 (build 25.212-b03-jvmci-19-b04, mixed mode) ``` - Quarkus version or git rev: ``` 999-SNAPSHOT (from oss snapshot repo) ```

d17007d596c18534329ae8c5558fa83d42074885

47ec84157c649848ea807681489d0cf74c190bf3

https://github.com/quarkusio/quarkus/compare/d17007d596c18534329ae8c5558fa83d42074885...47ec84157c649848ea807681489d0cf74c190bf3

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java index 3f1ba98fb0c..b6e7057a7ff 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java @@ -17,6 +17,7 @@ import org.eclipse.aether.graph.DependencyNode; import org.eclipse.aether.graph.DependencyVisitor; import org.eclipse.aether.repository.RemoteRepository; +import org.eclipse.aether.resolution.ArtifactDescriptorResult; import org.eclipse.aether.resolution.ArtifactRequest; import org.eclipse.aether.resolution.ArtifactResult; import org.eclipse.aether.resolution.VersionRangeResult; @@ -134,68 +135,15 @@ public AppModel resolveManagedModel(AppArtifact appArtifact, List<AppDependency> private AppModel doResolveModel(AppArtifact appArtifact, List<Dependency> directMvnDeps, AppArtifact managingProject) throws AppModelResolverException { List<Dependency> managedDeps = Collections.emptyList(); + List<RemoteRepository> managedRepos = Collections.emptyList(); if(managingProject != null) { - managedDeps = mvn.resolveDescriptor(toAetherArtifact(managingProject)).getManagedDependencies(); + final ArtifactDescriptorResult managingDescr = mvn.resolveDescriptor(toAetherArtifact(managingProject)); + managedDeps = managingDescr.getManagedDependencies(); + managedRepos = mvn.newResolutionRepositories(managingDescr.getRepositories()); } - return injectDeploymentDependencies(appArtifact, mvn.resolveManagedDependencies(toAetherArtifact(appArtifact), - directMvnDeps, managedDeps, devmode ? new String[] { "test" } : new String[0]).getRoot(), managedDeps); - } - - @Override - public List<String> listLaterVersions(AppArtifact appArtifact, String upToVersion, boolean inclusive) throws AppModelResolverException { - final VersionRangeResult rangeResult = resolveVersionRangeResult(appArtifact, appArtifact.getVersion(), false, upToVersion, inclusive); - final List<Version> resolvedVersions = rangeResult.getVersions(); - final List<String> versions = new ArrayList<>(resolvedVersions.size()); - for (Version v : resolvedVersions) { - versions.add(v.toString()); - } - return versions; - } - - @Override - public String getNextVersion(AppArtifact appArtifact, String fromVersion, boolean fromVersionIncluded, String upToVersion, boolean upToVersionInclusive) throws AppModelResolverException { - final VersionRangeResult rangeResult = resolveVersionRangeResult(appArtifact, fromVersion, fromVersionIncluded, upToVersion, upToVersionInclusive); - final List<Version> versions = rangeResult.getVersions(); - if(versions.isEmpty()) { - return null; - } - Version next = versions.get(0); - for(int i = 1; i < versions.size(); ++i) { - final Version candidate = versions.get(i); - if(next.compareTo(candidate) > 0) { - next = candidate; - } - } - return next.toString(); - } - - @Override - public String getLatestVersion(AppArtifact appArtifact, String upToVersion, boolean inclusive) throws AppModelResolverException { - final VersionRangeResult rangeResult = resolveVersionRangeResult(appArtifact, appArtifact.getVersion(), false, upToVersion, inclusive); - final List<Version> versions = rangeResult.getVersions(); - if(versions.isEmpty()) { - return appArtifact.getVersion(); - } - Version latest = versions.get(0); - for(int i = 1; i < versions.size(); ++i) { - final Version candidate = versions.get(i); - if(latest.compareTo(candidate) < 0) { - latest = candidate; - } - } - return latest.toString(); - } - - public List<RemoteRepository> resolveArtifactRepos(AppArtifact appArtifact) throws AppModelResolverException { - return mvn.resolveDescriptor(toAetherArtifact(appArtifact)).getRepositories(); - } - - public void install(AppArtifact appArtifact, Path localPath) throws AppModelResolverException { - mvn.install(new DefaultArtifact(appArtifact.getGroupId(), appArtifact.getArtifactId(), appArtifact.getClassifier(), - appArtifact.getType(), appArtifact.getVersion(), Collections.emptyMap(), localPath.toFile())); - } - private AppModel injectDeploymentDependencies(AppArtifact appArtifact, DependencyNode root, List<Dependency> managedDeps) throws AppModelResolverException { + DependencyNode resolvedDeps = mvn.resolveManagedDependencies(toAetherArtifact(appArtifact), + directMvnDeps, managedDeps, managedRepos, devmode ? new String[] { "test" } : new String[0]).getRoot(); final Set<AppArtifactKey> appDeps = new HashSet<>(); final List<AppDependency> userDeps = new ArrayList<>(); @@ -215,15 +163,16 @@ public boolean visitLeave(DependencyNode node) { } return true; }}); - for(DependencyNode child : root.getChildren()) { + for(DependencyNode child : resolvedDeps.getChildren()) { child.accept(visitor); } - final DeploymentInjectingDependencyVisitor deploymentInjector = new DeploymentInjectingDependencyVisitor(mvn, managedDeps); + final DeploymentInjectingDependencyVisitor deploymentInjector = new DeploymentInjectingDependencyVisitor(mvn, + managedDeps, mvn.aggregateRepositories(managedRepos, mvn.newResolutionRepositories(mvn.resolveDescriptor(toAetherArtifact(appArtifact)).getRepositories()))); try { - root.accept(new TreeDependencyVisitor(deploymentInjector)); + resolvedDeps.accept(new TreeDependencyVisitor(deploymentInjector)); } catch (DeploymentInjectionException e) { - throw new AppModelResolverException("Failed to inject extension deployment dependencies for " + root.getArtifact(), e.getCause()); + throw new AppModelResolverException("Failed to inject extension deployment dependencies for " + resolvedDeps.getArtifact(), e.getCause()); } List<AppDependency> deploymentDeps = Collections.emptyList(); @@ -231,15 +180,15 @@ public boolean visitLeave(DependencyNode node) { final DependencyGraphTransformationContext context = new SimpleDependencyGraphTransformationContext(mvn.getSession()); try { // add conflict IDs to the added deployments - root = new ConflictMarker().transformGraph(root, context); + resolvedDeps = new ConflictMarker().transformGraph(resolvedDeps, context); // resolves version conflicts - root = new ConflictIdSorter().transformGraph(root, context); - root = mvn.getSession().getDependencyGraphTransformer().transformGraph(root, context); + resolvedDeps = new ConflictIdSorter().transformGraph(resolvedDeps, context); + resolvedDeps = mvn.getSession().getDependencyGraphTransformer().transformGraph(resolvedDeps, context); } catch (RepositoryException e) { throw new AppModelResolverException("Failed to normalize the dependency graph", e); } final BuildDependencyGraphVisitor buildDepsVisitor = new BuildDependencyGraphVisitor(appDeps, buildTreeConsumer); - buildDepsVisitor.visit(root); + buildDepsVisitor.visit(resolvedDeps); final List<ArtifactRequest> requests = buildDepsVisitor.getArtifactRequests(); if(!requests.isEmpty()) { final List<ArtifactResult> results = mvn.resolve(requests); @@ -262,6 +211,60 @@ public boolean visitLeave(DependencyNode node) { return new AppModel(appArtifact, userDeps, deploymentDeps); } + @Override + public List<String> listLaterVersions(AppArtifact appArtifact, String upToVersion, boolean inclusive) throws AppModelResolverException { + final VersionRangeResult rangeResult = resolveVersionRangeResult(appArtifact, appArtifact.getVersion(), false, upToVersion, inclusive); + final List<Version> resolvedVersions = rangeResult.getVersions(); + final List<String> versions = new ArrayList<>(resolvedVersions.size()); + for (Version v : resolvedVersions) { + versions.add(v.toString()); + } + return versions; + } + + @Override + public String getNextVersion(AppArtifact appArtifact, String fromVersion, boolean fromVersionIncluded, String upToVersion, boolean upToVersionInclusive) throws AppModelResolverException { + final VersionRangeResult rangeResult = resolveVersionRangeResult(appArtifact, fromVersion, fromVersionIncluded, upToVersion, upToVersionInclusive); + final List<Version> versions = rangeResult.getVersions(); + if(versions.isEmpty()) { + return null; + } + Version next = versions.get(0); + for(int i = 1; i < versions.size(); ++i) { + final Version candidate = versions.get(i); + if(next.compareTo(candidate) > 0) { + next = candidate; + } + } + return next.toString(); + } + + @Override + public String getLatestVersion(AppArtifact appArtifact, String upToVersion, boolean inclusive) throws AppModelResolverException { + final VersionRangeResult rangeResult = resolveVersionRangeResult(appArtifact, appArtifact.getVersion(), false, upToVersion, inclusive); + final List<Version> versions = rangeResult.getVersions(); + if(versions.isEmpty()) { + return appArtifact.getVersion(); + } + Version latest = versions.get(0); + for(int i = 1; i < versions.size(); ++i) { + final Version candidate = versions.get(i); + if(latest.compareTo(candidate) < 0) { + latest = candidate; + } + } + return latest.toString(); + } + + public List<RemoteRepository> resolveArtifactRepos(AppArtifact appArtifact) throws AppModelResolverException { + return mvn.resolveDescriptor(toAetherArtifact(appArtifact)).getRepositories(); + } + + public void install(AppArtifact appArtifact, Path localPath) throws AppModelResolverException { + mvn.install(new DefaultArtifact(appArtifact.getGroupId(), appArtifact.getArtifactId(), appArtifact.getClassifier(), + appArtifact.getType(), appArtifact.getVersion(), Collections.emptyMap(), localPath.toFile())); + } + private VersionRangeResult resolveVersionRangeResult(AppArtifact appArtifact, String fromVersion, boolean fromVersionIncluded, String upToVersion, boolean upToVersionIncluded) throws AppModelResolverException { return mvn.resolveVersionRange(new DefaultArtifact(appArtifact.getGroupId(), diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java index 22d9890183a..5199430f4a4 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java @@ -15,6 +15,7 @@ import org.eclipse.aether.graph.Dependency; import org.eclipse.aether.graph.DependencyNode; import org.eclipse.aether.graph.DependencyVisitor; +import org.eclipse.aether.repository.RemoteRepository; import org.jboss.logging.Logger; import io.quarkus.bootstrap.BootstrapConstants; import io.quarkus.bootstrap.BootstrapDependencyProcessingException; @@ -37,13 +38,15 @@ public static Artifact getInjectedDependency(DependencyNode dep) { private final MavenArtifactResolver resolver; private final List<Dependency> managedDeps; + private final List<RemoteRepository> mainRepos; private DependencyNode node; boolean injectedDeps; - public DeploymentInjectingDependencyVisitor(MavenArtifactResolver resolver, List<Dependency> managedDeps) { + public DeploymentInjectingDependencyVisitor(MavenArtifactResolver resolver, List<Dependency> managedDeps, List<RemoteRepository> mainRepos) { this.resolver = resolver; this.managedDeps = managedDeps; + this.mainRepos = mainRepos; } public boolean isInjectedDeps() { @@ -124,7 +127,8 @@ private DependencyNode collectDependencies(Artifact artifact) throws BootstrapDe artifact = artifact.setVersion(node.getArtifact().getVersion()); } try { - return managedDeps.isEmpty() ? resolver.collectDependencies(artifact).getRoot() : resolver.collectManagedDependencies(artifact, Collections.emptyList(), managedDeps).getRoot(); + return managedDeps.isEmpty() ? resolver.collectDependencies(artifact, Collections.emptyList(), mainRepos).getRoot() + : resolver.collectManagedDependencies(artifact, Collections.emptyList(), managedDeps, mainRepos).getRoot(); } catch (AppModelResolverException e) { throw new DeploymentInjectionException(e); } diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenArtifactResolver.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenArtifactResolver.java index 8d52d76cc5b..a626b3552cc 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenArtifactResolver.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenArtifactResolver.java @@ -221,7 +221,11 @@ public DependencyResult resolveDependencies(Artifact artifact) throws AppModelRe } public CollectResult collectDependencies(Artifact artifact, List<Dependency> deps) throws AppModelResolverException { - final CollectRequest request = newCollectRequest(artifact); + return collectDependencies(artifact, deps, Collections.emptyList()); + } + + public CollectResult collectDependencies(Artifact artifact, List<Dependency> deps, List<RemoteRepository> mainRepos) throws AppModelResolverException { + final CollectRequest request = newCollectRequest(artifact, mainRepos); request.setDependencies(deps); try { return repoSystem.collectDependencies(repoSession, request); @@ -231,7 +235,11 @@ public CollectResult collectDependencies(Artifact artifact, List<Dependency> dep } public DependencyResult resolveDependencies(Artifact artifact, List<Dependency> deps) throws AppModelResolverException { - final CollectRequest request = newCollectRequest(artifact); + return resolveDependencies(artifact, deps, Collections.emptyList()); + } + + public DependencyResult resolveDependencies(Artifact artifact, List<Dependency> deps, List<RemoteRepository> mainRepos) throws AppModelResolverException { + final CollectRequest request = newCollectRequest(artifact, mainRepos); request.setDependencies(deps); try { return repoSystem.resolveDependencies(repoSession, @@ -254,7 +262,7 @@ public DependencyResult resolveDependencies(Artifact artifact, String... exclude deps.add(dep); } } - final List<RemoteRepository> requestRepos = remoteRepoManager.aggregateRepositories(repoSession, remoteRepos, descr.getRepositories(), true); + final List<RemoteRepository> requestRepos = aggregateRepositories(remoteRepos, newResolutionRepositories(descr.getRepositories())); try { return repoSystem.resolveDependencies(repoSession, new DependencyRequest().setCollectRequest( @@ -269,24 +277,32 @@ public DependencyResult resolveDependencies(Artifact artifact, String... exclude } public DependencyResult resolveManagedDependencies(Artifact artifact, List<Dependency> deps, List<Dependency> managedDeps, String... excludedScopes) throws AppModelResolverException { + return resolveManagedDependencies(artifact, deps, managedDeps, Collections.emptyList(), excludedScopes); + } + + public DependencyResult resolveManagedDependencies(Artifact artifact, List<Dependency> deps, List<Dependency> managedDeps, List<RemoteRepository> mainRepos, String... excludedScopes) throws AppModelResolverException { try { return repoSystem.resolveDependencies(repoSession, new DependencyRequest().setCollectRequest( - newCollectManagedRequest(artifact, deps, managedDeps, excludedScopes))); + newCollectManagedRequest(artifact, deps, managedDeps, mainRepos, excludedScopes))); } catch (DependencyResolutionException e) { throw new AppModelResolverException("Failed to resolve dependencies for " + artifact, e); } } public CollectResult collectManagedDependencies(Artifact artifact, List<Dependency> deps, List<Dependency> managedDeps, String... excludedScopes) throws AppModelResolverException { + return collectManagedDependencies(artifact, deps, managedDeps, Collections.emptyList(), excludedScopes); + } + + public CollectResult collectManagedDependencies(Artifact artifact, List<Dependency> deps, List<Dependency> managedDeps, List<RemoteRepository> mainRepos, String... excludedScopes) throws AppModelResolverException { try { - return repoSystem.collectDependencies(repoSession, newCollectManagedRequest(artifact, deps, managedDeps, excludedScopes)); + return repoSystem.collectDependencies(repoSession, newCollectManagedRequest(artifact, deps, managedDeps, mainRepos, excludedScopes)); } catch (DependencyCollectionException e) { throw new AppModelResolverException("Failed to collect dependencies for " + artifact, e); } } - private CollectRequest newCollectManagedRequest(Artifact artifact, List<Dependency> deps, List<Dependency> managedDeps, String... excludedScopes) throws AppModelResolverException { + private CollectRequest newCollectManagedRequest(Artifact artifact, List<Dependency> deps, List<Dependency> managedDeps, List<RemoteRepository> mainRepos, String... excludedScopes) throws AppModelResolverException { final ArtifactDescriptorResult descr = resolveDescriptor(artifact); Collection<String> excluded; if(excludedScopes.length == 0) { @@ -325,11 +341,20 @@ private CollectRequest newCollectManagedRequest(Artifact artifact, List<Dependen } } + final List<RemoteRepository> repos = aggregateRepositories(mainRepos, remoteRepos); return new CollectRequest() .setRootArtifact(artifact) .setDependencies(mergeDeps(deps, originalDeps, managedVersions)) .setManagedDependencies(mergedManagedDeps) - .setRepositories(remoteRepoManager.aggregateRepositories(repoSession, remoteRepos, descr.getRepositories(), true)); + .setRepositories(aggregateRepositories(repos, newResolutionRepositories(descr.getRepositories()))); + } + + public List<RemoteRepository> newResolutionRepositories(List<RemoteRepository> repos) { + return repos.isEmpty() ? Collections.emptyList() : repoSystem.newResolutionRepositories(repoSession, repos); + } + + public List<RemoteRepository> aggregateRepositories(List<RemoteRepository> dominant, List<RemoteRepository> recessive) { + return dominant.isEmpty() ? recessive : remoteRepoManager.aggregateRepositories(repoSession, dominant, recessive, false); } public void install(Artifact artifact) throws AppModelResolverException { @@ -340,10 +365,10 @@ public void install(Artifact artifact) throws AppModelResolverException { } } - private CollectRequest newCollectRequest(Artifact artifact) throws AppModelResolverException { + private CollectRequest newCollectRequest(Artifact artifact, List<RemoteRepository> mainRepos) throws AppModelResolverException { return new CollectRequest() .setRoot(new Dependency(artifact, JavaScopes.RUNTIME)) - .setRepositories(remoteRepos); + .setRepositories(aggregateRepositories(mainRepos, remoteRepos)); } private List<Dependency> mergeDeps(List<Dependency> dominant, List<Dependency> recessive, Map<AppArtifactKey, String> managedVersions) {

['independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenArtifactResolver.java', 'independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java', 'independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.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/3244/2907

quarkusio

quarkus

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

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

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

fixes

OpenAPI with static files instead of annotation scanning

**Describe the bug** It seems that all the `microprofile-open-api` features are not supported yet by quarkus. One setup example: Add the config property `mp.openapi.scan.disable=true` and a static OpenAPI file in `src/main/resources/META-INF/openapi.yaml`. In that case, the `microprofile-open-api` annotation scanning should be disabled and the openapi spec should be served from the static file. See https://github.com/eclipse/microprofile-open-api/blob/master/spec/src/main/asciidoc/microprofile-openapi-spec.adoc#static-openapi-files **Expected behavior** You see the static file served at http://localhost:8080/openapi **Actual behavior** I did not manage to see my local file, the server is always serving the generated one **To Reproduce** Steps to reproduce the behavior: 1. Create a project with Quarkus RESTEasy 2. Add the openapi extension and configure as described **Configuration** ```properties mp.openapi.scan.disable=true ``` Static OpenAPI file (that would be different from the generated one): ```yaml --- openapi: 3.0.1 info: title: My HelloWorld API version: "1.0" license: name: Eclipse Public License 2.0 url: 'https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html' paths: /hello: get: description: hello world method responses: 200: description: OK content: text/plain: schema: type: string ``` **Environment (please complete the following information):** - Output of `uname -a` or `ver`: ``` Darwin 18.5.0 Darwin Kernel Version 18.5.0: Mon Mar 11 20:40:32 PDT 2019; root:xnu-4903.251.3~3/RELEASE_X86_64 x86_64 ``` - Output of `java -version`: ``` java version "1.8.0_161" Java(TM) SE Runtime Environment (build 1.8.0_161-b12) Java HotSpot(TM) 64-Bit Server VM (build 25.161-b12, mixed mode) ``` - GraalVM version (if different from Java): [not used] - Quarkus version or git rev: 0.16.1 --- We had a quick look at the code with @emmanuelbernard at Voxxed Days Luxembourg 2019. There is one integration test for the default setup (generated spec based on the annotation) https://github.com/quarkusio/quarkus/blob/master/integration-tests/main/src/test/java/io/quarkus/it/main/OpenApiTestCase.java But other scenario should be tested as test of the "deployment" module of "smallrye-openapi" https://github.com/quarkusio/quarkus/tree/master/extensions/smallrye-openapi/deployment/ cc: @kenfinnigan

5f948526e88573eac8c713dcc3bd339f54ab3029

eaa55994e4410c939029f92357ade0bdb1cbb522

https://github.com/quarkusio/quarkus/compare/5f948526e88573eac8c713dcc3bd339f54ab3029...eaa55994e4410c939029f92357ade0bdb1cbb522

diff --git a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java index 90aab3f5459..d2db855ac8d 100644 --- a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java +++ b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java @@ -84,6 +84,7 @@ public class SmallRyeOpenApiProcessor { SmallRyeOpenApiConfig openapi; + @BuildStep List<HotDeploymentWatchedFileBuildItem> configFiles() { return Stream.of(META_INF_OPENAPI_YAML, WEB_INF_CLASSES_META_INF_OPENAPI_YAML, META_INF_OPENAPI_YML, WEB_INF_CLASSES_META_INF_OPENAPI_YML,

['extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.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/2738/2726

quarkusio

quarkus

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

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

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

fixes

Broken access in openapi and swagger-ui extensions

**Describe the bug** Openapi and swagger-ui intergrations are broken. https://github.com/quarkusio/quarkus-quickstarts/tree/master/using-openapi-swaggerui is also broken. It starts up, but /openapi endpoint and /swagger-ui respond with errors. **Expected behavior** Cool openapi and swagger pages, heh **Symptoms** Adding config key resolves problem in production env, but dev still errors. ``` quarkus.swagger-ui.always-include=true ``` Also it's strange that when I'm not adding this line, openapi is still available in production - not sure how safe is this. **Openapi error info** ``` Context Path: Servlet Path: /openapi Path Info: null Query String: null Stack Trace: java.io.FileNotFoundException: /quarkus-generated-openapi-doc.YAML at io.undertow.servlet.handlers.DefaultServlet.doGet(DefaultServlet.java:173) at javax.servlet.http.HttpServlet.service(HttpServlet.java:686) at javax.servlet.http.HttpServlet.service(HttpServlet.java:791) at io.undertow.servlet.handlers.ServletHandler.handleRequest(ServletHandler.java:74) at io.undertow.servlet.handlers.FilterHandler.handleRequest(FilterHandler.java:81) at io.undertow.servlet.handlers.security.ServletSecurityRoleHandler.handleRequest(ServletSecurityRoleHandler.java:62) at io.undertow.servlet.handlers.ServletChain$1.handleRequest(ServletChain.java:68) at io.undertow.servlet.handlers.ServletDispatchingHandler.handleRequest(ServletDispatchingHandler.java:36) 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.dispatchRequest(ServletInitialHandler.java:274) at io.undertow.servlet.handlers.ServletInitialHandler.dispatchToServlet(ServletInitialHandler.java:219) at io.undertow.servlet.spec.RequestDispatcherImpl.includeImpl(RequestDispatcherImpl.java:392) at io.undertow.servlet.spec.RequestDispatcherImpl.setupIncludeImpl(RequestDispatcherImpl.java:327) at io.undertow.servlet.spec.RequestDispatcherImpl.include(RequestDispatcherImpl.java:291) at io.quarkus.smallrye.openapi.runtime.OpenApiServlet.doGet(OpenApiServlet.java:65) at javax.servlet.http.HttpServlet.service(HttpServlet.java:686) at javax.servlet.http.HttpServlet.service(HttpServlet.java:791) at io.undertow.servlet.handlers.ServletHandler.handleRequest(ServletHandler.java:74) at io.undertow.servlet.handlers.security.ServletSecurityRoleHandler.handleRequest(ServletSecurityRoleHandler.java:62) 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:132) 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:64) 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.AbstractSecurityContextAssociationHandler.handleRequest(AbstractSecurityContextAssociationHandler.java:43) at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43) at io.undertow.server.handlers.PathHandler.handleRequest(PathHandler.java:91) at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43) at io.undertow.servlet.handlers.ServletInitialHandler.handleFirstRequest(ServletInitialHandler.java:292) at io.undertow.servlet.handlers.ServletInitialHandler.access$100(ServletInitialHandler.java:81) at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:138) at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:135) 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.UndertowDeploymentTemplate$7$1$1.call(UndertowDeploymentTemplate.java:469) at io.undertow.servlet.handlers.ServletInitialHandler.dispatchRequest(ServletInitialHandler.java:272) at io.undertow.servlet.handlers.ServletInitialHandler.handleRequest(ServletInitialHandler.java:197) at io.undertow.server.handlers.HttpContinueReadHandler.handleRequest(HttpContinueReadHandler.java:65) at io.quarkus.undertow.runtime.UndertowDeploymentTemplate$1.handleRequest(UndertowDeploymentTemplate.java:104) at io.undertow.server.handlers.CanonicalPathHandler.handleRequest(CanonicalPathHandler.java:49) at io.quarkus.undertow.deployment.devmode.UndertowHotReplacementSetup.handleHotDeploymentRequest(UndertowHotReplacementSetup.java:77) at io.quarkus.undertow.deployment.devmode.UndertowHotReplacementSetup$1$1.handleRequest(UndertowHotReplacementSetup.java:56) at io.undertow.server.Connectors.executeRootHandler(Connectors.java:364) at io.undertow.server.HttpServerExchange$1.run(HttpServerExchange.java:830) at io.quarkus.runtime.CleanableExecutor$CleaningRunnable.run(CleanableExecutor.java:236) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:2011) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1538) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1429) at org.jboss.threads.DelegatingRunnable.run(DelegatingRunnable.java:29) at org.jboss.threads.ThreadLocalResettingRunnable.run(ThreadLocalResettingRunnable.java:32) at java.lang.Thread.run(Thread.java:748) at org.jboss.threads.JBossThread.run(JBossThread.java:479) ``` **To Reproduce** Steps to reproduce the behavior: 1. clone https://github.com/quarkusio/quarkus-quickstarts 2. cd /using-openapi-swaggerui/ 3. ./mvnw compile quarkus:dev 4. http://localhost:8080/openapi - BANG 5. http://localhost:8080/swagger-ui - TWO TIME BANG :) **Environment** - OpenSUSE Tumbleweed, kernel 5.1.3-1 - JVM Version: Zulu 8.36.0.1 - Quarkus 0.16.0: **Linked issue in this repo** https://github.com/quarkusio/quarkus/issues/2597 **Linked issue in this quarkus-quickstarts repo** https://github.com/quarkusio/quarkus-quickstarts/issues/207 **Probable cause** https://github.com/quarkusio/quarkus/commit/4dcb8131f8018a46ddf098bd5c14beb4aa230404 - this commit added ability to enable swagger-ui in production env, and there was a lot of code, so some bug ought to be there.

5e6b4acfe997041fa6d41d9cec4f5cb2b4cf7bbd

f2f38b4a184ca702290ca37c2ad47804ad3cc590

https://github.com/quarkusio/quarkus/compare/5e6b4acfe997041fa6d41d9cec4f5cb2b4cf7bbd...f2f38b4a184ca702290ca37c2ad47804ad3cc590

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 f78d8f5456a..dabdd16d6f0 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java @@ -280,8 +280,12 @@ public void execute() throws MojoFailureException, MojoExecutionException { } args.add("-Djava.util.logging.manager=org.jboss.logmanager.LogManager"); + //wiring devmode is used for CDI beans that are not part of the user application (i.e. beans in 3rd party jars) + //we need this because these beans cannot be loaded by the runtime class loader, they must be loaded by the platform + //class loader File wiringClassesDirectory = new File(buildDir, "wiring-devmode"); wiringClassesDirectory.mkdirs(); + addToClassPaths(classPathManifest, devModeContext, wiringClassesDirectory); //we also want to add the maven plugin jar to the class path diff --git a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowStaticResourcesBuildStep.java b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowStaticResourcesBuildStep.java index 92f22bd654f..bdc6a79c615 100644 --- a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowStaticResourcesBuildStep.java +++ b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowStaticResourcesBuildStep.java @@ -26,6 +26,15 @@ public class UndertowStaticResourcesBuildStep { protected static final String META_INF_RESOURCES_SLASH = "META-INF/resources/"; protected static final String META_INF_RESOURCES = "META-INF/resources"; + @BuildStep + void handleGeneratedWebResources(BuildProducer<GeneratedResourceBuildItem> generatedResources, + List<GeneratedWebResourceBuildItem> generatedWebResources) throws Exception { + for (GeneratedWebResourceBuildItem genResource : generatedWebResources) { + generatedResources.produce(new GeneratedResourceBuildItem(META_INF_RESOURCES_SLASH + genResource.getName(), + genResource.getClassData())); + } + } + @BuildStep KnownPathsBuildItem scanStaticResources(ApplicationArchivesBuildItem applicationArchivesBuildItem, BuildProducer<GeneratedResourceBuildItem> generatedResources, @@ -83,8 +92,6 @@ public void accept(Path path) { } } for (GeneratedWebResourceBuildItem genResource : generatedWebResources) { - generatedResources.produce(new GeneratedResourceBuildItem(META_INF_RESOURCES_SLASH + genResource.getName(), - genResource.getClassData())); String sub = genResource.getName(); if (sub.startsWith("/")) { sub = sub.substring(1);

['extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowStaticResourcesBuildStep.java', 'devtools/maven/src/main/java/io/quarkus/maven/DevMojo.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/2733/2710

quarkusio

quarkus

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

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

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

resolves

Shutdown task failed: java.lang.IllegalArgumentException - quarkus-hibernate-orm and quarkus-smallrye-fault-tolerance enabled

I see `java.lang.IllegalArgumentException` thrown at the end of test phase when `quarkus-hibernate-orm` and `quarkus-smallrye-fault-tolerance` are enabled. Stacktrace includes keywords like HystrixThreadEventStream and io.quarkus.smallrye.faulttolerance. This error message is present only if quarkus-hibernate-orm extension is used too. There is no exception when only quarkus-smallrye-fault-tolerance is enabled. ``` 2019-06-04 15:53:16,096 ERROR [io.qua.run.StartupContext] (main) Running a shutdown task failed: java.lang.IllegalArgumentException ``` ``` mvn io.quarkus:quarkus-maven-plugin:999-SNAPSHOT:create \\ -DprojectGroupId=io.quarkus.qe \\ -DprojectArtifactId=scenario-101-getting-started \\ -DprojectVersion=1.0.0-SNAPSHOT \\ -DclassName="io.quarkus.qe.hello.GreetingResource" \\ -Dextensions=io.quarkus:quarkus-hibernate-orm,io.quarkus:quarkus-smallrye-fault-tolerance ``` ``` mvn clean package ... [INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.884 s - in io.quarkus.qe.hello.GreetingResourceTest 2019-06-04 15:53:16,096 ERROR [io.qua.run.StartupContext] (main) Running a shutdown task failed: java.lang.IllegalArgumentException at io.quarkus.arc.ArcContainerImpl.unwrap(ArcContainerImpl.java:558) at io.quarkus.arc.ArcContainerImpl.instance(ArcContainerImpl.java:563) at io.quarkus.arc.InstanceImpl.resolve(InstanceImpl.java:163) at io.quarkus.arc.InstanceImpl.<init>(InstanceImpl.java:75) at io.quarkus.arc.InstanceImpl.<init>(InstanceImpl.java:61) at io.quarkus.arc.InstanceImpl.select(InstanceImpl.java:111) at io.quarkus.arc.ArcCDIProvider$ArcCDI.select(ArcCDIProvider.java:60) at io.smallrye.context.jta.context.propagation.JtaContextProvider.tm(JtaContextProvider.java:86) at io.smallrye.context.jta.context.propagation.JtaContextProvider.currentTransaction(JtaContextProvider.java:78) at io.smallrye.context.jta.context.propagation.JtaContextProvider.currentContext(JtaContextProvider.java:25) at io.smallrye.context.impl.CapturedContextState.<init>(CapturedContextState.java:21) at io.smallrye.context.SmallRyeContextManager.captureContext(SmallRyeContextManager.java:60) at io.smallrye.context.SmallRyeThreadContext.currentContextExecutor(SmallRyeThreadContext.java:208) at io.smallrye.context.propagators.rxjava1.ContextPropagatorOnObservableCreateAction.call(ContextPropagatorOnObservableCreateAction.java:24) at io.smallrye.context.propagators.rxjava1.ContextPropagatorOnObservableCreateAction.call(ContextPropagatorOnObservableCreateAction.java:12) at rx.plugins.RxJavaHooks.onCreate(RxJavaHooks.java:337) at rx.Observable.unsafeCreate(Observable.java:162) at rx.Observable.lift(Observable.java:299) at rx.Observable.onBackpressureBuffer(Observable.java:7883) at com.netflix.hystrix.metric.HystrixThreadEventStream.<init>(HystrixThreadEventStream.java:111) at com.netflix.hystrix.metric.HystrixThreadEventStream$1.initialValue(HystrixThreadEventStream.java:66) at com.netflix.hystrix.metric.HystrixThreadEventStream$1.initialValue(HystrixThreadEventStream.java:63) at java.lang.ThreadLocal.setInitialValue(ThreadLocal.java:180) at java.lang.ThreadLocal.get(ThreadLocal.java:170) at com.netflix.hystrix.metric.HystrixThreadEventStream.getInstance(HystrixThreadEventStream.java:128) at io.quarkus.smallrye.faulttolerance.runtime.SmallryeFaultToleranceTemplate$1.run(SmallryeFaultToleranceTemplate.java:25) at io.quarkus.runtime.StartupContext.close(StartupContext.java:59) at io.quarkus.runner.ApplicationImpl1.doStop(Unknown Source) at io.quarkus.runtime.Application.stop(Application.java:167) at io.quarkus.runner.RuntimeRunner$1.close(RuntimeRunner.java:138) at io.quarkus.runner.RuntimeRunner.close(RuntimeRunner.java:84) at io.quarkus.test.junit.QuarkusTestExtension$5.close(QuarkusTestExtension.java:241) at io.quarkus.test.junit.QuarkusTestExtension$ExtensionState.close(QuarkusTestExtension.java:354) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.jupiter.engine.execution.ExtensionValuesStore.closeAllStoredCloseableValues(ExtensionValuesStore.java:61) at org.junit.jupiter.engine.descriptor.AbstractExtensionContext.close(AbstractExtensionContext.java:73) at org.junit.jupiter.engine.execution.JupiterEngineExecutionContext.close(JupiterEngineExecutionContext.java:53) at org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor.cleanUp(JupiterEngineDescriptor.java:67) at org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor.cleanUp(JupiterEngineDescriptor.java:30) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$cleanUp$9(NodeTestTask.java:151) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.cleanUp(NodeTestTask.java:151) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:83) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.submit(SameThreadHierarchicalTestExecutorService.java:32) at org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutor.execute(HierarchicalTestExecutor.java:57) at org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine.execute(HierarchicalTestEngine.java:51) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:170) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:154) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:90) at org.apache.maven.surefire.junitplatform.JUnitPlatformProvider.invokeAllTests(JUnitPlatformProvider.java:142) at org.apache.maven.surefire.junitplatform.JUnitPlatformProvider.invoke(JUnitPlatformProvider.java:117) at org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:383) at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:344) at org.apache.maven.surefire.booter.ForkedBooter.execute(ForkedBooter.java:125) at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:417) ```

a7df99eaa4581c345adb939ebd8c40f744050063

6c719a957e1876ff538be9eb695257050d0e612b

https://github.com/quarkusio/quarkus/compare/a7df99eaa4581c345adb939ebd8c40f744050063...6c719a957e1876ff538be9eb695257050d0e612b

diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcCDIProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcCDIProvider.java index 2b85487c527..166d5550fcf 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcCDIProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcCDIProvider.java @@ -37,6 +37,9 @@ public ArcCDIProvider() { @Override public CDI<Object> getCDI() { + if (Arc.container() == null) { + throw new IllegalStateException("No CDI container is available"); + } return arcCDI; }

['independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcCDIProvider.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/2713/2712

quarkusio

quarkus

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

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

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

fixes

Trailing comma for extensions definition of `quarkus-maven-plugin:create` causes NPE

Trailing comma for extensions definition of `quarkus-maven-plugin:create` causes NPE and mvn command fail ``` mvn io.quarkus:quarkus-maven-plugin:999-SNAPSHOT:create \\ -DprojectGroupId=io.quarkus.qe \\ -DprojectArtifactId=scenario-101-getting-started \\ -DprojectVersion=1.0.0-SNAPSHOT \\ -DclassName="io.quarkus.qe.hello.GreetingResource" \\ -Dextensions=io.quarkus:quarkus-smallrye-jwt, ``` ``` [INFO] Scanning for projects... [INFO] [INFO] ------------------< org.apache.maven:standalone-pom >------------------- [INFO] Building Maven Stub Project (No POM) 1 [INFO] --------------------------------[ pom ]--------------------------------- [INFO] [INFO] --- quarkus-maven-plugin:999-SNAPSHOT:create (default-cli) @ standalone-pom --- [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 1.214 s [INFO] Finished at: 2019-06-04T16:04:03+02:00 [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal io.quarkus:quarkus-maven-plugin:999-SNAPSHOT:create (default-cli) on project standalone-pom: Execution default-cli of goal io.quarkus:quarkus- maven-plugin:999-SNAPSHOT:create failed.: NullPointerException -> [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/PluginExecutionException ```

8d8436c50d708e0797be09d221e2e3aad4473de3

ecfb9787ce28637d88a3dd6d109434b37e44de23

https://github.com/quarkusio/quarkus/compare/8d8436c50d708e0797be09d221e2e3aad4473de3...ecfb9787ce28637d88a3dd6d109434b37e44de23

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 4ce1fefe547..1ccdbd9ab2b 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java @@ -33,6 +33,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; @@ -141,6 +142,7 @@ public void execute() throws MojoExecutionException { boolean success; try { + sanitizeExtensions(); final SourceType sourceType = CreateProject.determineSourceType(extensions); sanitizeOptions(sourceType); @@ -290,8 +292,10 @@ private void sanitizeOptions(SourceType sourceType) { path = "/" + path; } } + } - extensions = extensions.stream().map(String::trim).collect(Collectors.toSet()); + private void sanitizeExtensions() { + extensions = extensions.stream().filter(Objects::nonNull).map(String::trim).collect(Collectors.toSet()); } private void printUserInstructions(File root) {

['devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.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/1100/1099

quarkusio

quarkus

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

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

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

fixes

Dev mode exception returns HTTP 200 reponse

If there is an build error in dev mode, the exception is returned in the body of a http response with HTTP 200 status code. I would have expected a HTTP 500 response code if the request failed due to a build error. The exception below triggered in release 0.9.1, but am not running into a build error with latest master. e.g. the following request `http://localhost:8080/insurance/rest/authentication/getToken?username=Herb.Daschke_1` Resulted in an exception in the application: ``` Error Restarting Shamrock Stack Trace: java.lang.RuntimeException: org.jboss.builder.BuildException: Build failure: Build failed due to errors [error]: Build step org.jboss.shamrock.arc.deployment.ArcAnnotationProcessor#build threw an exception: javax.enterprise.inject.UnsatisfiedResolutionException: InjectionPointInfo [requiredType=org.jboss.protean.benchmark.common.broker.IAgentsService, requiredQualifiers=[@RestClient]] on CLASS bean [types=[org.jboss.protean.benchmark.insurance.service.InsuranceAgentsService, java.lang.Object], qualifiers=[@Default, @Any], target=org.jboss.protean.benchmark.insurance.service.InsuranceAgentsService] at org.jboss.shamrock.runner.RuntimeRunner.run(RuntimeRunner.java:119) at org.jboss.shamrock.dev.DevModeMain.doStart(DevModeMain.java:122) at org.jboss.shamrock.dev.DevModeMain.main(DevModeMain.java:83) Caused by: org.jboss.builder.BuildException: Build failure: Build failed due to errors [error]: Build step org.jboss.shamrock.arc.deployment.ArcAnnotationProcessor#build threw an exception: javax.enterprise.inject.UnsatisfiedResolutionException: InjectionPointInfo [requiredType=org.jboss.protean.benchmark.common.broker.IAgentsService, requiredQualifiers=[@RestClient]] on CLASS bean [types=[org.jboss.protean.benchmark.insurance.service.InsuranceAgentsService, java.lang.Object], qualifiers=[@Default, @Any], target=org.jboss.protean.benchmark.insurance.service.InsuranceAgentsService] at org.jboss.builder.Execution.run(Execution.java:116) at org.jboss.builder.BuildExecutionBuilder.execute(BuildExecutionBuilder.java:136) at org.jboss.shamrock.deployment.ShamrockAugmentor.run(ShamrockAugmentor.java:101) at org.jboss.shamrock.runner.RuntimeRunner.run(RuntimeRunner.java:86) ... 2 more Caused by: javax.enterprise.inject.UnsatisfiedResolutionException: InjectionPointInfo [requiredType=org.jboss.protean.benchmark.common.broker.IAgentsService, requiredQualifiers=[@RestClient]] on CLASS bean [types=[org.jboss.protean.benchmark.insurance.service.InsuranceAgentsService, java.lang.Object], qualifiers=[@Default, @Any], target=org.jboss.protean.benchmark.insurance.service.InsuranceAgentsService] at org.jboss.protean.arc.processor.Beans.resolveInjectionPoint(Beans.java:318) at org.jboss.protean.arc.processor.BeanInfo.init(BeanInfo.java:349) at java.base/java.util.ArrayList.forEach(ArrayList.java:1378) at org.jboss.protean.arc.processor.BeanDeployment.init(BeanDeployment.java:281) at org.jboss.protean.arc.processor.BeanProcessor.process(BeanProcessor.java:159) at org.jboss.shamrock.arc.deployment.ArcAnnotationProcessor.build(ArcAnnotationProcessor.java:237) 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.jboss.shamrock.deployment.ExtensionLoader$1.execute(ExtensionLoader.java:383) at org.jboss.builder.BuildContext.run(BuildContext.java:402) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:1998) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1525) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1416) at java.base/java.lang.Thread.run(Thread.java:844) at org.jboss.threads.JBossThread.run(JBossThread.java:479) ``` With the following HTTP response header: ``` HTTP/1.1 200 OK Connection: keep-alive Content-Type: text/html; charset=UTF-8 Content-Length: 8197 Date: Thu, 28 Feb 2019 09:16:03 GMT ```

d4f7abef42ea618cc4afbc8bb491b2be5499ea45

48cc5a4b01bbad65d5e55c4a6c4fb6ed281f083a

https://github.com/quarkusio/quarkus/compare/d4f7abef42ea618cc4afbc8bb491b2be5499ea45...48cc5a4b01bbad65d5e55c4a6c4fb6ed281f083a

diff --git a/devtools/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java b/devtools/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java index 5ece94a960f..c7457500f29 100644 --- a/devtools/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java +++ b/devtools/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java @@ -230,7 +230,7 @@ public void testThatApplicationRecoversCompilationIssue() throws MavenInvocation await() .pollDelay(1, TimeUnit.SECONDS) .atMost(1, TimeUnit.MINUTES).until(() -> { - String content = getHttpResponse("/app/hello"); + String content = getHttpResponse("/app/hello", true); last.set(content); return content.contains(uuid); }); diff --git a/devtools/maven/src/test/java/io/quarkus/maven/it/MojoTestBase.java b/devtools/maven/src/test/java/io/quarkus/maven/it/MojoTestBase.java index c19e2dbd984..6328c8d60bc 100644 --- a/devtools/maven/src/test/java/io/quarkus/maven/it/MojoTestBase.java +++ b/devtools/maven/src/test/java/io/quarkus/maven/it/MojoTestBase.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; +import java.net.URLConnection; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -159,13 +160,27 @@ static String getHttpResponse() { } static String getHttpResponse(String path) { + return getHttpResponse(path, false); + } + + static String getHttpResponse(String path, boolean allowError) { AtomicReference<String> resp = new AtomicReference<>(); await() .pollDelay(1, TimeUnit.SECONDS) .atMost(1, TimeUnit.MINUTES).until(() -> { try { URL url = new URL("http://localhost:8080" + ((path.startsWith("/") ? path : "/" + path))); - String content = IOUtils.toString(url, "UTF-8"); + String content; + if (!allowError) { + content = IOUtils.toString(url, "UTF-8"); + } else { + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + if (conn.getResponseCode() >= 400) { + content = IOUtils.toString(conn.getErrorStream(), "UTF-8"); + } else { + content = IOUtils.toString(conn.getInputStream(), "UTF-8"); + } + } resp.set(content); return true; } catch (Exception e) { diff --git a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/devmode/ReplacementDebugPage.java b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/devmode/ReplacementDebugPage.java index 295714e0af5..506f7eaefae 100644 --- a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/devmode/ReplacementDebugPage.java +++ b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/devmode/ReplacementDebugPage.java @@ -93,6 +93,7 @@ public class ReplacementDebugPage { "</style>"; public static void handleRequest(HttpServerExchange exchange, final Throwable exception) throws IOException { + exchange.setStatusCode(500); StringBuilder sb = new StringBuilder(); //todo: make this good sb.append("<html><head><title>ERROR</title>");

['extensions/undertow/deployment/src/main/java/io/quarkus/undertow/devmode/ReplacementDebugPage.java', 'devtools/maven/src/test/java/io/quarkus/maven/it/MojoTestBase.java', 'devtools/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.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/1726/1725

quarkusio

quarkus

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

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

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

fix

Fix mvn (and others?) project create which asks a misleading question

``` $ mvn io.quarkus:quarkus-maven-plugin:0.12.0:create Set the project groupId [org.acme.quarkus.sample]: Set the project artifactId [my-quarkus-project]: Set the Quarkus version [1.0-SNAPSHOT]: ``` I suppose it should be `Set the project version`

c6454ddbf6335bba5d6e17057851f3fd266756cc

dc64b413eefa9a44992056fab7253a2877fc0108

https://github.com/quarkusio/quarkus/compare/c6454ddbf6335bba5d6e17057851f3fd266756cc...dc64b413eefa9a44992056fab7253a2877fc0108

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 647935fd141..c34fa06ed7a 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java @@ -237,7 +237,7 @@ private void askTheUserForMissingValues() throws MojoExecutionException { } if (StringUtils.isBlank(projectVersion)) { - projectVersion = prompter.promptWithDefaultValue("Set the Quarkus version", + projectVersion = prompter.promptWithDefaultValue("Set the project version", "1.0-SNAPSHOT"); }

['devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.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/1682/1672

quarkusio

quarkus

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

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

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

resolves

Should the CamelRuntimeProducer be marked as unremovable?

A user reported having this in his logs: ``` 2019-03-25 12:20:39,124 WARN [io.qua.arc.run.ArcDeploymentTemplate] (main) Bean matching class io.quarkus.camel.core.runtime.CamelRuntimeProducer was marked as unused and removed during build. Extensions can eliminate false positives using: - a custom UnremovableBeanBuildItem - AdditionalBeanBuildItem(false, beanClazz) ``` I think the `CamelRuntimeProducer` bean should probably be marked as unremovable.

db6a0124e59ebd8e926b7a89216c78ff10621717

95d2a84455e11f8fc0c999f8445a12d7517424a7

https://github.com/quarkusio/quarkus/compare/db6a0124e59ebd8e926b7a89216c78ff10621717...95d2a84455e11f8fc0c999f8445a12d7517424a7

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java index 381fd434841..4664f9e3add 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java @@ -255,7 +255,8 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl return "Runtime proxy of " + returnType + " with id " + key; } throw new RuntimeException( - "You cannot invoke directly on an object returned from the bytecode recorded, you can only pass is back into the recorder as a parameter"); + "You cannot invoke " + method.getName() + + "() directly on an object returned from the bytecode recorder, you can only pass it back into the recorder as a parameter"); } }); ProxyInstance instance = new ProxyInstance(proxyInstance, key); diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/RuntimeBeanBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/RuntimeBeanBuildItem.java index 799a005f611..b632f4fe90a 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/RuntimeBeanBuildItem.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/RuntimeBeanBuildItem.java @@ -10,6 +10,8 @@ import org.jboss.builder.item.MultiBuildItem; +import io.quarkus.runtime.RuntimeValue; + /** * Represents a bean that can be easily produced through a template (or other runtime Supplier implementation) */ @@ -18,14 +20,22 @@ public final class RuntimeBeanBuildItem extends MultiBuildItem { final String scope; final String type; final Supplier<Object> supplier; + final RuntimeValue<?> runtimeValue; final NavigableMap<String, NavigableMap<String, Object>> qualifiers; + final boolean removable; RuntimeBeanBuildItem(String scope, String type, Supplier<Object> supplier, - NavigableMap<String, NavigableMap<String, Object>> qualifiers) { + NavigableMap<String, NavigableMap<String, Object>> qualifiers, boolean removable, + RuntimeValue<?> runtimeValue) { + if (supplier != null && runtimeValue != null) { + throw new IllegalArgumentException("It is not possible to specify both - a supplier and a runtime value"); + } this.scope = scope; this.type = type; this.supplier = supplier; this.qualifiers = qualifiers; + this.removable = removable; + this.runtimeValue = runtimeValue; } public String getScope() { @@ -40,26 +50,38 @@ public Supplier<Object> getSupplier() { return supplier; } + public RuntimeValue<?> getRuntimeValue() { + return runtimeValue; + } + + public boolean isRemovable() { + return removable; + } + public NavigableMap<String, NavigableMap<String, Object>> getQualifiers() { return qualifiers; } - public static Builder builder(String type, Supplier<Object> supplier) { + public static Builder builder(Class<?> type) { + return builder(type.getName()); + } + + public static Builder builder(String type) { Objects.requireNonNull(type); - Objects.requireNonNull(supplier); - return new Builder(type, supplier); + return new Builder(type); } public static class Builder { String scope = Dependent.class.getName(); + boolean removable = true; final String type; - final Supplier<Object> supplier; + Supplier<Object> supplier; + RuntimeValue<?> value; final NavigableMap<String, NavigableMap<String, Object>> qualifiers = new TreeMap<>(); - public Builder(String type, Supplier<Object> supplier) { + public Builder(String type) { this.type = type; - this.supplier = supplier; } public Builder setScope(String scope) { @@ -90,8 +112,23 @@ public Builder addQualifier(Class<? extends Annotation> type, NavigableMap<Strin return addQualifier(type.getName(), values); } + public Builder setRemovable(boolean removable) { + this.removable = removable; + return this; + } + + public Builder setSupplier(Supplier<Object> supplier) { + this.supplier = Objects.requireNonNull(supplier); + return this; + } + + public Builder setRuntimeValue(RuntimeValue<?> runtimeValue) { + this.value = Objects.requireNonNull(runtimeValue); + return this; + } + public RuntimeBeanBuildItem build() { - return new RuntimeBeanBuildItem(scope, type, supplier, qualifiers); + return new RuntimeBeanBuildItem(scope, type, supplier, qualifiers, removable, value); } } } diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/RuntimeBeanProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/RuntimeBeanProcessor.java index 867ea5f4e01..2e097f75889 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/RuntimeBeanProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/RuntimeBeanProcessor.java @@ -4,11 +4,13 @@ import java.util.List; import java.util.Map; import java.util.NavigableMap; +import java.util.function.Predicate; import java.util.function.Supplier; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; +import io.quarkus.arc.processor.BeanInfo; import io.quarkus.arc.runtime.ArcDeploymentTemplate; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; @@ -29,7 +31,8 @@ public class RuntimeBeanProcessor { @Record(ExecutionTime.STATIC_INIT) void build(List<RuntimeBeanBuildItem> beans, BuildProducer<GeneratedBeanBuildItem> generatedBean, - ArcDeploymentTemplate template) { + ArcDeploymentTemplate template, + BuildProducer<UnremovableBeanBuildItem> unremovableBeans) { String beanName = "io.quarkus.arc.runtimebean.RuntimeBeanProducers"; ClassCreator c = new ClassCreator(new ClassOutput() { @@ -41,22 +44,35 @@ public void write(String name, byte[] data) { c.addAnnotation(ApplicationScoped.class); Map<String, Supplier<Object>> map = new HashMap<>(); - for (RuntimeBeanBuildItem b : beans) { + for (RuntimeBeanBuildItem bean : beans) { //deterministic name //as we know the maps are sorted this will result in the same hash for the same bean - String name = b.type.replace(".", "_") + "_" + HashUtil.sha1(b.qualifiers.toString()); - map.put(name, b.supplier); + String name = bean.type.replace(".", "_") + "_" + HashUtil.sha1(bean.qualifiers.toString()); + if (bean.runtimeValue != null) { + map.put(name, template.createSupplier(bean.runtimeValue)); + } else { + map.put(name, bean.supplier); + } - MethodCreator producer = c.getMethodCreator("produce_" + name, b.type); + MethodCreator producer = c.getMethodCreator("produce_" + name, bean.type); producer.addAnnotation(Produces.class); - producer.addAnnotation(b.scope); - for (Map.Entry<String, NavigableMap<String, Object>> i : b.qualifiers.entrySet()) { - AnnotationCreator builder = producer.addAnnotation(i.getKey()); - for (Map.Entry<String, Object> j : i.getValue().entrySet()) { - builder.addValue(i.getKey(), i.getValue()); + producer.addAnnotation(bean.scope); + for (Map.Entry<String, NavigableMap<String, Object>> qualifierEntry : bean.qualifiers.entrySet()) { + AnnotationCreator builder = producer.addAnnotation(qualifierEntry.getKey()); + for (Map.Entry<String, Object> valueEntry : qualifierEntry.getValue().entrySet()) { + builder.addValue(valueEntry.getKey(), valueEntry.getValue()); } } + if (!bean.removable) { + unremovableBeans.produce(new UnremovableBeanBuildItem(new Predicate<BeanInfo>() { + @Override + public boolean test(BeanInfo bean) { + return bean.isProducerMethod() && bean.getTarget().get().asMethod().name().equals(name); + } + })); + } + ResultHandle staticMap = producer .readStaticField(FieldDescriptor.of(ArcDeploymentTemplate.class, "supplierMap", Map.class)); ResultHandle supplier = producer.invokeInterfaceMethod( diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcDeploymentTemplate.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcDeploymentTemplate.java index 6c0ff61e9de..f912972a9b2 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcDeploymentTemplate.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcDeploymentTemplate.java @@ -29,11 +29,11 @@ import io.quarkus.arc.ArcContainer; import io.quarkus.arc.InstanceHandle; import io.quarkus.arc.ManagedContext; +import io.quarkus.runtime.RuntimeValue; import io.quarkus.runtime.ShutdownContext; import io.quarkus.runtime.annotations.Template; /** - * @author Martin Kouba */ @Template public class ArcDeploymentTemplate { @@ -64,7 +64,6 @@ public BeanContainer initBeanContainer(ArcContainer container, List<BeanContaine Collection<String> removedBeanTypes) throws Exception { BeanContainer beanContainer = new BeanContainer() { - @SuppressWarnings("unchecked") @Override public <T> Factory<T> instanceFactory(Class<T> type, Annotation... qualifiers) { Supplier<InstanceHandle<T>> handleSupplier = container.instanceSupplier(type, qualifiers); @@ -122,6 +121,15 @@ public void run() { }); } + public Supplier<Object> createSupplier(RuntimeValue<?> value) { + return new Supplier<Object>() { + @Override + public Object get() { + return value.getValue(); + } + }; + } + private static final class DefaultInstanceFactory<T> implements BeanContainer.Factory<T> { final Class<T> type; diff --git a/extensions/camel/camel-core/deployment/src/main/java/io/quarkus/camel/core/deployment/CamelInitProcessor.java b/extensions/camel/camel-core/deployment/src/main/java/io/quarkus/camel/core/deployment/CamelInitProcessor.java index 0174703ab91..8074c09b887 100644 --- a/extensions/camel/camel-core/deployment/src/main/java/io/quarkus/camel/core/deployment/CamelInitProcessor.java +++ b/extensions/camel/camel-core/deployment/src/main/java/io/quarkus/camel/core/deployment/CamelInitProcessor.java @@ -23,10 +23,8 @@ import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; -import io.quarkus.arc.deployment.AdditionalBeanBuildItem; -import io.quarkus.arc.deployment.BeanContainerListenerBuildItem; +import io.quarkus.arc.deployment.RuntimeBeanBuildItem; import io.quarkus.camel.core.runtime.CamelRuntime; -import io.quarkus.camel.core.runtime.CamelRuntimeProducer; import io.quarkus.camel.core.runtime.CamelTemplate; import io.quarkus.camel.core.runtime.RuntimeRegistry; import io.quarkus.deployment.annotations.BuildProducer; @@ -60,17 +58,10 @@ static class CamelConfig { CamelConfig config; - @Record(ExecutionTime.STATIC_INIT) - @BuildStep - AdditionalBeanBuildItem camelRuntimeProducer(BuildProducer<BeanContainerListenerBuildItem> listener, CamelTemplate template, - CamelRuntimeBuildItem runtimeBuildItem) { - listener.produce(new BeanContainerListenerBuildItem(template.initRuntimeInjection(runtimeBuildItem.getRuntime()))); - return new AdditionalBeanBuildItem(CamelRuntimeProducer.class); - } - @Record(ExecutionTime.STATIC_INIT) @BuildStep(applicationArchiveMarkers = { CamelSupport.CAMEL_SERVICE_BASE_PATH, CamelSupport.CAMEL_ROOT_PACKAGE_DIRECTORY }) - CamelRuntimeBuildItem createInitTask(RecorderContext recorderContext, CamelTemplate template) { + CamelRuntimeBuildItem createInitTask(RecorderContext recorderContext, CamelTemplate template, + BuildProducer<RuntimeBeanBuildItem> runtimeBeans) { Properties properties = new Properties(); Config configProvider = ConfigProvider.getConfig(); for (String property : configProvider.getPropertyNames()) { @@ -90,7 +81,12 @@ CamelRuntimeBuildItem createInitTask(RecorderContext recorderContext, CamelTempl visitServices((name, type) -> registry.bind(name, type, recorderContext.newInstance(type.getName()))); - return new CamelRuntimeBuildItem(template.init(runtime, registry, properties, builders)); + RuntimeValue<CamelRuntime> camelRuntime = template.init(runtime, registry, properties, builders); + + runtimeBeans + .produce(RuntimeBeanBuildItem.builder(CamelRuntime.class).setRuntimeValue(camelRuntime).build()); + + return new CamelRuntimeBuildItem(camelRuntime); } @Record(ExecutionTime.RUNTIME_INIT) diff --git a/extensions/camel/camel-core/deployment/src/main/java/io/quarkus/camel/core/deployment/CamelRuntimeBuildItem.java b/extensions/camel/camel-core/deployment/src/main/java/io/quarkus/camel/core/deployment/CamelRuntimeBuildItem.java index 375430ca5f5..f6c3898fa2d 100644 --- a/extensions/camel/camel-core/deployment/src/main/java/io/quarkus/camel/core/deployment/CamelRuntimeBuildItem.java +++ b/extensions/camel/camel-core/deployment/src/main/java/io/quarkus/camel/core/deployment/CamelRuntimeBuildItem.java @@ -3,15 +3,17 @@ import org.jboss.builder.item.SimpleBuildItem; import io.quarkus.camel.core.runtime.CamelRuntime; +import io.quarkus.runtime.RuntimeValue; public final class CamelRuntimeBuildItem extends SimpleBuildItem { - private final CamelRuntime runtime; - public CamelRuntimeBuildItem(CamelRuntime runtime) { + private final RuntimeValue<CamelRuntime> runtime; + + public CamelRuntimeBuildItem(RuntimeValue<CamelRuntime> runtime) { this.runtime = runtime; } - public CamelRuntime getRuntime() { + public RuntimeValue<CamelRuntime> getRuntime() { return runtime; } } diff --git a/extensions/camel/camel-core/runtime/src/main/java/io/quarkus/camel/core/runtime/CamelRuntimeProducer.java b/extensions/camel/camel-core/runtime/src/main/java/io/quarkus/camel/core/runtime/CamelRuntimeProducer.java deleted file mode 100644 index 19c1e5be279..00000000000 --- a/extensions/camel/camel-core/runtime/src/main/java/io/quarkus/camel/core/runtime/CamelRuntimeProducer.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.quarkus.camel.core.runtime; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; - -@ApplicationScoped -public class CamelRuntimeProducer { - - CamelRuntime camelRuntime; - - @Produces - public CamelRuntime getCamelRuntime() { - return camelRuntime; - } - - public void setCamelRuntime(CamelRuntime camelRuntime) { - this.camelRuntime = camelRuntime; - } -} diff --git a/extensions/camel/camel-core/runtime/src/main/java/io/quarkus/camel/core/runtime/CamelTemplate.java b/extensions/camel/camel-core/runtime/src/main/java/io/quarkus/camel/core/runtime/CamelTemplate.java index 2b8d873be9a..8b16ab640b2 100644 --- a/extensions/camel/camel-core/runtime/src/main/java/io/quarkus/camel/core/runtime/CamelTemplate.java +++ b/extensions/camel/camel-core/runtime/src/main/java/io/quarkus/camel/core/runtime/CamelTemplate.java @@ -6,8 +6,6 @@ import org.apache.camel.RoutesBuilder; -import io.quarkus.arc.runtime.BeanContainer; -import io.quarkus.arc.runtime.BeanContainerListener; import io.quarkus.runtime.RuntimeValue; import io.quarkus.runtime.ShutdownContext; import io.quarkus.runtime.annotations.Template; @@ -15,7 +13,7 @@ @Template public class CamelTemplate { - public CamelRuntime init( + public RuntimeValue<CamelRuntime> init( RuntimeValue<?> iruntime, RuntimeRegistry registry, Properties properties, @@ -28,18 +26,18 @@ public CamelRuntime init( .map(RoutesBuilder.class::cast) .collect(Collectors.toList())); runtime.init(); - return runtime; + return new RuntimeValue<>(runtime); } - public void start(final ShutdownContext shutdown, final CamelRuntime runtime) throws Exception { - runtime.start(); + public void start(final ShutdownContext shutdown, final RuntimeValue<CamelRuntime> runtime) throws Exception { + runtime.getValue().start(); //in development mode undertow is started eagerly shutdown.addShutdownTask(new Runnable() { @Override public void run() { try { - runtime.stop(); + runtime.getValue().stop(); } catch (Exception e) { throw new RuntimeException(e); } @@ -47,12 +45,4 @@ public void run() { }); } - public BeanContainerListener initRuntimeInjection(CamelRuntime runtime) { - return new BeanContainerListener() { - @Override - public void created(BeanContainer container) { - container.instance(CamelRuntimeProducer.class).setCamelRuntime(runtime); - } - }; - } } diff --git a/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java b/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java index 8411f9e2dcb..0b5838a1dd3 100644 --- a/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java +++ b/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java @@ -76,11 +76,13 @@ void createExecutors(BuildProducer<RuntimeBeanBuildItem> runtimeBeanBuildItemBui Supplier<Object> boss = template.createEventLoop(1); Supplier<Object> worker = template.createEventLoop(0); - runtimeBeanBuildItemBuildProducer.produce(RuntimeBeanBuildItem.builder(EventLoopGroup.class.getName(), boss) + runtimeBeanBuildItemBuildProducer.produce(RuntimeBeanBuildItem.builder(EventLoopGroup.class) + .setSupplier(boss) .setScope(ApplicationScoped.class) .addQualifier(BossGroup.class) .build()); - runtimeBeanBuildItemBuildProducer.produce(RuntimeBeanBuildItem.builder(EventLoopGroup.class.getName(), worker) + runtimeBeanBuildItemBuildProducer.produce(RuntimeBeanBuildItem.builder(EventLoopGroup.class) + .setSupplier(worker) .setScope(ApplicationScoped.class) .build()); }

['core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java', 'extensions/camel/camel-core/deployment/src/main/java/io/quarkus/camel/core/deployment/CamelInitProcessor.java', 'extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/RuntimeBeanBuildItem.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/RuntimeBeanProcessor.java', 'extensions/camel/camel-core/deployment/src/main/java/io/quarkus/camel/core/deployment/CamelRuntimeBuildItem.java', 'extensions/camel/camel-core/runtime/src/main/java/io/quarkus/camel/core/runtime/CamelTemplate.java', 'extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcDeploymentTemplate.java', 'extensions/camel/camel-core/runtime/src/main/java/io/quarkus/camel/core/runtime/CamelRuntimeProducer.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/1679/1668

quarkusio

quarkus

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

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

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

fixes

@Timed and @Counted annotations fails when exceptions occurs

The following method with ```@Counted``` and ```@Timed``` annotations fails if any exception occurs during the invocation. For instance, if I want the method to throw a javax.ws.rs.NotFoundException in some cases, it doesn't work due to these annotations and I instead get a HTTP status 500. If I remove the annotations the expected HTTP status code is 404 when calling ```/greeting/notfound``` ```java @GET @Produces(MediaType.TEXT_PLAIN) @Path("/greeting/{name}") @Timed(name = "greetingTime", description = "Timing of the greeting method", absolute = true) @Counted(name = "greeting", description = "Counting of the greeting method", absolute = true, monotonic = true) public String greeting(@PathParam("name") String name) { if (name.equals("notfound")) throw new NotFoundException(); return service.greeting(name); } ``` I'm using Quarkus version 0.12.0, JDK 11 on macOS Mojave and maven 3.6.0 ``` ERROR: UT005023: Exception handling request to /greeting/fail org.jboss.resteasy.spi.UnhandledException: java.lang.RuntimeException: Cannot invoke method: io.smallrye.metrics.interceptors.TimedInterceptor#timedMethod on io.smallrye.metrics.interceptors.TimedInterceptor@1f4b5667 at org.jboss.resteasy.core.ExceptionHandler.handleApplicationException(ExceptionHandler.java:103) at org.jboss.resteasy.core.ExceptionHandler.handleException(ExceptionHandler.java:323) at org.jboss.resteasy.core.SynchronousDispatcher.writeException(SynchronousDispatcher.java:209) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:495) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$invoke$4(SynchronousDispatcher.java:252) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$preprocess$0(SynchronousDispatcher.java:153) at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:362) at org.jboss.resteasy.core.SynchronousDispatcher.preprocess(SynchronousDispatcher.java:156) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:238) at org.jboss.resteasy.plugins.server.servlet.ServletContainerDispatcher.service(ServletContainerDispatcher.java:229) at io.quarkus.resteasy.runtime.ResteasyFilter$ResteasyResponseWrapper.sendError(ResteasyFilter.java:72) at io.undertow.servlet.handlers.DefaultServlet.doGet(DefaultServlet.java:175) at javax.servlet.http.HttpServlet.service(HttpServlet.java:686) at javax.servlet.http.HttpServlet.service(HttpServlet.java:791) 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:43) at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:61) at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131) at io.opentracing.contrib.jaxrs2.server.SpanFinishingFilter.doFilter(SpanFinishingFilter.java:52) 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:62) 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:132) 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:64) 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.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:292) at io.undertow.servlet.handlers.ServletInitialHandler.access$100(ServletInitialHandler.java:81) at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:138) at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:135) 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.UndertowDeploymentTemplate$7$1$1.call(UndertowDeploymentTemplate.java:415) at io.undertow.servlet.handlers.ServletInitialHandler.dispatchRequest(ServletInitialHandler.java:272) at io.undertow.servlet.handlers.ServletInitialHandler.access$000(ServletInitialHandler.java:81) at io.undertow.servlet.handlers.ServletInitialHandler$1.handleRequest(ServletInitialHandler.java:104) at io.undertow.server.Connectors.executeRootHandler(Connectors.java:364) at io.undertow.server.HttpServerExchange$1.run(HttpServerExchange.java:830) at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:1998) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1525) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1382) at java.base/java.lang.Thread.run(Thread.java:834) Caused by: java.lang.RuntimeException: Cannot invoke method: io.smallrye.metrics.interceptors.TimedInterceptor#timedMethod on io.smallrye.metrics.interceptors.TimedInterceptor@1f4b5667 at io.quarkus.arc.Reflections.invokeMethod(Reflections.java:114) at io.smallrye.metrics.interceptors.TimedInterceptor_Bean.intercept(Unknown Source) at io.quarkus.arc.InvocationContextImpl$InterceptorInvocation.invoke(InvocationContextImpl.java:270) at io.quarkus.arc.InvocationContextImpl.invokeNext(InvocationContextImpl.java:149) at io.quarkus.arc.InvocationContextImpl.proceed(InvocationContextImpl.java:173) at se.acme.quarkus.GreetingFacade_Subclass.greeting(Unknown Source) 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:152) at org.jboss.resteasy.core.MethodInjectorImpl.lambda$invoke$3(MethodInjectorImpl.java:123) at java.base/java.util.concurrent.CompletableFuture.uniApplyNow(CompletableFuture.java:680) at java.base/java.util.concurrent.CompletableFuture.uniApplyStage(CompletableFuture.java:658) at java.base/java.util.concurrent.CompletableFuture.thenApply(CompletableFuture.java:2094) at java.base/java.util.concurrent.CompletableFuture.thenApply(CompletableFuture.java:143) at org.jboss.resteasy.core.MethodInjectorImpl.invoke(MethodInjectorImpl.java:123) at org.jboss.resteasy.core.ResourceMethodInvoker.internalInvokeOnTarget(ResourceMethodInvoker.java:543) at org.jboss.resteasy.core.ResourceMethodInvoker.invokeOnTargetAfterFilter(ResourceMethodInvoker.java:418) at org.jboss.resteasy.core.ResourceMethodInvoker.lambda$invokeOnTarget$2(ResourceMethodInvoker.java:372) at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:362) at org.jboss.resteasy.core.ResourceMethodInvoker.invokeOnTarget(ResourceMethodInvoker.java:374) at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:343) at org.jboss.resteasy.core.ResourceMethodInvoker.lambda$invoke$1(ResourceMethodInvoker.java:317) at java.base/java.util.concurrent.CompletableFuture.uniComposeStage(CompletableFuture.java:1106) at java.base/java.util.concurrent.CompletableFuture.thenCompose(CompletableFuture.java:2235) at java.base/java.util.concurrent.CompletableFuture.thenCompose(CompletableFuture.java:143) at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:317) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:476) ... 49 more Caused by: java.lang.reflect.InvocationTargetException 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.arc.Reflections.invokeMethod(Reflections.java:111) ... 77 more Caused by: java.lang.RuntimeException: Cannot invoke method: io.smallrye.metrics.interceptors.CountedInterceptor#countedMethod on io.smallrye.metrics.interceptors.CountedInterceptor@13619d1d at io.quarkus.arc.Reflections.invokeMethod(Reflections.java:114) at io.smallrye.metrics.interceptors.CountedInterceptor_Bean.intercept(Unknown Source) at io.quarkus.arc.InvocationContextImpl$InterceptorInvocation.invoke(InvocationContextImpl.java:270) at io.quarkus.arc.InvocationContextImpl.invokeNext(InvocationContextImpl.java:149) at io.quarkus.arc.InvocationContextImpl.proceed(InvocationContextImpl.java:173) at io.smallrye.metrics.interceptors.TimedInterceptor.timedCallable(TimedInterceptor.java:80) at io.smallrye.metrics.interceptors.TimedInterceptor.timedMethod(TimedInterceptor.java:63) ... 82 more Caused by: java.lang.reflect.InvocationTargetException 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.arc.Reflections.invokeMethod(Reflections.java:111) ... 88 more Caused by: javax.ws.rs.NotFoundException: HTTP 404 Not Found at se.acme.quarkus.GreetingFacade.greeting(GreetingFacade.java:27) at se.acme.quarkus.GreetingFacade_Subclass.greeting$$superaccessor1(Unknown Source) at se.acme.quarkus.GreetingFacade_Subclass$$function$$3.apply(Unknown Source) at io.quarkus.arc.InvocationContextImpl.interceptorChainCompleted(InvocationContextImpl.java:157) at io.quarkus.arc.InvocationContextImpl.proceed(InvocationContextImpl.java:177) at io.smallrye.metrics.interceptors.CountedInterceptor.countedCallable(CountedInterceptor.java:81) at io.smallrye.metrics.interceptors.CountedInterceptor.countedMethod(CountedInterceptor.java:63) ... 93 more ```

7916051ebd26db37a8ce7311dd834fbc367e3648

2fbdb458a57ad9b305c1c4088af96cfb30b6ef96

https://github.com/quarkusio/quarkus/compare/7916051ebd26db37a8ce7311dd834fbc367e3648...2fbdb458a57ad9b305c1c4088af96cfb30b6ef96

diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Reflections.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Reflections.java index 3f5fa991150..36431dd2a79 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Reflections.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Reflections.java @@ -109,8 +109,13 @@ public static Object invokeMethod(Class<?> clazz, String name, Class<?>[] paramT method.setAccessible(true); } return method.invoke(instance, args); - } catch (NoSuchMethodException | SecurityException | IllegalArgumentException | IllegalAccessException - | InvocationTargetException e) { + } catch (InvocationTargetException e) { + Throwable t = e.getTargetException(); + if (t instanceof RuntimeException) { + throw (RuntimeException) t; + } + throw new RuntimeException("Cannot invoke method: " + clazz.getName() + "#" + name + " on " + instance, e); + } catch (NoSuchMethodException | SecurityException | IllegalArgumentException | IllegalAccessException e) { throw new RuntimeException("Cannot invoke method: " + clazz.getName() + "#" + name + " on " + instance, e); } } diff --git a/integration-tests/main/src/main/java/io/quarkus/example/metrics/MetricsResource.java b/integration-tests/main/src/main/java/io/quarkus/example/metrics/MetricsResource.java index 3558f4ad980..1e4ce5c2a12 100644 --- a/integration-tests/main/src/main/java/io/quarkus/example/metrics/MetricsResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/example/metrics/MetricsResource.java @@ -18,6 +18,7 @@ import javax.inject.Inject; import javax.ws.rs.GET; +import javax.ws.rs.NotFoundException; import javax.ws.rs.Path; import org.eclipse.microprofile.metrics.Histogram; @@ -84,4 +85,11 @@ public String counterWithTags() { return "TEST"; } + @GET + @Path("/counter-throwing-not-found-exception") + @Counted(monotonic = true, name = "counter_404") + public String counterWithTagsThrowingNotFound() { + throw new NotFoundException(); + } + } diff --git a/integration-tests/main/src/test/java/io/quarkus/example/test/MetricsTestCase.java b/integration-tests/main/src/test/java/io/quarkus/example/test/MetricsTestCase.java index 78a234e804d..df9343bbba4 100644 --- a/integration-tests/main/src/test/java/io/quarkus/example/test/MetricsTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/example/test/MetricsTestCase.java @@ -138,6 +138,15 @@ public void testVendorMetrics() { .body(containsString("vendor:memory_max_non_heap_bytes ")); } + /** + * A REST method with metrics is throwing a NotFoundException, so the client should receive 404. + */ + @Test + public void testEndpointWithMetricsThrowingException() { + RestAssured.when().get("/metricsresource/counter-throwing-not-found-exception").then() + .statusCode(404); + } + private void assertMetricExactValue(String name, String val) { RestAssured.when().get("/metrics").then() .body(containsString(name + " " + val));

['independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Reflections.java', 'integration-tests/main/src/test/java/io/quarkus/example/test/MetricsTestCase.java', 'integration-tests/main/src/main/java/io/quarkus/example/metrics/MetricsResource.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/1634/1633

quarkusio

quarkus

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

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

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

fixes

Injection of @ConfigProperty double produces java.lang.ClassNotFoundException: double

If I add injection of a double field to the application-configuration quickstart solution GreetingResource: ```java @Path("/greeting") public class GreetingResource { @ConfigProperty(name = "greeting.message") String message; @ConfigProperty(name = "greeting.suffix", defaultValue="!") String suffix; @ConfigProperty(name = "greeting.name") Optional<String> name; @ConfigProperty(name = "greeting.math-pi-double") double decimalPi; ``` and then try to ```bash java.lang.ClassNotFoundException: double at java.net.URLClassLoader.findClass(URLClassLoader.java:381) at java.lang.ClassLoader.loadClass(ClassLoader.java:424) at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:349) at java.lang.ClassLoader.loadClass(ClassLoader.java:357) at java.lang.Class.forName0(Native Method) at java.lang.Class.forName(Class.java:348) at io.quarkus.deployment.steps.ConfigBuildStep$validateConfigProperties5.deploy(Unknown Source) at io.quarkus.runner.ApplicationImpl1.doStart(Unknown Source) at io.quarkus.runtime.Application.start(Application.java:93) at io.quarkus.runner.RuntimeRunner.run(RuntimeRunner.java:119) at io.quarkus.test.junit.QuarkusTestExtension.doJavaStart(QuarkusTestExtension.java:196) at io.quarkus.test.junit.QuarkusTestExtension.beforeAll(QuarkusTestExtension.java:80) at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.lambda$invokeBeforeAllCallbacks$8(ClassTestDescriptor.java:361) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.invokeBeforeAllCallbacks(ClassTestDescriptor.java:361) at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.before(ClassTestDescriptor.java:197) at org.junit.jupiter.engine.descriptor.ClassTestDescriptor.before(ClassTestDescriptor.java:77) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$5(NodeTestTask.java:132) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$7(NodeTestTask.java:125) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:135) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:123) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:122) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:80) ``` The problem is the generated ConfigBuildStep$validateConfigProperties5 attempting to load a primitive class using Class.forName: ```java // // Source code recreated from a .class file by IntelliJ IDEA // (powered by Fernflower decompiler) // package io.quarkus.deployment.steps; import io.quarkus.arc.runtime.ConfigDeploymentTemplate; import io.quarkus.runtime.StartupContext; import io.quarkus.runtime.StartupTask; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map; // $FF: synthetic class public class ConfigBuildStep$validateConfigProperties5 implements StartupTask { public ConfigBuildStep$validateConfigProperties5() { } public void deploy(StartupContext var1) { ConfigDeploymentTemplate var13 = new ConfigDeploymentTemplate(); HashMap var7 = new HashMap(); HashSet var4 = new HashSet(); ClassLoader var2 = Thread.currentThread().getContextClassLoader(); Class var3 = Class.forName("java.lang.Double", (boolean)1, var2); ((Collection)var4).add(var3); ClassLoader var5 = Thread.currentThread().getContextClassLoader(); Class var6 = Class.forName("java.lang.String", (boolean)1, var5); ((Collection)var4).add(var6); ((Map)var7).put("greeting.math-pi", var4); HashSet var9 = new HashSet(); ClassLoader var8 = Thread.currentThread().getContextClassLoader(); Class var10 = Class.forName("double", (boolean)1, var8); ((Collection)var9).add(var10); ((Map)var7).put("greeting.math-pi-double", var9); HashSet var11 = new HashSet(); ((Collection)var11).add(var6); ((Map)var7).put("greeting.message", var11); HashSet var12 = new HashSet(); ((Collection)var12).add(var6); ((Map)var7).put("greeting.unique", var12); var13.validateConfigProperties((Map)var7); } } ``` We have to catch the use of a primitive type and reference the prmitive.class value directly.

4b43e2172439806216570e5bf3a91f62eba7c1c5

363ce5727aadad3015acbdaf03a1f3cbbec7cf40

https://github.com/quarkusio/quarkus/compare/4b43e2172439806216570e5bf3a91f62eba7c1c5...363ce5727aadad3015acbdaf03a1f3cbbec7cf40

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java index 93e13c2c565..381fd434841 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java @@ -397,16 +397,23 @@ private ResultHandle loadObjectInstance(MethodCreator method, Object param, Map< out = method.invokeVirtualMethod(ofMethod(StartupContext.class, "getValue", Object.class, String.class), method.getMethodParam(0), method.load(proxyId)); } else if (param instanceof Class<?>) { - String name = classProxies.get(param); - if (name == null) { - name = ((Class) param).getName(); + if (!((Class) param).isPrimitive()) { + // Only try to load the class by name if it is not a primitive class + String name = classProxies.get(param); + if (name == null) { + name = ((Class) param).getName(); + } + ResultHandle currentThread = method.invokeStaticMethod(ofMethod(Thread.class, "currentThread", Thread.class)); + ResultHandle tccl = method.invokeVirtualMethod( + ofMethod(Thread.class, "getContextClassLoader", ClassLoader.class), + currentThread); + out = method.invokeStaticMethod( + ofMethod(Class.class, "forName", Class.class, String.class, boolean.class, ClassLoader.class), + method.load(name), method.load(true), tccl); + } else { + // Else load the primitive type by reference; double.class => Class var9 = Double.TYPE; + out = method.loadClass((Class) param); } - ResultHandle currentThread = method.invokeStaticMethod(ofMethod(Thread.class, "currentThread", Thread.class)); - ResultHandle tccl = method.invokeVirtualMethod(ofMethod(Thread.class, "getContextClassLoader", ClassLoader.class), - currentThread); - out = method.invokeStaticMethod( - ofMethod(Class.class, "forName", Class.class, String.class, boolean.class, ClassLoader.class), - method.load(name), method.load(true), tccl); } else if (expectedType == boolean.class) { out = method.load((boolean) param); } else if (expectedType == Boolean.class) { diff --git a/core/test-extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java b/core/test-extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java index bcfef309fff..4801e56a4ad 100644 --- a/core/test-extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java +++ b/core/test-extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java @@ -3,6 +3,7 @@ import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT; import java.util.Collection; +import java.util.HashSet; import java.util.List; import org.jboss.jandex.AnnotationInstance; @@ -13,9 +14,7 @@ import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem; import io.quarkus.arc.deployment.BeanContainerBuildItem; -import io.quarkus.arc.deployment.BeanContainerListenerBuildItem; import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem; -import io.quarkus.arc.runtime.BeanContainerListener; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.ExecutionTime; @@ -23,7 +22,6 @@ import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.LaunchModeBuildItem; import io.quarkus.deployment.builditem.ServiceStartBuildItem; -import io.quarkus.deployment.recording.RecorderContext; import io.quarkus.extest.runtime.IConfigConsumer; import io.quarkus.extest.runtime.ObjectOfValue; import io.quarkus.extest.runtime.ObjectValueOf; @@ -32,7 +30,6 @@ import io.quarkus.extest.runtime.TestBuildTimeConfig; import io.quarkus.extest.runtime.TestRunTimeConfig; import io.quarkus.extest.runtime.TestTemplate; -import io.quarkus.runtime.RuntimeValue; /** * A test extension deployment processor @@ -199,6 +196,32 @@ void configureBeans(TestTemplate template, List<TestBeanBuildItem> testBeans, Be } } + /** + * Test for https://github.com/quarkusio/quarkus/issues/1633 + * + * @param template - runtime template + */ + @BuildStep + @Record(RUNTIME_INIT) + void referencePrimitiveTypeClasses(TestTemplate template) { + HashSet<Class<?>> allPrimitiveTypes = new HashSet<>(); + allPrimitiveTypes.add(byte.class); + allPrimitiveTypes.add(char.class); + allPrimitiveTypes.add(short.class); + allPrimitiveTypes.add(int.class); + allPrimitiveTypes.add(long.class); + allPrimitiveTypes.add(float.class); + allPrimitiveTypes.add(double.class); + allPrimitiveTypes.add(byte[].class); + allPrimitiveTypes.add(char[].class); + allPrimitiveTypes.add(short[].class); + allPrimitiveTypes.add(int[].class); + allPrimitiveTypes.add(long[].class); + allPrimitiveTypes.add(float[].class); + allPrimitiveTypes.add(double[].class); + template.validateTypes(allPrimitiveTypes); + } + @BuildStep @Record(RUNTIME_INIT) ServiceStartBuildItem boot(LaunchModeBuildItem launchMode) { diff --git a/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/TestTemplate.java b/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/TestTemplate.java index 6b2da7a1e2f..feaed1d322b 100644 --- a/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/TestTemplate.java +++ b/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/TestTemplate.java @@ -1,5 +1,7 @@ package io.quarkus.extest.runtime; +import java.util.Set; + import org.jboss.logging.Logger; import io.quarkus.arc.runtime.BeanContainer; @@ -15,12 +17,12 @@ public class TestTemplate { /** * Instantiate the given class in the given BeanContainer and passes the TestBuildAndRunTimeConfig and TestRunTimeConfig to * it - * - * @see IConfigConsumer#loadConfig(TestBuildAndRunTimeConfig, TestRunTimeConfig) + * * @param beanContainer - CDI container * @param beanClass - IConfigConsumer * @param buildTimeConfig - the extension TestBuildAndRunTimeConfig * @param runTimeConfig - the extension TestRunTimeConfig + * @see IConfigConsumer#loadConfig(TestBuildAndRunTimeConfig, TestRunTimeConfig) */ public void configureBeans(BeanContainer beanContainer, Class<IConfigConsumer> beanClass, TestBuildAndRunTimeConfig buildTimeConfig, @@ -30,4 +32,15 @@ public void configureBeans(BeanContainer beanContainer, Class<IConfigConsumer> b instance.loadConfig(buildTimeConfig, runTimeConfig); log.infof("configureBeans, instance=%s\\n", instance); } + + /** + * Access the primitive class types at runtime to validate the build step generated deploy method + * + * @param typesSet + */ + public void validateTypes(Set<Class<?>> typesSet) { + for (Class<?> type : typesSet) { + log.infof("Checking type: %s", type.getName()); + } + } }

['core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/TestTemplate.java', 'core/test-extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java', 'core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.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/1464/1463

quarkusio

quarkus

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

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

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

fixes

Hibernate missing reflection JoinedSubclassEntityPersister definition

The hibernate-orm extension does not define a constructor reflection for the JoinedSubclassEntityPersister class. This is required when using generic tables and class extension of entities.

370174f87d1440698a70198c408d83508a0186cc

20968be1f8b15f6233e192123ae60000a1361e21

https://github.com/quarkusio/quarkus/compare/370174f87d1440698a70198c408d83508a0186cc...20968be1f8b15f6233e192123ae60000a1361e21

diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmReflections.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmReflections.java index 753bebcd5dc..0c1e7ae669c 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmReflections.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmReflections.java @@ -40,6 +40,8 @@ public void registerCoreReflections(BuildProducer<ReflectiveClassBuildItem> refl allConstructors(reflectiveClass, org.hibernate.persister.collection.OneToManyPersister.class); allConstructors(reflectiveClass, org.hibernate.persister.collection.BasicCollectionPersister.class); simpleConstructor(reflectiveClass, org.hibernate.persister.entity.SingleTableEntityPersister.class); + allConstructors(reflectiveClass, org.hibernate.persister.entity.JoinedSubclassEntityPersister.class); + allConstructors(reflectiveClass, org.hibernate.persister.entity.UnionSubclassEntityPersister.class); simpleConstructor(reflectiveClass, org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLocalTransactionCoordinatorBuilderImpl.class); simpleConstructor(reflectiveClass, org.hibernate.id.enhanced.SequenceStyleGenerator.class);

['extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmReflections.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/1454/1433

quarkusio

quarkus

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

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

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

resolves

Incorrect behaviour for @ApplicationScoped lifecycle events

To `application-lifecycle-events/src/main/java/org/acme/events/AppLifecycleBean.java` add methods ``` public void init (@Observes @Initialized(ApplicationScoped.class) Object init) { LOGGER.info("Init"); } public void shutdown(@Observes @Destroyed(ApplicationScoped.class) Object init) { LOGGER.info("Shutdown"); } ``` The result of quickstart is ``` 2019-03-12 15:31:42,224 INFO [ListenerBean] (main) Shutdown 2019-03-12 15:31:42,224 INFO [ListenerBean] (main) Init 2019-03-12 15:31:42,368 INFO [ListenerBean] (main) Shutdown 2019-03-12 15:31:42,368 INFO [ListenerBean] (main) Init 2019-03-12 15:31:42,369 INFO [ListenerBean] (main) The application is starting...hello ``` Please note that both shutdown and init methods were called multiple times and shutdown was call even before the application was started.

2368a06b1d8e9a3b73f254cc420fa963467f7cc2

a6a606dca3456be7263c15098aada9000e4c7022

https://github.com/quarkusio/quarkus/compare/2368a06b1d8e9a3b73f254cc420fa963467f7cc2...a6a606dca3456be7263c15098aada9000e4c7022

diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcAnnotationProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcAnnotationProcessor.java index b490d49e5d6..e19e0b1d5d7 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcAnnotationProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcAnnotationProcessor.java @@ -27,7 +27,6 @@ import java.util.stream.Collectors; import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; import javax.inject.Inject; import org.jboss.jandex.AnnotationTarget; @@ -131,8 +130,6 @@ public BeanContainerBuildItem build(ArcDeploymentTemplate arcTemplate, } additionalBeans.add(LifecycleEventRunner.class.getName()); - reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, Observes.class.getName())); // graal bug - // Index bean classes registered by quarkus Indexer indexer = new Indexer(); Set<DotName> additionalIndex = new HashSet<>(); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java index 14d907574ae..297992939c6 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java @@ -33,6 +33,9 @@ import java.util.function.Predicate; import java.util.stream.Collectors; +import javax.enterprise.context.BeforeDestroyed; +import javax.enterprise.context.Destroyed; +import javax.enterprise.context.Initialized; import javax.enterprise.context.control.ActivateRequestContext; import javax.enterprise.inject.Any; import javax.enterprise.inject.Default; @@ -240,6 +243,9 @@ private static IndexView addBuiltinClasses(IndexView index) { index(indexer, Default.class.getName()); index(indexer, Any.class.getName()); index(indexer, Named.class.getName()); + index(indexer, Initialized.class.getName()); + index(indexer, BeforeDestroyed.class.getName()); + index(indexer, Destroyed.class.getName()); } return CompositeIndex.create(index, indexer.complete()); } diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainerImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainerImpl.java index 1a71dc2cf82..b0e4717f403 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainerImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainerImpl.java @@ -33,7 +33,9 @@ import java.util.stream.Collectors; import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.BeforeDestroyed; import javax.enterprise.context.Dependent; +import javax.enterprise.context.Destroyed; import javax.enterprise.context.Initialized; import javax.enterprise.inject.AmbiguousResolutionException; import javax.enterprise.inject.Any; @@ -247,8 +249,18 @@ synchronized void shutdown() { ArcCDI arcCdi = (ArcCDI) cdi; arcCdi.destroy(); } + // Fire an event with qualifier @BeforeDestroyed(ApplicationScoped.class) + Set<Annotation> beforeDestroyQualifiers = new HashSet<>(4); + beforeDestroyQualifiers.add(BeforeDestroyed.Literal.APPLICATION); + beforeDestroyQualifiers.add(Any.Literal.INSTANCE); + EventImpl.createNotifier(Object.class, Object.class, beforeDestroyQualifiers, this).notify(toString()); // Destroy contexts applicationContext.destroy(); + // Fire an event with qualifier @Destroyed(ApplicationScoped.class) + Set<Annotation> destroyQualifiers = new HashSet<>(4); + destroyQualifiers.add(Destroyed.Literal.APPLICATION); + destroyQualifiers.add(Any.Literal.INSTANCE); + EventImpl.createNotifier(Object.class, Object.class, destroyQualifiers, this).notify(toString()); singletonContext.destroy(); requestContext.terminate(); // Clear caches diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationInitializedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationInitializedTest.java index 3cd9578e4f6..00a8fd80fe9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationInitializedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationInitializedTest.java @@ -16,35 +16,67 @@ package io.quarkus.arc.test.contexts.application; +import static org.junit.Assert.assertTrue; + import java.util.concurrent.atomic.AtomicBoolean; import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.BeforeDestroyed; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.Destroyed; import javax.enterprise.context.Initialized; import javax.enterprise.event.Observes; -import javax.inject.Singleton; -import io.quarkus.arc.test.ArcTestContainer; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.RuleChain; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + +import io.quarkus.arc.test.ArcTestContainer; public class ApplicationInitializedTest { @Rule - public ArcTestContainer container = new ArcTestContainer(Observer.class); + public RuleChain chain = RuleChain.outerRule(new TestRule() { + @Override + public Statement apply(final Statement base, Description description) { + return new Statement() { + + @Override + public void evaluate() throws Throwable { + base.evaluate(); + assertTrue(Observer.DESTROYED.get()); + assertTrue(Observer.BEFORE_DESTROYED.get()); + } + }; + } + }).around(new ArcTestContainer(Observer.class)); @Test public void testEventWasFired() { - Assert.assertTrue(Observer.OBSERVED.get()); + Assert.assertTrue(Observer.INITIALIZED.get()); } - @Singleton + @Dependent static class Observer { - static final AtomicBoolean OBSERVED = new AtomicBoolean(false); + static final AtomicBoolean INITIALIZED = new AtomicBoolean(false); + static final AtomicBoolean DESTROYED = new AtomicBoolean(false); + static final AtomicBoolean BEFORE_DESTROYED = new AtomicBoolean(false); void onStart(@Observes @Initialized(ApplicationScoped.class) Object container) { - OBSERVED.set(true); + INITIALIZED.set(true); + } + + void beforeDestroyed(@Observes @BeforeDestroyed(ApplicationScoped.class) Object container) { + BEFORE_DESTROYED.set(true); + } + + void destroyed(@Observes @Destroyed(ApplicationScoped.class) Object container) { + DESTROYED.set(true); } } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java index 59131555e7a..5d59dad5298 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java @@ -71,6 +71,7 @@ public void testDisposers() { // A new instance is created for produce and dispose assertEquals(2, StringProducer.DESTROYED.get()); // Both producer and produced bean are application scoped + @SuppressWarnings("serial") Comparable<BigDecimal> bigDecimal = Arc.container().instance(new TypeLiteral<Comparable<BigDecimal>>() { }).get(); assertEquals(0, bigDecimal.compareTo(BigDecimal.ONE));

['extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcAnnotationProcessor.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java', 'independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainerImpl.java', 'independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationInitializedTest.java', 'independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.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/1422/1373

quarkusio

quarkus

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

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

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

resolves

Injecting using 'javax.inject.Provider' into JAX-RS Resource fails build

Quarkus Version: 0.11.0 Maven Version: 3.6.0 Java Version: 1.8.0_191 While using `io.quarkus:quarkus-smallrye-jwt` and performing the following: ``` @Path("v1") @Produces(APPLICATION_JSON) @DenyAll public class HelloWorldResource { @Inject private Provider<JsonWebToken> jwtProvider; ``` The build fails with: ``` ERROR] Failed to execute goal io.quarkus:quarkus-maven-plugin:0.11.0:build (default) on project quarkus-service-example: Failed to build a runnable JAR: Failed to build a runner jar: Failed to augment application classes: Build failure: Build failed due to errors [ERROR] [error]: Build step io.quarkus.arc.deployment.ArcAnnotationProcessor#build threw an exception: javax.enterprise.inject.spi.DeploymentException: javax.enterprise.inject.UnsatisfiedResolutionException: Unsatisfied dependency for type javax.inject.Provider<org.eclipse.microprofile.jwt.JsonWebToken> and qualifiers [@Default] [ERROR] - java member: acme.jaxrs.v1.HelloWorldResource#jwtProvider [ERROR] - declared on CLASS bean [types=[acme.jaxrs.v1.HelloWorldResource, java.lang.Object], qualifiers=[@Default, @Any], target=acme.jaxrs.v1.HelloWorldResource] [ERROR] -> [Help 1] ``` **Workaround** Use `javax.enterprise.inject.Instance`. Moved from quarkusio/quarkus-quickstarts#85.

6717e34093794b0fd7fb879b900cae5d20b3303c

5f660bc95169cf698353d395016bdff449bcabc1

https://github.com/quarkusio/quarkus/compare/6717e34093794b0fd7fb879b900cae5d20b3303c...5f660bc95169cf698353d395016bdff449bcabc1

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java index ecba1ecd95d..23f90afdf27 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java @@ -23,6 +23,7 @@ import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; + import io.quarkus.arc.BeanManagerProvider; import io.quarkus.arc.BeanMetadataProvider; import io.quarkus.arc.EventProvider; @@ -30,7 +31,7 @@ import io.quarkus.arc.InjectionPointProvider; import io.quarkus.arc.InstanceProvider; import io.quarkus.arc.ResourceProvider; -import io.quarkus.arc.processor.InjectionPointInfo.InjtetionPointKind; +import io.quarkus.arc.processor.InjectionPointInfo.InjectionPointKind; import io.quarkus.gizmo.ClassCreator; import io.quarkus.gizmo.ClassOutput; import io.quarkus.gizmo.FieldDescriptor; @@ -73,7 +74,8 @@ void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionP constructor.getThis(), instanceProvider); } - }), INJECTION_POINT(DotNames.INJECTION_POINT, new Generator() { + }, ip -> ip.getKind() == InjectionPointKind.CDI && (DotNames.INSTANCE.equals(ip.getRequiredType().name()) || DotNames.PROVIDER.equals(ip.getRequiredType().name()))), + INJECTION_POINT(DotNames.INJECTION_POINT, new Generator() { @Override void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionPointInfo injectionPoint, ClassCreator clazzCreator, MethodCreator constructor, String providerName, AnnotationLiteralProcessor annotationLiterals) { @@ -145,7 +147,7 @@ void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionP constructor.writeInstanceField(FieldDescriptor.of(clazzCreator.getClassName(), providerName, InjectableReferenceProvider.class.getName()), constructor.getThis(), resourceProvider); } - }, ip -> ip.getKind() == InjtetionPointKind.RESOURCE); + }, ip -> ip.getKind() == InjectionPointKind.RESOURCE); private final DotName rawTypeDotName; @@ -154,7 +156,7 @@ void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionP private final Predicate<InjectionPointInfo> matcher; BuiltinBean(DotName rawTypeDotName, Generator generator) { - this(rawTypeDotName, generator, ip -> ip.getKind() == InjtetionPointKind.CDI && rawTypeDotName.equals(ip.getRequiredType().name())); + this(rawTypeDotName, generator, ip -> ip.getKind() == InjectionPointKind.CDI && rawTypeDotName.equals(ip.getRequiredType().name())); } BuiltinBean(DotName rawTypeDotName, Generator generator, Predicate<InjectionPointInfo> matcher) { 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 171a9925943..c3d24e2a974 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 @@ -41,6 +41,7 @@ import javax.enterprise.util.Nonbinding; import javax.inject.Inject; import javax.inject.Named; +import javax.inject.Provider; import javax.inject.Qualifier; import javax.interceptor.AroundConstruct; import javax.interceptor.AroundInvoke; @@ -66,6 +67,7 @@ public final class DotNames { public static final DotName POST_CONSTRUCT = create(PostConstruct.class); public static final DotName PRE_DESTROY = create(PreDestroy.class); public static final DotName INSTANCE = create(Instance.class); + public static final DotName PROVIDER = create(Provider.class); public static final DotName INJECTION_POINT = create(InjectionPoint.class); public static final DotName INTERCEPTOR = create(Interceptor.class); public static final DotName INTERCEPTOR_BINDING = create(InterceptorBinding.class); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java index 06993fc2d0c..c801ae3334a 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java @@ -50,7 +50,7 @@ static InjectionPointInfo fromField(FieldInfo field, BeanDeployment beanDeployme } static InjectionPointInfo fromResourceField(FieldInfo field, BeanDeployment beanDeployment) { - return new InjectionPointInfo(field.type(), new HashSet<>(field.annotations()), InjtetionPointKind.RESOURCE, field, -1); + return new InjectionPointInfo(field.type(), new HashSet<>(field.annotations()), InjectionPointKind.RESOURCE, field, -1); } static List<InjectionPointInfo> fromMethod(MethodInfo method, BeanDeployment beanDeployment) { @@ -94,7 +94,7 @@ static Set<AnnotationInstance> getParameterAnnotations(BeanDeployment beanDeploy private final AtomicReference<BeanInfo> resolvedBean; - private final InjtetionPointKind kind; + private final InjectionPointKind kind; private final boolean hasDefaultedQualifier; @@ -103,10 +103,10 @@ static Set<AnnotationInstance> getParameterAnnotations(BeanDeployment beanDeploy private final int position; InjectionPointInfo(Type requiredType, Set<AnnotationInstance> requiredQualifiers, AnnotationTarget target, int position) { - this(requiredType, requiredQualifiers, InjtetionPointKind.CDI, target, position); + this(requiredType, requiredQualifiers, InjectionPointKind.CDI, target, position); } - InjectionPointInfo(Type requiredType, Set<AnnotationInstance> requiredQualifiers, InjtetionPointKind kind, AnnotationTarget target, int position) { + InjectionPointInfo(Type requiredType, Set<AnnotationInstance> requiredQualifiers, InjectionPointKind kind, AnnotationTarget target, int position) { this.typeAndQualifiers = new TypeAndQualifiers(requiredType, requiredQualifiers.isEmpty() ? Collections.singleton(AnnotationInstance.create(DotNames.DEFAULT, null, Collections.emptyList())) : requiredQualifiers); @@ -125,7 +125,7 @@ BeanInfo getResolvedBean() { return resolvedBean.get(); } - InjtetionPointKind getKind() { + InjectionPointKind getKind() { return kind; } @@ -177,7 +177,7 @@ public String toString() { return "InjectionPointInfo [requiredType=" + typeAndQualifiers.type + ", requiredQualifiers=" + typeAndQualifiers.qualifiers + "]"; } - enum InjtetionPointKind { + enum InjectionPointKind { CDI, RESOURCE } diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceImpl.java index a7fec3496bd..ab2c323299e 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceImpl.java @@ -29,6 +29,7 @@ import javax.enterprise.inject.Instance; import javax.enterprise.inject.UnsatisfiedResolutionException; import javax.enterprise.util.TypeLiteral; +import javax.inject.Provider; /** * @@ -49,7 +50,7 @@ InstanceImpl(Type type, Set<Annotation> qualifiers, CreationalContextImpl<?> creationalContext) { if (type instanceof ParameterizedType) { ParameterizedType parameterizedType = (ParameterizedType) type; - if (parameterizedType.getRawType().equals(Instance.class)) { + if (Provider.class.isAssignableFrom(Types.getRawType(parameterizedType.getRawType()))) { this.type = parameterizedType.getActualTypeArguments()[0]; } else { this.type = type; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java index d6969adeac5..1799aea460d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java @@ -6,6 +6,7 @@ import java.math.BigDecimal; +import javax.annotation.PostConstruct; import javax.annotation.Priority; import javax.enterprise.context.Dependent; import javax.enterprise.event.Observes; @@ -14,6 +15,7 @@ import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Named; +import javax.inject.Provider; import javax.inject.Singleton; import io.quarkus.arc.Arc; @@ -26,7 +28,7 @@ public class RemoveUnusedBeansTest { @Rule public ArcTestContainer container = ArcTestContainer.builder() - .beanClasses(HasObserver.class, Foo.class, FooAlternative.class, HasName.class, UnusedProducers.class, InjectedViaInstance.class, Excluded.class, UsedProducers.class) + .beanClasses(HasObserver.class, Foo.class, FooAlternative.class, HasName.class, UnusedProducers.class, InjectedViaInstance.class, InjectedViaProvider.class, Excluded.class, UsedProducers.class) .removeUnusedBeans(true) .addRemovalExclusion(b -> b.getBeanClass().toString().equals(Excluded.class.getName())) .build(); @@ -37,12 +39,15 @@ public void testRemoval() { assertTrue(container.instance(HasObserver.class).isAvailable()); assertTrue(container.instance(HasName.class).isAvailable()); assertTrue(container.instance(InjectedViaInstance.class).isAvailable()); + assertTrue(container.instance(InjectedViaProvider.class).isAvailable()); assertTrue(container.instance(String.class).isAvailable()); assertTrue(container.instance(UsedProducers.class).isAvailable()); assertFalse(container.instance(UnusedProducers.class).isAvailable()); assertFalse(container.instance(BigDecimal.class).isAvailable()); // Foo is injected in HasObserver#observe() - assertEquals(FooAlternative.class.getName(), container.instance(Foo.class).get().ping()); + Foo foo = container.instance(Foo.class).get(); + assertEquals(FooAlternative.class.getName(), foo.ping()); + assertTrue(foo.provider.get().isValid()); assertEquals(1, container.beanManager().getBeans(Foo.class).size()); assertEquals("pong", container.instance(Excluded.class).get().ping()); } @@ -63,6 +68,9 @@ static class HasName { @Dependent static class Foo { + + @Inject + Provider<InjectedViaProvider> provider; String ping() { return getClass().getName(); @@ -77,7 +85,7 @@ static class FooAlternative extends Foo { @Inject Instance<InjectedViaInstance> instance; - + @Inject String foo; @@ -87,6 +95,22 @@ static class FooAlternative extends Foo { static class InjectedViaInstance { } + + @Singleton + static class InjectedViaProvider { + + private boolean isValid; + + @PostConstruct + void init() { + isValid = true; + } + + boolean isValid() { + return isValid; + } + + } @Singleton static class UnusedProducers {

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java', 'independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java', 'independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceImpl.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/1260/1254

quarkusio

quarkus

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

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

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

fixes

REST Client doesn't register Interface return types for reflection

Currently the REST Client extension doesn't register the return types of the methods used in a `@RegisterRESTClient` annotated interface for reflection. This will result in those classes being DCE'd for native image builds

1905551d3242e84908ef74273419b026647cf4f6

9335b905edcd946f088986fc143f0619c55e5906

https://github.com/quarkusio/quarkus/compare/1905551d3242e84908ef74273419b026647cf4f6...9335b905edcd946f088986fc143f0619c55e5906

diff --git a/extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java b/extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java index d3f97478254..0ce7c5be365 100644 --- a/extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java +++ b/extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java @@ -18,7 +18,9 @@ import java.lang.reflect.Modifier; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; +import java.util.Set; import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.client.ClientResponseFilter; @@ -32,6 +34,8 @@ import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; +import org.jboss.jandex.MethodInfo; +import org.jboss.jandex.Type; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; import org.jboss.resteasy.client.jaxrs.internal.proxy.ProxyBuilderImpl; import org.jboss.resteasy.client.jaxrs.internal.proxy.ResteasyClientProxy; @@ -52,6 +56,7 @@ import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.SslNativeConfigBuildItem; import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveHierarchyBuildItem; import io.quarkus.deployment.builditem.substrate.SubstrateProxyDefinitionBuildItem; import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem; import io.quarkus.deployment.util.ServiceUtil; @@ -127,11 +132,13 @@ void processInterfaces(CombinedIndexBuildItem combinedIndexBuildItem, SslNativeConfigBuildItem sslNativeConfig, BuildProducer<SubstrateProxyDefinitionBuildItem> proxyDefinition, BuildProducer<ReflectiveClassBuildItem> reflectiveClass, + BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy, BuildProducer<BeanRegistrarBuildItem> beanRegistrars, BuildProducer<ExtensionSslNativeSupportBuildItem> extensionSslNativeSupport) { // According to the spec only rest client interfaces annotated with RegisterRestClient are registered as beans Map<DotName, ClassInfo> interfaces = new HashMap<>(); + Set<Type> returnTypes = new HashSet<>(); for (AnnotationInstance annotation : combinedIndexBuildItem.getIndex().getAnnotations(REGISTER_REST_CLIENT)) { AnnotationTarget target = annotation.target(); @@ -147,6 +154,16 @@ void processInterfaces(CombinedIndexBuildItem combinedIndexBuildItem, continue; } interfaces.put(theInfo.name(), theInfo); + + // Find Return types + for (MethodInfo method : theInfo.methods()) { + Type type = method.returnType(); + if (!type.name().toString().contains("java.lang")) { + if (!returnTypes.contains(type)) { + returnTypes.add(type); + } + } + } } if (interfaces.isEmpty()) { @@ -160,6 +177,11 @@ void processInterfaces(CombinedIndexBuildItem combinedIndexBuildItem, reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, iName)); } + // Register Interface return types for reflection + for (Type returnType : returnTypes) { + reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem(returnType)); + } + beanRegistrars.produce(new BeanRegistrarBuildItem(new BeanRegistrar() { @Override diff --git a/integration-tests/main/src/main/java/io/quarkus/example/rest/ClientResource.java b/integration-tests/main/src/main/java/io/quarkus/example/rest/ClientResource.java index 9860261e6a5..a45baa50a43 100644 --- a/integration-tests/main/src/main/java/io/quarkus/example/rest/ClientResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/example/rest/ClientResource.java @@ -17,10 +17,12 @@ package io.quarkus.example.rest; import java.net.URL; +import java.util.List; import javax.inject.Inject; import javax.ws.rs.GET; import javax.ws.rs.Path; +import javax.ws.rs.Produces; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; @@ -47,4 +49,40 @@ public String cdi() throws Exception { return restInterface.get(); } + @GET + @Path("manual/jackson") + @Produces("application/json") + public TestResource.MyData getDataManual() throws Exception { + RestInterface iface = RestClientBuilder.newBuilder() + .baseUrl(new URL(System.getProperty("test.url"))) + .build(RestInterface.class); + System.out.println(iface.getData()); + return iface.getData(); + } + + @GET + @Path("cdi/jackson") + @Produces("application/json") + public TestResource.MyData getDataCdi() { + return restInterface.getData(); + } + + @GET + @Path("/manual/complex") + @Produces("application/json") + public List<ComponentType> complexManual() throws Exception { + RestInterface iface = RestClientBuilder.newBuilder() + .baseUrl(new URL(System.getProperty("test.url"))) + .build(RestInterface.class); + System.out.println(iface.complex()); + return iface.complex(); + } + + @GET + @Path("/cdi/complex") + @Produces("application/json") + public List<ComponentType> complexCdi() { + return restInterface.complex(); + } + } diff --git a/integration-tests/main/src/main/java/io/quarkus/example/rest/RestInterface.java b/integration-tests/main/src/main/java/io/quarkus/example/rest/RestInterface.java index 5e9c3edfd3a..25a3fae1d89 100644 --- a/integration-tests/main/src/main/java/io/quarkus/example/rest/RestInterface.java +++ b/integration-tests/main/src/main/java/io/quarkus/example/rest/RestInterface.java @@ -16,8 +16,11 @@ package io.quarkus.example.rest; +import java.util.List; + import javax.ws.rs.GET; import javax.ws.rs.Path; +import javax.ws.rs.Produces; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; @@ -27,4 +30,14 @@ public interface RestInterface { @GET String get(); + + @GET + @Path("/jackson") + @Produces("application/json") + TestResource.MyData getData(); + + @GET + @Path("/complex") + @Produces("application/json") + List<ComponentType> complex(); } diff --git a/integration-tests/main/src/test/java/io/quarkus/example/test/RestClientTestCase.java b/integration-tests/main/src/test/java/io/quarkus/example/test/RestClientTestCase.java index 457cacdfd17..430938d1f8e 100644 --- a/integration-tests/main/src/test/java/io/quarkus/example/test/RestClientTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/example/test/RestClientTestCase.java @@ -19,11 +19,17 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import io.quarkus.example.rest.ComponentType; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; +import io.restassured.path.json.JsonPath; @QuarkusTest public class RestClientTestCase { @@ -40,6 +46,38 @@ public void testMicroprofileClientCDIIntegration() { .body(is("TEST")); } + @Test + void testMicroprofileClientData() { + JsonPath jsonPath = RestAssured.when().get("/client/manual/jackson").thenReturn().jsonPath(); + Assertions.assertEquals(jsonPath.getString("name"), "Stuart"); + Assertions.assertEquals(jsonPath.getString("value"), "A Value"); + } + + @Test + void testMicroprofileClientDataCdi() { + JsonPath jsonPath = RestAssured.when().get("/client/cdi/jackson").thenReturn().jsonPath(); + Assertions.assertEquals(jsonPath.getString("name"), "Stuart"); + Assertions.assertEquals(jsonPath.getString("value"), "A Value"); + } + + @Test + void testMicroprofileClientComplex() { + JsonPath jsonPath = RestAssured.when().get("/client/manual/complex").thenReturn().jsonPath(); + List<Map<String, String>> components = jsonPath.getList("$"); + Assertions.assertEquals(components.size(), 1); + Map<String, String> map = components.get(0); + Assertions.assertEquals(map.get("value"), "component value"); + } + + @Test + void testMicroprofileClientComplexCdi() { + JsonPath jsonPath = RestAssured.when().get("/client/cdi/complex").thenReturn().jsonPath(); + List<Map<String, String>> components = jsonPath.getList("$"); + Assertions.assertEquals(components.size(), 1); + Map<String, String> map = components.get(0); + Assertions.assertEquals(map.get("value"), "component value"); + } + /** * Disabled by default as it establishes external connections. * <p>

['extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java', 'integration-tests/main/src/main/java/io/quarkus/example/rest/RestInterface.java', 'integration-tests/main/src/main/java/io/quarkus/example/rest/ClientResource.java', 'integration-tests/main/src/test/java/io/quarkus/example/test/RestClientTestCase.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/1097/721

quarkusio

quarkus

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

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

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

fixes

@ApplicationScoped does not work in combination with @ServerEndpoint (quick start using-websockets)

I've tried the quick start "using-websockets" and it looks like a new instance of ChatSocket class is created for every new session even though it has the @ApplicationScoped annotation. The problem is combination of the @ServerEndpoint and @ApplicationScoped annotations. When they are combined a new instance is created because of the @ServerEndpoint even though there is the @ApplicationScoped annotation.

4de61ec0481394d77b470801ab02f0c97cea4596

56cf358f3b4f6f83cd32095fa878a6232aedeee9

https://github.com/quarkusio/quarkus/compare/4de61ec0481394d77b470801ab02f0c97cea4596...56cf358f3b4f6f83cd32095fa878a6232aedeee9

diff --git a/extensions/undertow-websockets/deployment/src/main/java/io/quarkus/undertow/websockets/UndertowWebsocketProcessor.java b/extensions/undertow-websockets/deployment/src/main/java/io/quarkus/undertow/websockets/UndertowWebsocketProcessor.java index d10d1e7ef95..31c37879fbe 100644 --- a/extensions/undertow-websockets/deployment/src/main/java/io/quarkus/undertow/websockets/UndertowWebsocketProcessor.java +++ b/extensions/undertow-websockets/deployment/src/main/java/io/quarkus/undertow/websockets/UndertowWebsocketProcessor.java @@ -31,6 +31,7 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; +import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.ExecutionTime; @@ -120,4 +121,11 @@ ServiceStartBuildItem setupWorker(UndertowWebsocketTemplate template, UndertowBu template.setupWorker(undertow.getUndertow()); return new ServiceStartBuildItem("Websockets"); } + + @BuildStep + void beanDefiningAnnotations(BuildProducer<BeanDefiningAnnotationBuildItem> annotations) { + annotations.produce(new BeanDefiningAnnotationBuildItem(SERVER_ENDPOINT)); + annotations.produce(new BeanDefiningAnnotationBuildItem(ENDPOINT)); + annotations.produce(new BeanDefiningAnnotationBuildItem(CLIENT_ENDPOINT)); + } }

['extensions/undertow-websockets/deployment/src/main/java/io/quarkus/undertow/websockets/UndertowWebsocketProcessor.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/2684/2647

quarkusio

quarkus

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

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

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

fixes

SmallRye REST client - warnings about duplicate provider registration

When I add the `quarkus-smallrye-rest-client` extension to my app I get a bunch of warnings: ``` 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.IIOImageProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.sse.SseEventOutputProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.sse.SseEventProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.DefaultTextPlain is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.client.jaxrs.internal.CompletionStageRxInvokerProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.ReactiveStreamProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.interceptors.CacheControlFeature is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.interceptors.ServerContentEncodingAnnotationFeature is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.FormUrlEncodedProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.CompletionStageProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.interceptors.ClientContentEncodingAnnotationFeature is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.DefaultNumberWriter is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.SourceProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.FileProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.context.ContextFeature is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.interceptors.MessageSanitizerContainerResponseFilter is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.MultiValuedParamConverterProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.DocumentProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.DefaultBooleanWriter is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.ByteArrayProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.StringTextStar is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.StreamingOutputProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.ReaderProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.sse.SseEventSinkInterceptor is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.DataSourceProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,738 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.JaxrsFormProvider is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,739 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.FileRangeWriter is already registered. 2nd registration is being ignored. 2019-05-30 09:02:41,739 WARN [org.jbo.res.res.i18n] (main) RESTEASY002155: Provider class org.jboss.resteasy.plugins.providers.InputStreamProvider is already registered. 2nd registration is being ignored. ```

bd1326f2d931c94a0559de8bb21b0d062b8daa69

f7cd967d257014b7c64fa80edfe01567809dbdaf

https://github.com/quarkusio/quarkus/compare/bd1326f2d931c94a0559de8bb21b0d062b8daa69...f7cd967d257014b7c64fa80edfe01567809dbdaf

diff --git a/extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java b/extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java index 7eee1cf12d9..f88f7454cbf 100644 --- a/extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java +++ b/extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java @@ -235,7 +235,7 @@ void registerProviders(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, CombinedIndexBuildItem combinedIndexBuildItem, SmallRyeRestClientTemplate smallRyeRestClientTemplate) { smallRyeRestClientTemplate.initializeResteasyProviderFactory(jaxrsProvidersToRegisterBuildItem.useBuiltIn(), - jaxrsProvidersToRegisterBuildItem.getProviders()); + jaxrsProvidersToRegisterBuildItem.getProviders(), jaxrsProvidersToRegisterBuildItem.getContributedProviders()); // register the providers for reflection for (String providerToRegister : jaxrsProvidersToRegisterBuildItem.getProviders()) { diff --git a/extensions/smallrye-rest-client/runtime/src/main/java/io/quarkus/smallrye/restclient/runtime/SmallRyeRestClientTemplate.java b/extensions/smallrye-rest-client/runtime/src/main/java/io/quarkus/smallrye/restclient/runtime/SmallRyeRestClientTemplate.java index 0597b2fe58a..422d03fab6d 100644 --- a/extensions/smallrye-rest-client/runtime/src/main/java/io/quarkus/smallrye/restclient/runtime/SmallRyeRestClientTemplate.java +++ b/extensions/smallrye-rest-client/runtime/src/main/java/io/quarkus/smallrye/restclient/runtime/SmallRyeRestClientTemplate.java @@ -39,7 +39,8 @@ public void setSslEnabled(boolean sslEnabled) { RestClientBuilderImpl.SSL_ENABLED = sslEnabled; } - public void initializeResteasyProviderFactory(boolean useBuiltIn, Set<String> providersToRegister) { + public void initializeResteasyProviderFactory(boolean useBuiltIn, Set<String> providersToRegister, + Set<String> contributedProviders) { ResteasyProviderFactory clientProviderFactory = new ResteasyProviderFactoryImpl(null, true) { @Override public RuntimeType getRuntimeType() { @@ -55,8 +56,15 @@ protected void initializeUtils() { if (useBuiltIn) { RegisterBuiltin.register(clientProviderFactory); + registerProviders(clientProviderFactory, contributedProviders); + } else { + registerProviders(clientProviderFactory, providersToRegister); } + RestClientBuilderImpl.PROVIDER_FACTORY = clientProviderFactory; + } + + private static void registerProviders(ResteasyProviderFactory clientProviderFactory, Set<String> providersToRegister) { for (String providerToRegister : providersToRegister) { try { clientProviderFactory @@ -65,7 +73,5 @@ protected void initializeUtils() { throw new RuntimeException("Unable to find class for provider " + providerToRegister, e); } } - - RestClientBuilderImpl.PROVIDER_FACTORY = clientProviderFactory; } }

['extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java', 'extensions/smallrye-rest-client/runtime/src/main/java/io/quarkus/smallrye/restclient/runtime/SmallRyeRestClientTemplate.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/1019/1015

quarkusio

quarkus

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

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

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

resolves

Arc container is killed before @Disposes methods are called

Having a class like: ```java @ApplicationScoped public class ResourcesProducer { @Produces ExecutorService managedExecutorService = Executors.newCachedThreadPool(); void destroy(@Disposes ExecutorService ex) { ex.shutdown(); } } ``` I see the following error when stopping (Ctrl+C) the application: ```java java.lang.IllegalStateException: Container not running: ArcContainerImpl [id=f4baf461-5484-4c71-9b3f-e0da6b4f0a72, running=false, beans=83, observers=2, contexts=3] at org.jboss.protean.arc.ArcContainerImpl.requireRunning(ArcContainerImpl.java:506) at org.jboss.protean.arc.ArcContainerImpl.getContext(ArcContainerImpl.java:124) at io.fabric8.launcher.web.producers.ResourcesProducer_ClientProxy.delegate(Unknown Source) at io.fabric8.launcher.web.producers.ResourcesProducer_ClientProxy.getContextualInstance(Unknown Source) at io.fabric8.launcher.web.producers.ResourcesProducer_ProducerField_managedExecutorService_Bean.destroy(Unknown Source) at io.fabric8.launcher.web.producers.ResourcesProducer_ProducerField_managedExecutorService_Bean.destroy(Unknown Source) at org.jboss.protean.arc.InstanceHandleImpl.destroyInternal(InstanceHandleImpl.java:89) at org.jboss.protean.arc.InstanceHandleImpl.destroy(InstanceHandleImpl.java:78) at org.jboss.protean.arc.CreationalContextImpl.release(CreationalContextImpl.java:77) at org.jboss.protean.arc.InjectableBean.destroy(InjectableBean.java:72) at org.jboss.protean.arc.InstanceHandleImpl.destroyInternal(InstanceHandleImpl.java:89) at org.jboss.protean.arc.ComputingCache.forEachExistingValue(ComputingCache.java:82) at org.jboss.protean.arc.AbstractSharedContext.destroy(AbstractSharedContext.java:70) at org.jboss.protean.arc.ArcContainerImpl.shutdown(ArcContainerImpl.java:245) at org.jboss.protean.arc.Arc.shutdown(Arc.java:53) at org.jboss.shamrock.arc.runtime.ArcDeploymentTemplate$1.run(ArcDeploymentTemplate.java:46) at org.jboss.shamrock.runtime.StartupContext.close(StartupContext.java:55) at org.jboss.shamrock.runner.ApplicationImpl1.doStop(Unknown Source) at org.jboss.shamrock.runtime.Application.stop(Application.java:152) at org.jboss.shamrock.runtime.Application.run(Application.java:197) at org.jboss.shamrock.runner.GeneratedMain.main(Unknown Source) ```

dd0d3aa84727019506e6c22d8a0241679eceb31f

2ff724e3e3872c6914c6f50a096ff5ba0824922e

https://github.com/quarkusio/quarkus/compare/dd0d3aa84727019506e6c22d8a0241679eceb31f...2ff724e3e3872c6914c6f50a096ff5ba0824922e

diff --git a/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/ClientProxyGenerator.java b/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/ClientProxyGenerator.java index 5e2c2e5b1e1..77af0966822 100644 --- a/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/ClientProxyGenerator.java +++ b/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/ClientProxyGenerator.java @@ -204,7 +204,8 @@ Collection<MethodInfo> getDelegatingMethods(BeanInfo bean) { MethodInfo producerMethod = bean.getTarget().get().asMethod(); Map<TypeVariable, Type> resolved = Collections.emptyMap(); ClassInfo returnTypeClass = bean.getDeployment().getIndex().getClassByName(producerMethod.returnType().name()); - if (!returnTypeClass.typeParameters().isEmpty()) { + if (!returnTypeClass.typeParameters().isEmpty() && !Modifier.isInterface(returnTypeClass.flags())) { + // Build the resolved map iff the return type is a parameterized class resolved = Types.buildResolvedMap(producerMethod.returnType().asParameterizedType().arguments(), returnTypeClass.typeParameters(), Collections.emptyMap()); } diff --git a/independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/AbstractSharedContext.java b/independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/AbstractSharedContext.java index 7f75f453353..1de6cff86f3 100644 --- a/independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/AbstractSharedContext.java +++ b/independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/AbstractSharedContext.java @@ -18,7 +18,9 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; import java.util.List; +import java.util.Set; import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; @@ -67,7 +69,18 @@ public void destroy(Contextual<?> contextual) { @Override public synchronized void destroy() { - instances.forEachExistingValue(InstanceHandleImpl::destroyInternal); + Set<InstanceHandleImpl<?>> values = instances.getPresentValues(); + // Destroy the producers first + for (Iterator<InstanceHandleImpl<?>> iterator = values.iterator(); iterator.hasNext();) { + InstanceHandleImpl<?> instanceHandle = iterator.next(); + if (instanceHandle.getBean().getDeclaringBean() != null) { + instanceHandle.destroyInternal(); + iterator.remove(); + } + } + for (InstanceHandleImpl<?> instanceHandle : values) { + instanceHandle.destroyInternal(); + } instances.clear(); } diff --git a/independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/ArcContainerImpl.java b/independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/ArcContainerImpl.java index 74a2e56acc6..bccdc0085e4 100644 --- a/independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/ArcContainerImpl.java +++ b/independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/ArcContainerImpl.java @@ -231,28 +231,25 @@ public String toString() { + contexts.size() + "]"; } - void shutdown() { - if (running.compareAndSet(true, false)) { - synchronized (this) { - // Make sure all dependent bean instances obtained via CDI.current() are destroyed correctly - CDI<?> cdi = CDI.current(); - if (cdi instanceof ArcCDI) { - ArcCDI arcCdi = (ArcCDI) cdi; - arcCdi.destroy(); - } - // Destroy contexts - contexts.get(ApplicationScoped.class) - .destroy(); - contexts.get(Singleton.class) - .destroy(); - ((RequestContext) contexts.get(RequestScoped.class)).terminate(); - // Clear caches - contexts.clear(); - beans.clear(); - resolved.clear(); - observers.clear(); - LOGGER.debugf("ArC DI container shut down"); + synchronized void shutdown() { + if (running.get()) { + // Make sure all dependent bean instances obtained via CDI.current() are destroyed correctly + CDI<?> cdi = CDI.current(); + if (cdi instanceof ArcCDI) { + ArcCDI arcCdi = (ArcCDI) cdi; + arcCdi.destroy(); } + // Destroy contexts + contexts.get(ApplicationScoped.class).destroy(); + contexts.get(Singleton.class).destroy(); + ((RequestContext) contexts.get(RequestScoped.class)).terminate(); + // Clear caches + contexts.clear(); + beans.clear(); + resolved.clear(); + observers.clear(); + running.set(false); + LOGGER.debugf("ArC DI container shut down"); } } diff --git a/independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/ComputingCache.java b/independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/ComputingCache.java index 6fdedbd3a90..b50f3171fc9 100644 --- a/independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/ComputingCache.java +++ b/independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/ComputingCache.java @@ -18,11 +18,13 @@ import java.util.Map; import java.util.Objects; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; +import java.util.stream.Collectors; /** * Computing cache backed by a {@link ConcurrentHashMap} which intentionally does not use {@link Map#computeIfAbsent(Object, Function)} and is reentrant. @@ -83,6 +85,10 @@ public void forEachExistingValue(Consumer<? super V> action) { } } } + + public Set<V> getPresentValues() { + return map.values().stream().map(LazyValue::get).collect(Collectors.toSet()); + } public void forEachEntry(BiConsumer<? super K, ? super V> action) { Objects.requireNonNull(action); diff --git a/independent-projects/arc/tests/src/test/java/org/jboss/protean/arc/test/producer/disposer/DisposerTest.java b/independent-projects/arc/tests/src/test/java/org/jboss/protean/arc/test/producer/disposer/DisposerTest.java index ecce9dd12e2..4ee1ac4d680 100644 --- a/independent-projects/arc/tests/src/test/java/org/jboss/protean/arc/test/producer/disposer/DisposerTest.java +++ b/independent-projects/arc/tests/src/test/java/org/jboss/protean/arc/test/producer/disposer/DisposerTest.java @@ -19,13 +19,16 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import java.math.BigDecimal; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import javax.annotation.PreDestroy; +import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; +import javax.enterprise.util.TypeLiteral; import javax.inject.Singleton; import org.jboss.protean.arc.Arc; @@ -34,11 +37,28 @@ import org.jboss.protean.arc.test.MyQualifier; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.RuleChain; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; public class DisposerTest { @Rule - public ArcTestContainer container = new ArcTestContainer(StringProducer.class, LongProducer.class); + public RuleChain chain = RuleChain.outerRule(new TestRule() { + @Override + public Statement apply(final Statement base, Description description) { + return new Statement() { + + @Override + public void evaluate() throws Throwable { + base.evaluate(); + assertNotNull(BigDecimalProducer.DISPOSED.get()); + assertEquals(1, BigDecimalProducer.DESTROYED.get()); + } + }; + } + }).around(new ArcTestContainer(StringProducer.class, LongProducer.class, BigDecimalProducer.class)); @Test public void testDisposers() { @@ -50,6 +70,10 @@ public void testDisposers() { assertNotNull(StringProducer.DISPOSED.get()); // A new instance is created for produce and dispose assertEquals(2, StringProducer.DESTROYED.get()); + // Both producer and produced bean are application scoped + Comparable<BigDecimal> bigDecimal = Arc.container().instance(new TypeLiteral<Comparable<BigDecimal>>() { + }).get(); + assertEquals(0, bigDecimal.compareTo(BigDecimal.ONE)); } @Singleton @@ -92,4 +116,28 @@ void destroy() { } + @ApplicationScoped + static class BigDecimalProducer { + + static final AtomicInteger DESTROYED = new AtomicInteger(); + + static final AtomicReference<Object> DISPOSED = new AtomicReference<>(); + + @ApplicationScoped + @Produces + Comparable<BigDecimal> produce() { + return BigDecimal.ONE; + } + + void dipose(@Disposes Comparable<BigDecimal> value) { + DISPOSED.set(value); + } + + @PreDestroy + void destroy() { + DESTROYED.incrementAndGet(); + } + + } + }

['independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/ArcContainerImpl.java', 'independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/ComputingCache.java', 'independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/AbstractSharedContext.java', 'independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/ClientProxyGenerator.java', 'independent-projects/arc/tests/src/test/java/org/jboss/protean/arc/test/producer/disposer/DisposerTest.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/946/936

quarkusio

quarkus

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

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

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

fixes

ClassNotFoundException with Arc and generated application class

When working on the Agroal config patch, if I change the generated `DataSourceProducer` class to be a generated **application** class, I get the following error. Stuart is on it. ``` Caused by: java.lang.RuntimeException: Failed to start shamrock at org.jboss.shamrock.runner.ApplicationImpl1.<clinit>(Unknown Source) ... 34 more Caused by: java.lang.NoClassDefFoundError: org/jboss/shamrock/agroal/runtime/DataSourceProducer at org.jboss.shamrock.agroal.runtime.DataSourceProducer_Bean.<init>(Unknown Source) at org.jboss.protean.arc.setup.Default_ComponentsProvider.getComponents(Unknown Source) at org.jboss.protean.arc.ArcContainerImpl.<init>(ArcContainerImpl.java:86) at org.jboss.protean.arc.Arc.initialize(Arc.java:34) at org.jboss.shamrock.arc.runtime.ArcDeploymentTemplate.getContainer(ArcDeploymentTemplate.java:41) at org.jboss.shamrock.deployment.steps.ArcAnnotationProcessor$build6.deploy(Unknown Source) ... 35 more Caused by: java.lang.ClassNotFoundException: org.jboss.shamrock.agroal.runtime.DataSourceProducer at java.net.URLClassLoader.findClass(URLClassLoader.java:381) at java.lang.ClassLoader.loadClass(ClassLoader.java:424) at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:349) at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ```

1e0cfae2a6115f6372ca291e96e53d3c55792a3f

d7821da4268eedaba436795b82cdb2cade6dfe97

https://github.com/quarkusio/quarkus/compare/1e0cfae2a6115f6372ca291e96e53d3c55792a3f...d7821da4268eedaba436795b82cdb2cade6dfe97

diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java index c95722decbb..394eb6e9300 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java @@ -138,7 +138,7 @@ public BeanContainerBuildItem build(ArcDeploymentTemplate arcTemplate, List<Bean for (GeneratedBeanBuildItem beanClass : generatedBeans) { IndexingUtil.indexClass(beanClass.getName(), indexer, beanArchiveIndex.getIndex(), additionalIndex, ArcAnnotationProcessor.class.getClassLoader(), beanClass.getData()); - generatedClassNames.add(DotName.createSimple(beanClass.getName())); + generatedClassNames.add(DotName.createSimple(beanClass.getName().replace('/', '.'))); } CompositeIndex index = CompositeIndex.create(indexer.complete(), beanArchiveIndex.getIndex());

['extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.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/941/940

quarkusio

quarkus

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

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

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

resolves

A CDI Vertx message consumer forces eager init of Vertx and native image generation fails

`org.jboss.shamrock.vertx.VertxProcessor.build()` should be probably annotated with `@Record(ExecutionTime.RUNTIME_INIT)`.

83b751c83d726e3b90f2a4c4e4d46f69302f8e50

b5c43492725d9d7f5799280ceef9db9b0edb74da

https://github.com/quarkusio/quarkus/compare/83b751c83d726e3b90f2a4c4e4d46f69302f8e50...b5c43492725d9d7f5799280ceef9db9b0edb74da

diff --git a/extensions/vertx/deployment/src/main/java/org/jboss/shamrock/vertx/VertxProcessor.java b/extensions/vertx/deployment/src/main/java/org/jboss/shamrock/vertx/VertxProcessor.java index 5b6963a69be..79befd883e0 100644 --- a/extensions/vertx/deployment/src/main/java/org/jboss/shamrock/vertx/VertxProcessor.java +++ b/extensions/vertx/deployment/src/main/java/org/jboss/shamrock/vertx/VertxProcessor.java @@ -115,7 +115,7 @@ AdditionalBeanBuildItem registerBean() { } @BuildStep - @Record(ExecutionTime.STATIC_INIT) + @Record(ExecutionTime.RUNTIME_INIT) void build(VertxTemplate template, BeanContainerBuildItem beanContainer, BuildProducer<FeatureBuildItem> feature, List<EventConsumerBusinessMethodItem> messageConsumerBusinessMethods, BuildProducer<GeneratedClassBuildItem> generatedClass) { feature.produce(new FeatureBuildItem(FeatureBuildItem.VERTX));

['extensions/vertx/deployment/src/main/java/org/jboss/shamrock/vertx/VertxProcessor.java']

{'.java': 1}

Java

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

Apache License 2.0

quarkusio/quarkus/862/855

quarkusio

quarkus

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

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

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

resolves

ArC - stack log messages about usage of private members

Currently, we log an `INFO` message for every private injection field/`@PreDestroy` callback/disposer/producer/etc. we find in the app code. This could be very annoying when porting an existing app. Therefore, we should only log one `INFO` message for the first occurence + `and N more found. Please enable debug logging to see more`.

b0a4760bf701eee4cbeee2f850a295c2995dfe49

4b90dac263a6e6886469f9e83f14d9c283d2505b

https://github.com/quarkusio/quarkus/compare/b0a4760bf701eee4cbeee2f850a295c2995dfe49...4b90dac263a6e6886469f9e83f14d9c283d2505b

diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java index 8d31098da48..c246d651890 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java @@ -18,9 +18,7 @@ import static org.jboss.shamrock.deployment.annotations.ExecutionTime.STATIC_INIT; -import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -33,11 +31,9 @@ import javax.inject.Inject; import org.jboss.jandex.AnnotationTarget; -import org.jboss.jandex.ClassInfo; import org.jboss.jandex.CompositeIndex; import org.jboss.jandex.DotName; import org.jboss.jandex.FieldInfo; -import org.jboss.jandex.IndexView; import org.jboss.jandex.Indexer; import org.jboss.jandex.MethodInfo; import org.jboss.logging.Logger; @@ -47,7 +43,6 @@ import org.jboss.protean.arc.processor.BeanDeployment; import org.jboss.protean.arc.processor.BeanProcessor; import org.jboss.protean.arc.processor.BeanProcessor.Builder; -import org.jboss.protean.arc.processor.DotNames; import org.jboss.protean.arc.processor.ReflectionRegistration; import org.jboss.protean.arc.processor.ResourceOutput; import org.jboss.shamrock.deployment.annotations.BuildProducer; diff --git a/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/BeanGenerator.java b/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/BeanGenerator.java index 70589b640d5..e9162056a00 100644 --- a/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/BeanGenerator.java +++ b/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/BeanGenerator.java @@ -48,8 +48,6 @@ import org.jboss.jandex.FieldInfo; import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type; -import org.jboss.logging.Logger; -import org.jboss.logging.Logger.Level; import org.jboss.protean.arc.CreationalContextImpl; import org.jboss.protean.arc.CurrentInjectionPointProvider; import org.jboss.protean.arc.InitializedInterceptor; @@ -59,6 +57,7 @@ import org.jboss.protean.arc.LazyValue; import org.jboss.protean.arc.Subclass; import org.jboss.protean.arc.processor.BeanInfo.InterceptionInfo; +import org.jboss.protean.arc.processor.BeanProcessor.PrivateMembersCollector; import org.jboss.protean.arc.processor.ResourceOutput.Resource; import org.jboss.protean.arc.processor.ResourceOutput.Resource.SpecialType; import org.jboss.protean.gizmo.AssignableResultHandle; @@ -89,22 +88,23 @@ public class BeanGenerator extends AbstractGenerator { static final String SYNTHETIC_SUFFIX = "_Synthetic"; - private static final Logger LOGGER = Logger.getLogger(BeanGenerator.class); - protected static final String FIELD_NAME_DECLARING_PROVIDER = "declaringProvider"; protected static final String FIELD_NAME_BEAN_TYPES = "types"; protected static final String FIELD_NAME_QUALIFIERS = "qualifiers"; protected static final String FIELD_NAME_STEREOTYPES = "stereotypes"; protected static final String FIELD_NAME_PROXY = "proxy"; protected static final String FIELD_NAME_PARAMS = "params"; - + protected final AnnotationLiteralProcessor annotationLiterals; protected final Predicate<DotName> applicationClassPredicate; - public BeanGenerator(AnnotationLiteralProcessor annotationLiterals, Predicate<DotName> applicationClassPredicate) { + protected final PrivateMembersCollector privateMembers; + + public BeanGenerator(AnnotationLiteralProcessor annotationLiterals, Predicate<DotName> applicationClassPredicate, PrivateMembersCollector privateMembers) { this.annotationLiterals = annotationLiterals; this.applicationClassPredicate = applicationClassPredicate; + this.privateMembers = privateMembers; } /** @@ -644,7 +644,7 @@ protected void implementDestroy(BeanInfo bean, ClassCreator beanCreator, String bean.getDeployment().getIndex()); for (MethodInfo callback : preDestroyCallbacks) { if (Modifier.isPrivate(callback.flags())) { - LOGGER.logf(isApplicationClass ? Level.INFO : Level.DEBUG, "PreDestroy callback %s#%s is private - users are encouraged to avoid using private callbacks", callback.declaringClass().name(), callback.name()); + privateMembers.add(isApplicationClass, String.format("@PreDestroy callback %s#%s()", callback.declaringClass().name(), callback.name())); reflectionRegistration.registerMethod(callback); destroy.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD, destroy.loadClass(callback.declaringClass().name().toString()), destroy.load(callback.name()), destroy.newArray(Class.class, destroy.load(0)), destroy.getMethodParam(0), @@ -693,9 +693,8 @@ protected void implementDestroy(BeanInfo bean, ClassCreator beanCreator, String } if (Modifier.isPrivate(disposerMethod.flags())) { - Level level = isApplicationClass ? Level.INFO : Level.DEBUG; - LOGGER.logf(level, "Disposer %s#%s is private - users are encouraged to avoid using private disposers", disposerMethod.declaringClass().name(), - disposerMethod.name()); + privateMembers.add(isApplicationClass, String.format("Disposer %s#%s", disposerMethod.declaringClass().name(), + disposerMethod.name())); ResultHandle paramTypesArray = destroy.newArray(Class.class, destroy.load(referenceHandles.length)); ResultHandle argsArray = destroy.newArray(Object.class, destroy.load(referenceHandles.length)); for (int i = 0; i < referenceHandles.length; i++) { @@ -881,9 +880,8 @@ protected void implementCreate(ClassOutput classOutput, ClassCreator beanCreator FieldInfo injectedField = fieldInjection.target.asField(); if (isReflectionFallbackNeeded(injectedField, targetPackage)) { if (Modifier.isPrivate(injectedField.flags())) { - Level level = isApplicationClass ? Level.INFO : Level.DEBUG; - LOGGER.logf(level, "@Inject %s#%s is private - users are encouraged to avoid using private injection fields", - fieldInjection.target.asField().declaringClass().name(), fieldInjection.target.asField().name()); + privateMembers.add(isApplicationClass, String.format("@Inject field %s#%s", fieldInjection.target.asField().declaringClass().name(), + fieldInjection.target.asField().name())); } reflectionRegistration.registerField(injectedField); create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_WRITE_FIELD, create.loadClass(injectedField.declaringClass().name().toString()), @@ -908,9 +906,8 @@ protected void implementCreate(ClassOutput classOutput, ClassCreator beanCreator MethodInfo initializerMethod = methodInjection.target.asMethod(); if (isReflectionFallbackNeeded(initializerMethod, targetPackage)) { if (Modifier.isPrivate(initializerMethod.flags())) { - Level level = isApplicationClass ? Level.INFO : Level.DEBUG; - LOGGER.logf(level, "@Inject %s#%s() is private - users are encouraged to avoid using private injection initializers", - initializerMethod.declaringClass().name(), initializerMethod.name()); + privateMembers.add(isApplicationClass, + String.format("@Inject initializer %s#%s()", initializerMethod.declaringClass().name(), initializerMethod.name())); } ResultHandle paramTypesArray = create.newArray(Class.class, create.load(referenceHandles.length)); ResultHandle argsArray = create.newArray(Object.class, create.load(referenceHandles.length)); @@ -958,10 +955,8 @@ protected void implementCreate(ClassOutput classOutput, ClassCreator beanCreator bean.getDeployment().getIndex()); for (MethodInfo callback : postConstructCallbacks) { if (Modifier.isPrivate(callback.flags())) { - Level level = isApplicationClass ? Level.INFO : Level.DEBUG; - LOGGER.logf(level, "PostConstruct callback %s#%s is private - users are encouraged to avoid using private callbacks", - callback.declaringClass().name(), - callback.name()); + privateMembers.add(isApplicationClass, + String.format("@PostConstruct callback %s#%s()", callback.declaringClass().name(), callback.name())); reflectionRegistration.registerMethod(callback); create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_INVOKE_METHOD, create.loadClass(callback.declaringClass().name().toString()), create.load(callback.name()), create.newArray(Class.class, create.load(0)), instanceHandle, @@ -1001,9 +996,7 @@ protected void implementCreate(ClassOutput classOutput, ClassCreator beanCreator MethodInfo producerMethod = bean.getTarget().get().asMethod(); if (Modifier.isPrivate(producerMethod.flags())) { - Level level = isApplicationClass ? Level.INFO : Level.DEBUG; - LOGGER.logf(level, "Producer %s#%s is private - users are encouraged to avoid using private producers", producerMethod.declaringClass().name(), - producerMethod.name()); + privateMembers.add(isApplicationClass, String.format("Producer method %s#%s()", producerMethod.declaringClass().name(), producerMethod.name())); ResultHandle paramTypesArray = create.newArray(Class.class, create.load(referenceHandles.length)); ResultHandle argsArray = create.newArray(Object.class, create.load(referenceHandles.length)); for (int i = 0; i < referenceHandles.length; i++) { @@ -1043,9 +1036,7 @@ protected void implementCreate(ClassOutput classOutput, ClassCreator beanCreator } if (Modifier.isPrivate(producerField.flags())) { - Level level = isApplicationClass ? Level.INFO : Level.DEBUG; - LOGGER.logf(level, "Producer %s#%s is private - users are encouraged to avoid using private producers", producerField.declaringClass().name(), - producerField.name()); + privateMembers.add(isApplicationClass, String.format("Producer field %s#%s", producerField.declaringClass().name(), producerField.name())); reflectionRegistration.registerField(producerField); create.assign(instanceHandle, create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_READ_FIELD, create.loadClass(producerField.declaringClass().name().toString()), create.load(producerField.name()), declaringProviderInstanceHandle)); @@ -1134,9 +1125,7 @@ private ResultHandle newInstanceHandle(BeanInfo bean, ClassCreator beanCreator, } else if (constructorInjection.isPresent()) { if (Modifier.isPrivate(constructor.flags())) { - Level level = isApplicationClass ? Level.INFO : Level.DEBUG; - LOGGER.logf(level, "Constructor %s is private - users are encouraged to avoid using private constructors", - constructor.declaringClass().name()); + privateMembers.add(isApplicationClass, String.format("Bean constructor %s on %s", constructor, constructor.declaringClass().name())); ResultHandle paramTypesArray = creator.newArray(Class.class, creator.load(providerHandles.size())); ResultHandle argsArray = creator.newArray(Object.class, creator.load(providerHandles.size())); for (int i = 0; i < injectionPoints.size(); i++) { @@ -1158,9 +1147,8 @@ private ResultHandle newInstanceHandle(BeanInfo bean, ClassCreator beanCreator, } else { MethodInfo noArgsConstructor = bean.getTarget().get().asClass().method(Methods.INIT); if (Modifier.isPrivate(noArgsConstructor.flags())) { - Level level = isApplicationClass ? Level.INFO : Level.DEBUG; - LOGGER.logf(level, "Constructor %s is private - users are encouraged to avoid using private constructors", - noArgsConstructor.declaringClass().name()); + privateMembers.add(isApplicationClass, + String.format("Bean constructor %s on %s", noArgsConstructor, noArgsConstructor.declaringClass().name())); ResultHandle paramTypesArray = creator.newArray(Class.class, creator.load(0)); ResultHandle argsArray = creator.newArray(Object.class, creator.load(0)); diff --git a/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/BeanProcessor.java b/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/BeanProcessor.java index 3cd2f4ce340..f64e9f633a6 100644 --- a/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/BeanProcessor.java +++ b/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/BeanProcessor.java @@ -31,6 +31,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; +import java.util.stream.Collectors; import javax.enterprise.context.control.ActivateRequestContext; import javax.enterprise.inject.Any; @@ -150,20 +151,21 @@ public <V> V put(Key<V> key, V value) { this.beanRegistrars = initAndSort(beanRegistrars, buildContext); this.beanDeploymentValidators = initAndSort(beanDeploymentValidators, buildContext); } - + public BeanDeployment process() throws IOException { BeanDeployment beanDeployment = new BeanDeployment(new IndexWrapper(index), additionalBeanDefiningAnnotations, annotationTransformers, resourceAnnotations, beanRegistrars, buildContext, removeUnusedBeans, unusedExclusions); beanDeployment.init(); beanDeployment.validate(buildContext, beanDeploymentValidators); - + + PrivateMembersCollector privateMembers = new PrivateMembersCollector(); AnnotationLiteralProcessor annotationLiterals = new AnnotationLiteralProcessor(sharedAnnotationLiterals, applicationClassPredicate); - BeanGenerator beanGenerator = new BeanGenerator(annotationLiterals, applicationClassPredicate); + BeanGenerator beanGenerator = new BeanGenerator(annotationLiterals, applicationClassPredicate, privateMembers); ClientProxyGenerator clientProxyGenerator = new ClientProxyGenerator(applicationClassPredicate); - InterceptorGenerator interceptorGenerator = new InterceptorGenerator(annotationLiterals, applicationClassPredicate); + InterceptorGenerator interceptorGenerator = new InterceptorGenerator(annotationLiterals, applicationClassPredicate, privateMembers); SubclassGenerator subclassGenerator = new SubclassGenerator(annotationLiterals, applicationClassPredicate); - ObserverGenerator observerGenerator = new ObserverGenerator(annotationLiterals, applicationClassPredicate); + ObserverGenerator observerGenerator = new ObserverGenerator(annotationLiterals, applicationClassPredicate, privateMembers); AnnotationLiteralGenerator annotationLiteralsGenerator = new AnnotationLiteralGenerator(); Map<BeanInfo, String> beanToGeneratedName = new HashMap<>(); @@ -209,6 +211,8 @@ public BeanDeployment process() throws IOException { } } + privateMembers.log(); + // Generate _ComponentsProvider resources.addAll(new ComponentsProviderGenerator().generate(name, beanDeployment, beanToGeneratedName, observerToGeneratedName)); @@ -561,5 +565,42 @@ <V> V putInternal(String key, V value) { } } + + static class PrivateMembersCollector { + + private final List<String> appDescriptions; + private final List<String> fwkDescriptions; + + public PrivateMembersCollector() { + this.appDescriptions = new ArrayList<>(); + this.fwkDescriptions = LOGGER.isDebugEnabled() ? new ArrayList<>() : null; + } + + void add(boolean isApplicationClass, String description) { + if (isApplicationClass) { + appDescriptions.add(description); + } else if(fwkDescriptions != null) { + fwkDescriptions.add(description); + } + } + + private void log() { + // Log application problems + if (!appDescriptions.isEmpty()) { + int limit = LOGGER.isDebugEnabled() ? Integer.MAX_VALUE : 3; + String info = appDescriptions.stream().limit(limit).map(d -> "\\t- " + d).collect(Collectors.joining(",\\n")); + if (appDescriptions.size() > limit) { + info += "\\n\\t- and " + (appDescriptions.size() - limit) + " more - please enable debug logging to see the full list"; + } + LOGGER.infof("Found unrecommended usage of private members in application beans:\\n%s", info); + } + // Log fwk problems + if (fwkDescriptions != null && !fwkDescriptions.isEmpty()) { + LOGGER.debugf("Found unrecommended usage of private members in framework beans:\\n%s", + fwkDescriptions.stream().map(d -> "\\t- " + d).collect(Collectors.joining(",\\n"))); + } + } + + } } diff --git a/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/InterceptorGenerator.java b/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/InterceptorGenerator.java index 349b97877bb..5080c3fb5f6 100644 --- a/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/InterceptorGenerator.java +++ b/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/InterceptorGenerator.java @@ -36,9 +36,8 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type; -import org.jboss.logging.Logger; -import org.jboss.logging.Logger.Level; import org.jboss.protean.arc.InjectableInterceptor; +import org.jboss.protean.arc.processor.BeanProcessor.PrivateMembersCollector; import org.jboss.protean.arc.processor.ResourceOutput.Resource; import org.jboss.protean.arc.processor.ResourceOutput.Resource.SpecialType; import org.jboss.protean.gizmo.BranchResult; @@ -57,16 +56,11 @@ */ public class InterceptorGenerator extends BeanGenerator { - private static final Logger LOGGER = Logger.getLogger(InterceptorGenerator.class); - protected static final String FIELD_NAME_BINDINGS = "bindings"; - /** - * - * @param annotationLiterals - */ - public InterceptorGenerator(AnnotationLiteralProcessor annotationLiterals, Predicate<DotName> applicationClassPredicate) { - super(annotationLiterals, applicationClassPredicate); + public InterceptorGenerator(AnnotationLiteralProcessor annotationLiterals, Predicate<DotName> applicationClassPredicate, + PrivateMembersCollector privateMembers) { + super(annotationLiterals, applicationClassPredicate, privateMembers); } /** @@ -216,11 +210,8 @@ private void addIntercept(MethodCreator intercept, MethodInfo interceptorMethod, Class<?> retType = InterceptionType.AROUND_INVOKE.equals(interceptionType) ? Object.class : void.class; ResultHandle ret; if (Modifier.isPrivate(interceptorMethod.flags())) { - Level level = isApplicationClass ? Level.INFO : Level.DEBUG; - LOGGER.logf(level, "Interceptor method %s#%s is private - users are encouraged to avoid using private interceptor methods", - interceptorMethod.declaringClass() - .name(), - interceptorMethod.name()); + privateMembers.add(isApplicationClass, + String.format("Interceptor method %s#%s()", interceptorMethod.declaringClass().name(), interceptorMethod.name())); // Use reflection fallback ResultHandle paramTypesArray = trueBranch.newArray(Class.class, trueBranch.load(1)); trueBranch.writeArrayValue(paramTypesArray, 0, trueBranch.loadClass(InvocationContext.class)); diff --git a/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/ObserverGenerator.java b/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/ObserverGenerator.java index 04b013b8f18..bc1c3282339 100644 --- a/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/ObserverGenerator.java +++ b/independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/ObserverGenerator.java @@ -39,13 +39,12 @@ import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; -import org.jboss.logging.Logger; -import org.jboss.logging.Logger.Level; import org.jboss.protean.arc.CreationalContextImpl; import org.jboss.protean.arc.CurrentInjectionPointProvider; import org.jboss.protean.arc.InjectableBean; import org.jboss.protean.arc.InjectableObserverMethod; import org.jboss.protean.arc.InjectableReferenceProvider; +import org.jboss.protean.arc.processor.BeanProcessor.PrivateMembersCollector; import org.jboss.protean.arc.processor.ResourceOutput.Resource; import org.jboss.protean.arc.processor.ResourceOutput.Resource.SpecialType; import org.jboss.protean.gizmo.ClassCreator; @@ -64,19 +63,17 @@ public class ObserverGenerator extends AbstractGenerator { static final String OBSERVER_SUFFIX = "_Observer"; - private static final Logger LOGGER = Logger.getLogger(ObserverGenerator.class); - private final AnnotationLiteralProcessor annotationLiterals; private final Predicate<DotName> applicationClassPredicate; - /** - * - * @param annotationLiterals - * @param applicationClassPredicate - */ - public ObserverGenerator(AnnotationLiteralProcessor annotationLiterals, Predicate<DotName> applicationClassPredicate) { + + private final PrivateMembersCollector privateMembers; + + public ObserverGenerator(AnnotationLiteralProcessor annotationLiterals, Predicate<DotName> applicationClassPredicate, + PrivateMembersCollector privateMembers) { this.annotationLiterals = annotationLiterals; this.applicationClassPredicate = applicationClassPredicate; + this.privateMembers = privateMembers; } /** @@ -211,9 +208,8 @@ protected void implementNotify(ObserverInfo observer, ClassCreator observerCreat } if (Modifier.isPrivate(observer.getObserverMethod().flags())) { - Level level = isApplicationClass ? Level.INFO : Level.DEBUG; - LOGGER.logf(level, "Observer %s#%s is private - users are encouraged to avoid using private observers", observer.getObserverMethod().declaringClass().name(), - observer.getObserverMethod().name()); + privateMembers.add(isApplicationClass, + String.format("Observer method %s#%s()", observer.getObserverMethod().declaringClass().name(), observer.getObserverMethod().name())); ResultHandle paramTypesArray = notify.newArray(Class.class, notify.load(referenceHandles.length)); ResultHandle argsArray = notify.newArray(Object.class, notify.load(referenceHandles.length)); for (int i = 0; i < referenceHandles.length; i++) { diff --git a/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/BeanGeneratorTest.java b/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/BeanGeneratorTest.java index 4b00ba230bc..50c31b52f07 100644 --- a/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/BeanGeneratorTest.java +++ b/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/BeanGeneratorTest.java @@ -22,7 +22,6 @@ import java.util.AbstractCollection; import java.util.AbstractList; import java.util.Collection; -import java.util.Collections; import java.util.List; import javax.enterprise.context.ApplicationScoped; @@ -30,6 +29,7 @@ import javax.enterprise.inject.Produces; import org.jboss.jandex.Index; +import org.jboss.protean.arc.processor.BeanProcessor.PrivateMembersCollector; import org.jboss.protean.arc.processor.types.Foo; import org.jboss.protean.arc.processor.types.FooQualifier; import org.junit.Test; @@ -43,7 +43,7 @@ public void testGenerator() throws IOException { BeanDeployment deployment = new BeanDeployment(index, null, null); deployment.init(); - BeanGenerator generator = new BeanGenerator(new AnnotationLiteralProcessor(true, TruePredicate.INSTANCE), TruePredicate.INSTANCE); + BeanGenerator generator = new BeanGenerator(new AnnotationLiteralProcessor(true, TruePredicate.INSTANCE), TruePredicate.INSTANCE, new PrivateMembersCollector()); deployment.getBeans().forEach(bean -> generator.generate(bean, ReflectionRegistration.NOOP)); // TODO test generated bytecode @@ -56,7 +56,7 @@ public void testGeneratorForNormalScopedProducer() throws IOException { BeanDeployment deployment = new BeanDeployment(index, null, null); deployment.init(); - BeanGenerator generator = new BeanGenerator(new AnnotationLiteralProcessor(true, TruePredicate.INSTANCE), TruePredicate.INSTANCE); + BeanGenerator generator = new BeanGenerator(new AnnotationLiteralProcessor(true, TruePredicate.INSTANCE), TruePredicate.INSTANCE, new PrivateMembersCollector()); deployment.getBeans().forEach(bean -> generator.generate(bean, ReflectionRegistration.NOOP)); // TODO test generated bytecode diff --git a/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/ClientProxyGeneratorTest.java b/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/ClientProxyGeneratorTest.java index 945d0290130..f4603e87223 100644 --- a/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/ClientProxyGeneratorTest.java +++ b/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/ClientProxyGeneratorTest.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.AbstractList; import java.util.Collection; -import java.util.Collections; import java.util.List; import javax.enterprise.context.ApplicationScoped; @@ -29,6 +28,7 @@ import javax.enterprise.inject.Produces; import org.jboss.jandex.Index; +import org.jboss.protean.arc.processor.BeanProcessor.PrivateMembersCollector; import org.jboss.protean.arc.processor.ResourceOutput.Resource; import org.junit.Test; @@ -41,7 +41,7 @@ public void testGenerator() throws IOException { BeanDeployment deployment = new BeanDeployment(index, null, null); deployment.init(); - BeanGenerator beanGenerator = new BeanGenerator( new AnnotationLiteralProcessor(true, TruePredicate.INSTANCE), TruePredicate.INSTANCE); + BeanGenerator beanGenerator = new BeanGenerator( new AnnotationLiteralProcessor(true, TruePredicate.INSTANCE), TruePredicate.INSTANCE, new PrivateMembersCollector()); ClientProxyGenerator proxyGenerator = new ClientProxyGenerator(TruePredicate.INSTANCE); deployment.getBeans().stream().filter(bean -> bean.getScope().isNormal()).forEach(bean -> { diff --git a/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/InterceptorGeneratorTest.java b/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/InterceptorGeneratorTest.java index 47b1780fbdf..eb3d6e62a6c 100644 --- a/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/InterceptorGeneratorTest.java +++ b/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/InterceptorGeneratorTest.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.util.Collections; import javax.annotation.Priority; import javax.inject.Inject; @@ -34,6 +33,7 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.Index; +import org.jboss.protean.arc.processor.BeanProcessor.PrivateMembersCollector; import org.jboss.protean.arc.processor.types.Baz; import org.junit.Test; @@ -53,7 +53,7 @@ public void testGenerator() throws IOException { assertEquals(1, myInterceptor.getBindings().size()); assertNotNull(myInterceptor.getAroundInvoke()); - InterceptorGenerator generator = new InterceptorGenerator(new AnnotationLiteralProcessor(true, TruePredicate.INSTANCE), TruePredicate.INSTANCE); + InterceptorGenerator generator = new InterceptorGenerator(new AnnotationLiteralProcessor(true, TruePredicate.INSTANCE), TruePredicate.INSTANCE, new PrivateMembersCollector()); deployment.getInterceptors().forEach(interceptor -> generator.generate(interceptor, ReflectionRegistration.NOOP)); // TODO test generated bytecode diff --git a/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/SubclassGeneratorTest.java b/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/SubclassGeneratorTest.java index bac068afaaf..e74c577c880 100644 --- a/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/SubclassGeneratorTest.java +++ b/independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/SubclassGeneratorTest.java @@ -25,7 +25,6 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.util.Collections; import javax.annotation.Priority; import javax.enterprise.context.Dependent; @@ -37,6 +36,7 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.Index; +import org.jboss.protean.arc.processor.BeanProcessor.PrivateMembersCollector; import org.jboss.protean.arc.processor.ResourceOutput.Resource; import org.jboss.protean.arc.processor.types.Baz; import org.junit.Test; @@ -51,7 +51,7 @@ public void testGenerator() throws IOException { deployment.init(); AnnotationLiteralProcessor annotationLiteralProcessor = new AnnotationLiteralProcessor(true, TruePredicate.INSTANCE); - BeanGenerator beanGenerator = new BeanGenerator(annotationLiteralProcessor, TruePredicate.INSTANCE); + BeanGenerator beanGenerator = new BeanGenerator(annotationLiteralProcessor, TruePredicate.INSTANCE, new PrivateMembersCollector()); SubclassGenerator generator = new SubclassGenerator(annotationLiteralProcessor, TruePredicate.INSTANCE); BeanInfo simpleBean = deployment.getBeans().stream() .filter(b -> b.getTarget().get().asClass().name().equals(DotName.createSimple(SimpleBean.class.getName()))).findAny().get();

['independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/BeanGenerator.java', 'independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/InterceptorGenerator.java', 'independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/SubclassGeneratorTest.java', 'independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/BeanProcessor.java', 'extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java', 'independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/ClientProxyGeneratorTest.java', 'independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/BeanGeneratorTest.java', 'independent-projects/arc/processor/src/test/java/org/jboss/protean/arc/processor/InterceptorGeneratorTest.java', 'independent-projects/arc/processor/src/main/java/org/jboss/protean/arc/processor/ObserverGenerator.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/644/634

quarkusio

quarkus

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

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

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

fixes

mvn install fails if it has already been run

After the recent changes if you run 'mvn install' twice in a row the shamrock-maven-plugin will fail with Caused by: java.nio.file.FileAlreadyExistsException: META-INF/MANIFEST.MF

664778882965195215759eb15ab97a705634ff63

c615e47f4e155b347bc184df14286bf6d6bbc81a

https://github.com/quarkusio/quarkus/compare/664778882965195215759eb15ab97a705634ff63...c615e47f4e155b347bc184df14286bf6d6bbc81a

diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/runnerjar/RunnerJarPhase.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/runnerjar/RunnerJarPhase.java index 16a2bcb83c7..1715f696024 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/runnerjar/RunnerJarPhase.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/runnerjar/RunnerJarPhase.java @@ -171,7 +171,7 @@ public void provideOutcome(AppCreator ctx) throws AppCreatorException { } runnerJar = outputDir.resolve(finalName + "-runner.jar"); - + IoUtils.recursiveDelete(runnerJar); try (FileSystem zipFs = ZipUtils.newZip(runnerJar)) { buildRunner(zipFs, appState, ctx.resolveOutcome(AugmentOutcome.class)); } catch (Exception e) {

['core/creator/src/main/java/org/jboss/shamrock/creator/phase/runnerjar/RunnerJarPhase.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/547/544

quarkusio

quarkus

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

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

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

fix

shamrock:dev allows debug port 0 to be used

As the debug port can now be specified, the 0 value is allowed leading to wrong configuration as the allocated port is not retrieved

70f6780c4edbc5c9075f47c52ab750db6dce7373

3241c0b52065e2b2f4561506149f473c9041b07a

https://github.com/quarkusio/quarkus/compare/70f6780c4edbc5c9075f47c52ab750db6dce7373...3241c0b52065e2b2f4561506149f473c9041b07a

diff --git a/maven/src/main/java/org/jboss/shamrock/maven/DevMojo.java b/maven/src/main/java/org/jboss/shamrock/maven/DevMojo.java index cede5f0c17b..c5acb361086 100644 --- a/maven/src/main/java/org/jboss/shamrock/maven/DevMojo.java +++ b/maven/src/main/java/org/jboss/shamrock/maven/DevMojo.java @@ -136,6 +136,9 @@ public void execute() throws MojoFailureException { } else if (!debug.toLowerCase().equals("false")) { try { int port = Integer.parseInt(debug); + if (port <= 0) { + throw new MojoFailureException("The specified debug port must be greater than 0"); + } args.add("-Xdebug"); args.add("-Xrunjdwp:transport=dt_socket,address=" + port + ",server=y,suspend=y"); } catch (NumberFormatException e) {

['maven/src/main/java/org/jboss/shamrock/maven/DevMojo.java']

{'.java': 1}

Java

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

Apache License 2.0

quarkusio/quarkus/218/214

quarkusio

quarkus

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

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

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

resolves

High thread contention in org.jboss.protean.arc.RequestContext

org.jboss.protean.arc.RequestContext.activate()[1] and org.jboss.protean.arc.RequestContext.deactivate()[2] both use coarse grained locking via method synchronization. These methods are on a hot code path, and cause a lot of thread contention under load. For a 1min 39s sample, I have observed a total of 1hr 7min 54s of thread time blocked waiting for the sync lock. I am not sure of the intention of the synchronization as the currentContext is accessed in methods other than activate() and deactivate(), so is not not consistently protected. The property is also a threadLocal, so each thread should have it's own copy of the object. I am not sure that the synchronization is necessary, but if it is required, we need to implement a more lightweight, finer grained, locking implementation. [1] https://github.com/protean-project/shamrock/blob/master/ext/arc/runtime/src/main/java/org/jboss/protean/arc/RequestContext.java#L95 [2] https://github.com/protean-project/shamrock/blob/master/ext/arc/runtime/src/main/java/org/jboss/protean/arc/RequestContext.java#L109

1f7593b68aae42748985e601b9fe57ede1595432

97c344ff2ca0886a808ff1251368ae4d23b6855f

https://github.com/quarkusio/quarkus/compare/1f7593b68aae42748985e601b9fe57ede1595432...97c344ff2ca0886a808ff1251368ae4d23b6855f

diff --git a/ext/arc/runtime/src/main/java/org/jboss/protean/arc/RequestContext.java b/ext/arc/runtime/src/main/java/org/jboss/protean/arc/RequestContext.java index 5ef92500ca6..9ae045c31c0 100644 --- a/ext/arc/runtime/src/main/java/org/jboss/protean/arc/RequestContext.java +++ b/ext/arc/runtime/src/main/java/org/jboss/protean/arc/RequestContext.java @@ -92,7 +92,7 @@ public void destroy(Contextual<?> contextual) { } @Override - public synchronized void activate(Collection<InstanceHandle<?>> initialState) { + public void activate(Collection<InstanceHandle<?>> initialState) { Map<Contextual<?>, InstanceHandle<?>> state = new HashMap<>(); if (initialState != null) { for (InstanceHandle<?> instanceHandle : initialState) { @@ -106,7 +106,7 @@ public synchronized void activate(Collection<InstanceHandle<?>> initialState) { } @Override - public synchronized void deactivate() { + public void deactivate() { currentContext.remove(); }

['ext/arc/runtime/src/main/java/org/jboss/protean/arc/RequestContext.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/1731/1671

quarkusio

quarkus

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

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

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

fixes

ImageIO substitutions should be global

Right now, we have `Target_javax_imageio_ImageIO` in `quarkus-resteasy-common` and this substitution should be made global as we have JAXB dependending on it (and so `camel-core`). ``` Call path from entry point to com.sun.imageio.plugins.jpeg.JPEGImageReader.readImageHeader(long, boolean, boolean): at com.sun.imageio.plugins.jpeg.JPEGImageReader.readImageHeader(JPEGImageReader.java) at com.sun.imageio.plugins.jpeg.JPEGImageReader.readNativeHeader(JPEGImageReader.java:620) at com.sun.imageio.plugins.jpeg.JPEGImageReader.readHeader(JPEGImageReader.java:614) at com.sun.imageio.plugins.jpeg.JPEGImageReader.readInternal(JPEGImageReader.java:1070) at com.sun.imageio.plugins.jpeg.JPEGImageReader.read(JPEGImageReader.java:1050) at javax.imageio.ImageIO.read(ImageIO.java:1448) at javax.imageio.ImageIO.read(ImageIO.java:1352) at com.sun.xml.bind.v2.model.impl.RuntimeBuiltinLeafInfoImpl$10.parse(RuntimeBuiltinLeafInfoImpl.java:404) at com.sun.xml.bind.v2.model.impl.RuntimeBuiltinLeafInfoImpl$10.parse(RuntimeBuiltinLeafInfoImpl.java:390) at com.sun.xml.bind.v2.runtime.ValueListBeanInfoImpl$1.text(ValueListBeanInfoImpl.java:93) at com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext.text(UnmarshallingContext.java:590) at com.sun.xml.bind.v2.runtime.unmarshaller.MTOMDecorator.startElement(MTOMDecorator.java:107) at com.sun.xml.bind.v2.runtime.unmarshaller.SAXConnector.startElement(SAXConnector.java:168) at org.apache.camel.support.builder.xml.StAX2SAXSource.parse(StAX2SAXSource.java:147) at org.apache.camel.support.builder.xml.StAX2SAXSource.parse(StAX2SAXSource.java:343) ```

da58f701cefe857236967939b9f6b422e37d0573

6ff8b9221d8c5fdd305c8ac92037e9b995ebe0bb

https://github.com/quarkusio/quarkus/compare/da58f701cefe857236967939b9f6b422e37d0573...6ff8b9221d8c5fdd305c8ac92037e9b995ebe0bb

diff --git a/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/ImageIOSubstitutions.java b/core/runtime/src/main/java/io/quarkus/runtime/graal/ImageIOSubstitutions.java similarity index 57% rename from extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/ImageIOSubstitutions.java rename to core/runtime/src/main/java/io/quarkus/runtime/graal/ImageIOSubstitutions.java index 06cc8100856..41a89d8b78f 100644 --- a/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/ImageIOSubstitutions.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/graal/ImageIOSubstitutions.java @@ -1,4 +1,4 @@ -package io.quarkus.resteasy.common.runtime.graal; +package io.quarkus.runtime.graal; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; @@ -29,155 +29,139 @@ public static void scanForPlugins() { @Substitute public static ImageInputStream createImageInputStream(Object input) throws IOException { - throw new IOException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static ImageOutputStream createImageOutputStream(Object output) throws IOException { - throw new IOException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static String[] getReaderFormatNames() { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static String[] getReaderMIMETypes() { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static String[] getReaderFileSuffixes() { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static Iterator<ImageReader> getImageReaders(Object input) { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static Iterator<ImageReader> getImageReadersByFormatName(String formatName) { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static Iterator<ImageReader> getImageReadersBySuffix(String fileSuffix) { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static Iterator<ImageReader> getImageReadersByMIMEType(String MIMEType) { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static String[] getWriterFormatNames() { - - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } - /** - * Returns an array of {@code String}s listing all of the - * MIME types understood by the current set of registered - * writers. - * - * @return an array of {@code String}s. - */ @Substitute public static String[] getWriterMIMETypes() { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } - /** - * Returns an array of {@code String}s listing all of the - * file suffixes associated with the formats understood - * by the current set of registered writers. - * - * @return an array of {@code String}s. - * @since 1.6 - */ @Substitute public static String[] getWriterFileSuffixes() { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static Iterator<ImageWriter> getImageWritersByFormatName(String formatName) { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static Iterator<ImageWriter> getImageWritersBySuffix(String fileSuffix) { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static Iterator<ImageWriter> getImageWritersByMIMEType(String MIMEType) { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static ImageWriter getImageWriter(ImageReader reader) { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static ImageReader getImageReader(ImageWriter writer) { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static Iterator<ImageWriter> getImageWriters(ImageTypeSpecifier type, String formatName) { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static Iterator<ImageTranscoder> getImageTranscoders(ImageReader reader, ImageWriter writer) { - throw new RuntimeException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static BufferedImage read(File input) throws IOException { - throw new IOException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static BufferedImage read(InputStream input) throws IOException { - throw new IOException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static BufferedImage read(URL input) throws IOException { - throw new IOException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static BufferedImage read(ImageInputStream stream) throws IOException { - throw new IOException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static boolean write(RenderedImage im, String formatName, ImageOutputStream output) throws IOException { - throw new IOException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static boolean write(RenderedImage im, String formatName, File output) throws IOException { - throw new IOException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static boolean write(RenderedImage im, String formatName, OutputStream output) throws IOException { - throw new IOException("Not Implemented yet on substrate"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } } diff --git a/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/LCMSSubstitutions.java b/core/runtime/src/main/java/io/quarkus/runtime/graal/LCMSSubstitutions.java similarity index 63% rename from extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/LCMSSubstitutions.java rename to core/runtime/src/main/java/io/quarkus/runtime/graal/LCMSSubstitutions.java index 93ef2fe91a4..322349e2361 100644 --- a/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/LCMSSubstitutions.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/graal/LCMSSubstitutions.java @@ -1,4 +1,4 @@ -package io.quarkus.resteasy.common.runtime.graal; +package io.quarkus.runtime.graal; import java.awt.color.ICC_Profile; @@ -10,38 +10,28 @@ final class Target_sun_java2d_cmm_lcms_LCMS { @Substitute private long loadProfileNative(byte[] data, Object ref) { - throw new RuntimeException("Not Implemented"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute private int getProfileSizeNative(long ptr) { - throw new RuntimeException("Not Implemented"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute private void getProfileDataNative(long ptr, byte[] data) { - throw new RuntimeException("Not Implemented"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute static byte[] getTagNative(long profileID, int signature) { - throw new RuntimeException("Not Implemented"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } - /** - * Writes supplied data as a tag into the profile. - * Destroys old profile, if new one was successfully - * created. - * <p> - * Returns valid pointer to new profile. - * <p> - * Throws CMMException if operation fails, preserve old profile from - * destruction. - */ @Substitute private void setTagDataNative(long ptr, int tagSignature, byte[] data) { - throw new RuntimeException("Not Implemented"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute @@ -50,29 +40,28 @@ private static long createNativeTransform( int inFormatter, boolean isInIntPacked, int outFormatter, boolean isOutIntPacked, Object disposerRef) { - throw new RuntimeException("Not Implemented"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static void initLCMS(Class<?> Trans, Class<?> IL, Class<?> Pf) { - throw new RuntimeException("Not Implemented"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static synchronized LCMSProfile getProfileID(ICC_Profile profile) { - throw new RuntimeException("Not Implemented"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @Substitute public static void colorConvert(LCMSTransform trans, LCMSImageLayout src, LCMSImageLayout dest) { - throw new RuntimeException("Not Implemented"); + throw new UnsupportedOperationException("Not implemented yet for GraalVM native images"); } @TargetClass(className = "sun.java2d.cmm.lcms.LCMSProfile") static final class LCMSProfile { - } @TargetClass(className = "sun.java2d.cmm.lcms.LCMSImageLayout") @@ -81,7 +70,6 @@ static final class LCMSImageLayout { @TargetClass(className = "sun.java2d.cmm.lcms.LCMSTransform") static final class LCMSTransform { - } }

['extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/ImageIOSubstitutions.java', 'extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/LCMSSubstitutions.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/1744/1538

quarkusio

quarkus

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

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

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

resolves

MP config injection types

According to [1] Quarkus app should be able to inject config properties like: ```java @Inject @ConfigProperty(name="myprj.some.dynamic.timeout", defaultValue="100") private javax.inject.Provider<Long> timeout; ``` or ```java @Inject @ConfigProperty(name="myPets") private List<String> myListPets; ``` The Provider injection fails with Arc as it cannot resolve injection [2] and second List injection fails because List converter is not used by default which I think it should be according to the spec [3]. It doesn't also work with Set or String[]. [1] https://github.com/eclipse/microprofile-config/blob/master/spec/src/main/asciidoc/configexamples.asciidoc#simple-dependency-injection-example [2] https://github.com/xstefank/reproducers/tree/master/config-provided-prop [3] https://github.com/xstefank/reproducers/tree/master/config-list-inject

fd4c4e130e224063c0eb1f7977a086e2e05f8c0b

31ce4814c1bbbb2b3dede85e78de4ea2e687d68c

https://github.com/quarkusio/quarkus/compare/fd4c4e130e224063c0eb1f7977a086e2e05f8c0b...31ce4814c1bbbb2b3dede85e78de4ea2e687d68c

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java index fc7de49937b..b6e70710950 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java @@ -1437,36 +1437,31 @@ protected void implementGetName(BeanInfo bean, ClassCreator beanCreator) { private ResultHandle wrapCurrentInjectionPoint(ClassOutput classOutput, ClassCreator beanCreator, BeanInfo bean, MethodCreator constructor, InjectionPointInfo injectionPoint, int paramIdx) { - // Collect qualifiers - ResultHandle requiredQualifiersHandle = constructor.newInstance(MethodDescriptor.ofConstructor(HashSet.class)); - for (AnnotationInstance qualifierAnnotation : injectionPoint.getRequiredQualifiers()) { - BuiltinQualifier qualifier = BuiltinQualifier.of(qualifierAnnotation); - if (qualifier != null) { - constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, requiredQualifiersHandle, - qualifier.getLiteralInstance(constructor)); - } else { - // Create annotation literal if needed - ClassInfo qualifierClass = bean.getDeployment().getQualifier(qualifierAnnotation.name()); - constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, requiredQualifiersHandle, - annotationLiterals.process(constructor, - classOutput, qualifierClass, qualifierAnnotation, - Types.getPackageName(beanCreator.getClassName()))); - } - } - // Collect all annotations - ResultHandle annotationsHandle = constructor.newInstance(MethodDescriptor.ofConstructor(HashSet.class)); + ResultHandle requiredQualifiersHandle = collectQualifiers(classOutput, beanCreator, bean.getDeployment(), constructor, + injectionPoint, + annotationLiterals); + ResultHandle annotationsHandle = collectAnnotations(classOutput, beanCreator, bean.getDeployment(), constructor, + injectionPoint, annotationLiterals); + ResultHandle javaMemberHandle = getJavaMemberHandle(constructor, injectionPoint); + return constructor.newInstance( + MethodDescriptor.ofConstructor(CurrentInjectionPointProvider.class, InjectableBean.class, + InjectableReferenceProvider.class, java.lang.reflect.Type.class, + Set.class, Set.class, Member.class, int.class), + constructor.getThis(), constructor.getMethodParam(paramIdx), + Types.getTypeHandle(constructor, injectionPoint.getRequiredType()), + requiredQualifiersHandle, annotationsHandle, javaMemberHandle, constructor.load(injectionPoint.getPosition())); + } + + static ResultHandle getJavaMemberHandle(MethodCreator constructor, + InjectionPointInfo injectionPoint) { ResultHandle javaMemberHandle; - Collection<AnnotationInstance> annotations; if (Kind.FIELD.equals(injectionPoint.getTarget().kind())) { FieldInfo field = injectionPoint.getTarget().asField(); - annotations = bean.getDeployment().getAnnotations(field); javaMemberHandle = constructor.invokeStaticMethod(MethodDescriptors.REFLECTIONS_FIND_FIELD, constructor.loadClass(field.declaringClass().name().toString()), constructor.load(field.name())); } else { MethodInfo method = injectionPoint.getTarget().asMethod(); - annotations = InjectionPointInfo.getParameterAnnotations(bean.getDeployment(), - method, injectionPoint.getPosition()); if (method.name().equals(Methods.INIT)) { // Reflections.findConstructor(org.foo.SimpleBean.class,java.lang.String.class) ResultHandle[] paramsHandles = new ResultHandle[2]; @@ -1493,26 +1488,57 @@ private ResultHandle wrapCurrentInjectionPoint(ClassOutput classOutput, ClassCre javaMemberHandle = constructor.invokeStaticMethod(MethodDescriptors.REFLECTIONS_FIND_METHOD, paramsHandles); } } + return javaMemberHandle; + } + + static ResultHandle collectAnnotations(ClassOutput classOutput, ClassCreator beanCreator, BeanDeployment beanDeployment, + MethodCreator constructor, + InjectionPointInfo injectionPoint, AnnotationLiteralProcessor annotationLiterals) { + ResultHandle annotationsHandle = constructor.newInstance(MethodDescriptor.ofConstructor(HashSet.class)); + Collection<AnnotationInstance> annotations; + if (Kind.FIELD.equals(injectionPoint.getTarget().kind())) { + FieldInfo field = injectionPoint.getTarget().asField(); + annotations = beanDeployment.getAnnotations(field); + } else { + MethodInfo method = injectionPoint.getTarget().asMethod(); + annotations = InjectionPointInfo.getParameterAnnotations(beanDeployment, + method, injectionPoint.getPosition()); + } for (AnnotationInstance annotation : annotations) { if (DotNames.INJECT.equals(annotation.name())) { constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, annotationsHandle, constructor.readStaticField(FieldDescriptor.of(InjectLiteral.class, "INSTANCE", InjectLiteral.class))); } else { // Create annotation literal if needed - ClassInfo literalClass = bean.getDeployment().getIndex().getClassByName(annotation.name()); + ClassInfo literalClass = beanDeployment.getIndex().getClassByName(annotation.name()); constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, annotationsHandle, annotationLiterals.process(constructor, classOutput, literalClass, annotation, Types.getPackageName(beanCreator.getClassName()))); } } - return constructor.newInstance( - MethodDescriptor.ofConstructor(CurrentInjectionPointProvider.class, InjectableBean.class, - InjectableReferenceProvider.class, java.lang.reflect.Type.class, - Set.class, Set.class, Member.class, int.class), - constructor.getThis(), constructor.getMethodParam(paramIdx), - Types.getTypeHandle(constructor, injectionPoint.getRequiredType()), - requiredQualifiersHandle, annotationsHandle, javaMemberHandle, constructor.load(injectionPoint.getPosition())); + return annotationsHandle; + } + + static ResultHandle collectQualifiers(ClassOutput classOutput, ClassCreator beanCreator, BeanDeployment beanDeployment, + MethodCreator constructor, + InjectionPointInfo injectionPoint, AnnotationLiteralProcessor annotationLiterals) { + ResultHandle requiredQualifiersHandle = constructor.newInstance(MethodDescriptor.ofConstructor(HashSet.class)); + for (AnnotationInstance qualifierAnnotation : injectionPoint.getRequiredQualifiers()) { + BuiltinQualifier qualifier = BuiltinQualifier.of(qualifierAnnotation); + if (qualifier != null) { + constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, requiredQualifiersHandle, + qualifier.getLiteralInstance(constructor)); + } else { + // Create annotation literal if needed + ClassInfo qualifierClass = beanDeployment.getQualifier(qualifierAnnotation.name()); + constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, requiredQualifiersHandle, + annotationLiterals.process(constructor, + classOutput, qualifierClass, qualifierAnnotation, + Types.getPackageName(beanCreator.getClassName()))); + } + } + return requiredQualifiersHandle; } } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java index 6b575c2bbe7..e6b48f29cc3 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java @@ -19,6 +19,7 @@ import io.quarkus.arc.BeanManagerProvider; import io.quarkus.arc.BeanMetadataProvider; import io.quarkus.arc.EventProvider; +import io.quarkus.arc.InjectableBean; import io.quarkus.arc.InjectableReferenceProvider; import io.quarkus.arc.InjectionPointProvider; import io.quarkus.arc.InstanceProvider; @@ -30,6 +31,7 @@ import io.quarkus.gizmo.MethodCreator; import io.quarkus.gizmo.MethodDescriptor; import io.quarkus.gizmo.ResultHandle; +import java.lang.reflect.Member; import java.util.HashSet; import java.util.Set; import java.util.function.Predicate; @@ -49,137 +51,125 @@ void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionP ClassCreator clazzCreator, MethodCreator constructor, String providerName, AnnotationLiteralProcessor annotationLiterals) { - ResultHandle qualifiers = constructor.newInstance(MethodDescriptor.ofConstructor(HashSet.class)); - if (!injectionPoint.getRequiredQualifiers().isEmpty()) { - // Set<Annotation> instanceProvider1Qualifiers = new HashSet<>() - // instanceProvider1Qualifiers.add(javax.enterprise.inject.Default.Literal.INSTANCE) - - for (AnnotationInstance qualifierAnnotation : injectionPoint.getRequiredQualifiers()) { - BuiltinQualifier qualifier = BuiltinQualifier.of(qualifierAnnotation); - if (qualifier != null) { - constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, qualifiers, - qualifier.getLiteralInstance(constructor)); - } else { - // Create annotation literal first - ClassInfo qualifierClass = beanDeployment.getQualifier(qualifierAnnotation.name()); - constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, qualifiers, - annotationLiterals.process(constructor, classOutput, - qualifierClass, qualifierAnnotation, - Types.getPackageName(clazzCreator.getClassName()))); - } - } - } + ResultHandle qualifiers = BeanGenerator.collectQualifiers(classOutput, clazzCreator, beanDeployment, constructor, + injectionPoint, + annotationLiterals); ResultHandle parameterizedType = Types.getTypeHandle(constructor, injectionPoint.getRequiredType()); + ResultHandle annotationsHandle = BeanGenerator.collectAnnotations(classOutput, clazzCreator, beanDeployment, + constructor, + injectionPoint, annotationLiterals); + ResultHandle javaMemberHandle = BeanGenerator.getJavaMemberHandle(constructor, injectionPoint); ResultHandle instanceProvider = constructor.newInstance( - MethodDescriptor.ofConstructor(InstanceProvider.class, java.lang.reflect.Type.class, Set.class), - parameterizedType, qualifiers); + MethodDescriptor.ofConstructor(InstanceProvider.class, java.lang.reflect.Type.class, Set.class, + InjectableBean.class, Set.class, Member.class, int.class), + parameterizedType, qualifiers, constructor.getThis(), annotationsHandle, javaMemberHandle, + constructor.load(injectionPoint.getPosition())); constructor.writeInstanceField( FieldDescriptor.of(clazzCreator.getClassName(), providerName, InjectableReferenceProvider.class.getName()), constructor.getThis(), instanceProvider); } - }, ip -> ip.getKind() == InjectionPointKind.CDI && (DotNames.INSTANCE.equals(ip.getRequiredType().name()) - || DotNames.PROVIDER.equals(ip.getRequiredType().name()))), INJECTION_POINT(DotNames.INJECTION_POINT, - new Generator() { - @Override - void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionPointInfo injectionPoint, - ClassCreator clazzCreator, - MethodCreator constructor, String providerName, AnnotationLiteralProcessor annotationLiterals) { - // this.injectionPointProvider1 = new InjectionPointProvider(); - constructor.writeInstanceField( - FieldDescriptor.of(clazzCreator.getClassName(), providerName, - InjectableReferenceProvider.class.getName()), - constructor.getThis(), - constructor.newInstance(MethodDescriptor.ofConstructor(InjectionPointProvider.class))); - } - }), BEAN(DotNames.BEAN, new Generator() { - @Override - void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionPointInfo injectionPoint, - ClassCreator clazzCreator, - MethodCreator constructor, String providerName, AnnotationLiteralProcessor annotationLiterals) { - // this.beanProvider1 = new BeanMetadataProvider<>(); - constructor.writeInstanceField( - FieldDescriptor.of(clazzCreator.getClassName(), providerName, - InjectableReferenceProvider.class.getName()), - constructor.getThis(), - constructor.newInstance(MethodDescriptor.ofConstructor(BeanMetadataProvider.class))); - } - }), BEAN_MANAGER(DotNames.BEAN_MANAGER, new Generator() { - @Override - void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionPointInfo injectionPoint, - ClassCreator clazzCreator, - MethodCreator constructor, String providerName, AnnotationLiteralProcessor annotationLiterals) { - constructor.writeInstanceField( - FieldDescriptor.of(clazzCreator.getClassName(), providerName, - InjectableReferenceProvider.class.getName()), - constructor.getThis(), - constructor.newInstance(MethodDescriptor.ofConstructor(BeanManagerProvider.class))); - } - }), EVENT(DotNames.EVENT, new Generator() { - @Override - void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionPointInfo injectionPoint, - ClassCreator clazzCreator, - MethodCreator constructor, String providerName, AnnotationLiteralProcessor annotationLiterals) { - - ResultHandle qualifiers = constructor.newInstance(MethodDescriptor.ofConstructor(HashSet.class)); - if (!injectionPoint.getRequiredQualifiers().isEmpty()) { - // Set<Annotation> instanceProvider1Qualifiers = new HashSet<>() - // instanceProvider1Qualifiers.add(javax.enterprise.inject.Default.Literal.INSTANCE) - - for (AnnotationInstance qualifierAnnotation : injectionPoint.getRequiredQualifiers()) { - BuiltinQualifier qualifier = BuiltinQualifier.of(qualifierAnnotation); - if (qualifier != null) { - constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, qualifiers, - qualifier.getLiteralInstance(constructor)); - } else { - // Create annotation literal first - ClassInfo qualifierClass = beanDeployment.getQualifier(qualifierAnnotation.name()); - constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, qualifiers, - annotationLiterals.process(constructor, classOutput, - qualifierClass, qualifierAnnotation, - Types.getPackageName(clazzCreator.getClassName()))); - } - } + }, BuiltinBean::isInstanceInjectionPoint), INJECTION_POINT(DotNames.INJECTION_POINT, + new Generator() { + @Override + void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionPointInfo injectionPoint, + ClassCreator clazzCreator, + MethodCreator constructor, String providerName, AnnotationLiteralProcessor annotationLiterals) { + // this.injectionPointProvider1 = new InjectionPointProvider(); + constructor.writeInstanceField( + FieldDescriptor.of(clazzCreator.getClassName(), providerName, + InjectableReferenceProvider.class.getName()), + constructor.getThis(), + constructor.newInstance(MethodDescriptor.ofConstructor(InjectionPointProvider.class))); + } + }), BEAN(DotNames.BEAN, new Generator() { + @Override + void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionPointInfo injectionPoint, + ClassCreator clazzCreator, + MethodCreator constructor, String providerName, AnnotationLiteralProcessor annotationLiterals) { + // this.beanProvider1 = new BeanMetadataProvider<>(); + constructor.writeInstanceField( + FieldDescriptor.of(clazzCreator.getClassName(), providerName, + InjectableReferenceProvider.class.getName()), + constructor.getThis(), + constructor.newInstance(MethodDescriptor.ofConstructor(BeanMetadataProvider.class))); + } + }), BEAN_MANAGER(DotNames.BEAN_MANAGER, new Generator() { + @Override + void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionPointInfo injectionPoint, + ClassCreator clazzCreator, + MethodCreator constructor, String providerName, AnnotationLiteralProcessor annotationLiterals) { + constructor.writeInstanceField( + FieldDescriptor.of(clazzCreator.getClassName(), providerName, + InjectableReferenceProvider.class.getName()), + constructor.getThis(), + constructor.newInstance(MethodDescriptor.ofConstructor(BeanManagerProvider.class))); + } + }), EVENT(DotNames.EVENT, new Generator() { + @Override + void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionPointInfo injectionPoint, + ClassCreator clazzCreator, + MethodCreator constructor, String providerName, AnnotationLiteralProcessor annotationLiterals) { + + ResultHandle qualifiers = constructor.newInstance(MethodDescriptor.ofConstructor(HashSet.class)); + if (!injectionPoint.getRequiredQualifiers().isEmpty()) { + // Set<Annotation> instanceProvider1Qualifiers = new HashSet<>() + // instanceProvider1Qualifiers.add(javax.enterprise.inject.Default.Literal.INSTANCE) + + for (AnnotationInstance qualifierAnnotation : injectionPoint.getRequiredQualifiers()) { + BuiltinQualifier qualifier = BuiltinQualifier.of(qualifierAnnotation); + if (qualifier != null) { + constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, qualifiers, + qualifier.getLiteralInstance(constructor)); + } else { + // Create annotation literal first + ClassInfo qualifierClass = beanDeployment.getQualifier(qualifierAnnotation.name()); + constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, qualifiers, + annotationLiterals.process(constructor, classOutput, + qualifierClass, qualifierAnnotation, + Types.getPackageName(clazzCreator.getClassName()))); } - ResultHandle parameterizedType = Types.getTypeHandle(constructor, injectionPoint.getRequiredType()); - ResultHandle eventProvider = constructor.newInstance( - MethodDescriptor.ofConstructor(EventProvider.class, java.lang.reflect.Type.class, - Set.class), - parameterizedType, qualifiers); - constructor.writeInstanceField( - FieldDescriptor.of(clazzCreator.getClassName(), providerName, - InjectableReferenceProvider.class.getName()), - constructor.getThis(), eventProvider); } - }), RESOURCE(DotNames.OBJECT, new Generator() { - @Override - void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionPointInfo injectionPoint, - ClassCreator clazzCreator, - MethodCreator constructor, String providerName, AnnotationLiteralProcessor annotationLiterals) { - - ResultHandle annotations = constructor.newInstance(MethodDescriptor.ofConstructor(HashSet.class)); - // For a resource field the required qualifiers contain all annotations declared on the field - if (!injectionPoint.getRequiredQualifiers().isEmpty()) { - for (AnnotationInstance annotation : injectionPoint.getRequiredQualifiers()) { - // Create annotation literal first - ClassInfo annotationClass = beanDeployment.getIndex().getClassByName(annotation.name()); - constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, annotations, - annotationLiterals.process(constructor, classOutput, - annotationClass, annotation, - Types.getPackageName(clazzCreator.getClassName()))); - } - } - ResultHandle parameterizedType = Types.getTypeHandle(constructor, injectionPoint.getRequiredType()); - ResultHandle resourceProvider = constructor.newInstance( - MethodDescriptor.ofConstructor(ResourceProvider.class, java.lang.reflect.Type.class, - Set.class), - parameterizedType, annotations); - constructor.writeInstanceField( - FieldDescriptor.of(clazzCreator.getClassName(), providerName, - InjectableReferenceProvider.class.getName()), - constructor.getThis(), resourceProvider); + } + ResultHandle parameterizedType = Types.getTypeHandle(constructor, injectionPoint.getRequiredType()); + ResultHandle eventProvider = constructor.newInstance( + MethodDescriptor.ofConstructor(EventProvider.class, java.lang.reflect.Type.class, + Set.class), + parameterizedType, qualifiers); + constructor.writeInstanceField( + FieldDescriptor.of(clazzCreator.getClassName(), providerName, + InjectableReferenceProvider.class.getName()), + constructor.getThis(), eventProvider); + } + }), RESOURCE(DotNames.OBJECT, new Generator() { + @Override + void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionPointInfo injectionPoint, + ClassCreator clazzCreator, + MethodCreator constructor, String providerName, AnnotationLiteralProcessor annotationLiterals) { + + ResultHandle annotations = constructor.newInstance(MethodDescriptor.ofConstructor(HashSet.class)); + // For a resource field the required qualifiers contain all annotations declared on the field + if (!injectionPoint.getRequiredQualifiers().isEmpty()) { + for (AnnotationInstance annotation : injectionPoint.getRequiredQualifiers()) { + // Create annotation literal first + ClassInfo annotationClass = beanDeployment.getIndex().getClassByName(annotation.name()); + constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, annotations, + annotationLiterals.process(constructor, classOutput, + annotationClass, annotation, + Types.getPackageName(clazzCreator.getClassName()))); } - }, ip -> ip.getKind() == InjectionPointKind.RESOURCE); + } + ResultHandle parameterizedType = Types.getTypeHandle(constructor, injectionPoint.getRequiredType()); + ResultHandle resourceProvider = constructor.newInstance( + MethodDescriptor.ofConstructor(ResourceProvider.class, java.lang.reflect.Type.class, + Set.class), + parameterizedType, annotations); + constructor.writeInstanceField( + FieldDescriptor.of(clazzCreator.getClassName(), providerName, + InjectableReferenceProvider.class.getName()), + constructor.getThis(), resourceProvider); + } + }, ip -> ip.getKind() == InjectionPointKind.RESOURCE); private final DotName rawTypeDotName; @@ -188,8 +178,7 @@ void generate(ClassOutput classOutput, BeanDeployment beanDeployment, InjectionP private final Predicate<InjectionPointInfo> matcher; BuiltinBean(DotName rawTypeDotName, Generator generator) { - this(rawTypeDotName, generator, - ip -> ip.getKind() == InjectionPointKind.CDI && rawTypeDotName.equals(ip.getRequiredType().name())); + this(rawTypeDotName, generator, ip -> isCdiAndRawTypeMatches(ip, rawTypeDotName)); } BuiltinBean(DotName rawTypeDotName, Generator generator, Predicate<InjectionPointInfo> matcher) { @@ -231,4 +220,19 @@ abstract void generate(ClassOutput classOutput, BeanDeployment beanDeployment, I } + private static boolean isCdiAndRawTypeMatches(InjectionPointInfo injectionPoint, DotName rawTypeDotName) { + if (injectionPoint.getKind() != InjectionPointKind.CDI) { + return false; + } + return rawTypeDotName.equals(injectionPoint.getRequiredType().name()); + } + + private static boolean isInstanceInjectionPoint(InjectionPointInfo injectionPoint) { + if (injectionPoint.getKind() != InjectionPointKind.CDI) { + return false; + } + return DotNames.INSTANCE.equals(injectionPoint.getRequiredType().name()) + || DotNames.PROVIDER.equals(injectionPoint.getRequiredType().name()); + } + } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java index e223e1f3db8..5720628ea47 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java @@ -35,6 +35,7 @@ import io.quarkus.gizmo.MethodCreator; import io.quarkus.gizmo.MethodDescriptor; import io.quarkus.gizmo.ResultHandle; +import java.lang.reflect.Member; import java.lang.reflect.Modifier; import java.lang.reflect.Type; import java.util.ArrayList; @@ -306,29 +307,23 @@ protected void createConstructor(ClassOutput classOutput, ClassCreator observerC .anyMatch(ip -> BuiltinBean.INJECTION_POINT.getRawTypeDotName().equals(ip.getRequiredType().name()))) { // IMPL NOTE: Injection point resolves to a dependent bean that injects InjectionPoint metadata and so we need to wrap the injectable // reference provider - ResultHandle requiredQualifiersHandle = constructor - .newInstance(MethodDescriptor.ofConstructor(HashSet.class)); - for (AnnotationInstance qualifierAnnotation : injectionPoint.getRequiredQualifiers()) { - BuiltinQualifier qualifier = BuiltinQualifier.of(qualifierAnnotation); - if (qualifier != null) { - constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, requiredQualifiersHandle, - qualifier.getLiteralInstance(constructor)); - } else { - // Create annotation literal first - ClassInfo qualifierClass = observer.getDeclaringBean().getDeployment() - .getQualifier(qualifierAnnotation.name()); - constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, requiredQualifiersHandle, - annotationLiterals.process(constructor, - classOutput, qualifierClass, qualifierAnnotation, - Types.getPackageName(observerCreator.getClassName()))); - } - } + ResultHandle requiredQualifiersHandle = BeanGenerator.collectQualifiers(classOutput, observerCreator, + observer.getDeclaringBean().getDeployment(), constructor, + injectionPoint, + annotationLiterals); + ResultHandle annotationsHandle = BeanGenerator.collectAnnotations(classOutput, observerCreator, + observer.getDeclaringBean().getDeployment(), constructor, + injectionPoint, annotationLiterals); + ResultHandle javaMemberHandle = BeanGenerator.getJavaMemberHandle(constructor, injectionPoint); ResultHandle wrapHandle = constructor.newInstance( - MethodDescriptor.ofConstructor(CurrentInjectionPointProvider.class, + MethodDescriptor.ofConstructor(CurrentInjectionPointProvider.class, InjectableBean.class, InjectableReferenceProvider.class, java.lang.reflect.Type.class, - Set.class), - constructor.getMethodParam(paramIdx++), - Types.getTypeHandle(constructor, injectionPoint.getRequiredType()), requiredQualifiersHandle); + Set.class, Set.class, Member.class, int.class), + constructor.getThis(), constructor.getMethodParam(paramIdx++), + Types.getTypeHandle(constructor, injectionPoint.getRequiredType()), + requiredQualifiersHandle, annotationsHandle, javaMemberHandle, + constructor.load(injectionPoint.getPosition())); + constructor.writeInstanceField(FieldDescriptor.of(observerCreator.getClassName(), injectionPointToProviderField.get(injectionPoint), InjectableReferenceProvider.class.getName()), constructor.getThis(), wrapHandle); diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanManagerImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanManagerImpl.java index 0098db3f8a0..14f0430f42e 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanManagerImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanManagerImpl.java @@ -18,6 +18,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Objects; @@ -48,6 +49,7 @@ import javax.enterprise.inject.spi.Interceptor; import javax.enterprise.inject.spi.ObserverMethod; import javax.enterprise.inject.spi.ProducerFactory; +import javax.enterprise.util.TypeLiteral; import javax.interceptor.InterceptorBinding; /** @@ -55,6 +57,10 @@ */ public class BeanManagerImpl implements BeanManager { + @SuppressWarnings("serial") + static final TypeLiteral<Instance<Object>> INSTANCE_LITERAL = new TypeLiteral<Instance<Object>>() { + }; + static final LazyValue<BeanManagerImpl> INSTANCE = new LazyValue<>(BeanManagerImpl::new); @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -279,7 +285,8 @@ public Event<Object> getEvent() { @Override public Instance<Object> createInstance() { - return new InstanceImpl<>(Object.class, null, new CreationalContextImpl<>()); + return new InstanceImpl<>(null, INSTANCE_LITERAL.getType(), Collections.emptySet(), new CreationalContextImpl<>(), + Collections.emptySet(), null, -1); } } diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/CurrentInjectionPointProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/CurrentInjectionPointProvider.java index 7859d7739e7..d310eb7d4a9 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/CurrentInjectionPointProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/CurrentInjectionPointProvider.java @@ -45,7 +45,8 @@ */ public class CurrentInjectionPointProvider<T> implements InjectableReferenceProvider<T> { - static final InjectionPoint EMPTY = new InjectionPointImpl(Object.class, Collections.emptySet(), null, null, null, -1); + static final InjectionPoint EMPTY = new InjectionPointImpl(Object.class, Object.class, Collections.emptySet(), null, null, + null, -1); private final InjectableReferenceProvider<T> delegate; @@ -54,7 +55,8 @@ public CurrentInjectionPointProvider(InjectableBean<?> bean, InjectableReferenceProvider<T> delegate, Type requiredType, Set<Annotation> qualifiers, Set<Annotation> annotations, Member javaMember, int position) { this.delegate = delegate; - this.injectionPoint = new InjectionPointImpl(requiredType, qualifiers, bean, annotations, javaMember, position); + this.injectionPoint = new InjectionPointImpl(requiredType, requiredType, qualifiers, bean, annotations, javaMember, + position); } @Override @@ -72,7 +74,7 @@ public T get(CreationalContext<T> creationalContext) { } } - private static class InjectionPointImpl implements InjectionPoint { + static class InjectionPointImpl implements InjectionPoint { private final Type requiredType; private final Set<Annotation> qualifiers; @@ -80,15 +82,17 @@ private static class InjectionPointImpl implements InjectionPoint { private final Annotated annotated; private final Member member; - InjectionPointImpl(Type requiredType, Set<Annotation> qualifiers, InjectableBean<?> bean, Set<Annotation> annotations, + InjectionPointImpl(Type injectionPointType, Type requiredType, Set<Annotation> qualifiers, InjectableBean<?> bean, + Set<Annotation> annotations, Member javaMember, int position) { this.requiredType = requiredType; this.qualifiers = qualifiers; this.bean = bean; if (javaMember instanceof Executable) { - this.annotated = new AnnotatedParameterImpl<>(requiredType, annotations, position, (Executable) javaMember); + this.annotated = new AnnotatedParameterImpl<>(injectionPointType, annotations, position, + (Executable) javaMember); } else { - this.annotated = new AnnotatedFieldImpl<>(requiredType, annotations, (Field) javaMember); + this.annotated = new AnnotatedFieldImpl<>(injectionPointType, annotations, (Field) javaMember); } this.member = javaMember; } diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceImpl.java index 779fbed4a69..2c51f5fc039 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceImpl.java @@ -16,7 +16,9 @@ package io.quarkus.arc; +import io.quarkus.arc.CurrentInjectionPointProvider.InjectionPointImpl; import java.lang.annotation.Annotation; +import java.lang.reflect.Member; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Collection; @@ -27,6 +29,7 @@ import javax.enterprise.inject.AmbiguousResolutionException; import javax.enterprise.inject.Instance; import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.spi.InjectionPoint; import javax.enterprise.util.TypeLiteral; import javax.inject.Provider; @@ -38,34 +41,43 @@ private static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[] {}; - private final Type type; - - private final Set<Annotation> qualifiers; - private final CreationalContextImpl<?> creationalContext; + private final Set<InjectableBean<?>> resolvedBeans; + + private final Type injectionPointType; + private final Type requiredType; + private final Set<Annotation> requiredQualifiers; + private final InjectableBean<?> targetBean; + private final Set<Annotation> annotations; + private final Member javaMember; + private final int position; + + InstanceImpl(InjectableBean<?> targetBean, Type type, Set<Annotation> qualifiers, + CreationalContextImpl<?> creationalContext, Set<Annotation> annotations, Member javaMember, int position) { + this(targetBean, type, getRequiredType(type), qualifiers, creationalContext, annotations, javaMember, position); + } - private final Set<InjectableBean<?>> beans; + InstanceImpl(InstanceImpl<?> parent, Type requiredType, Set<Annotation> requiredQualifiers) { + this(parent.targetBean, parent.injectionPointType, requiredType, requiredQualifiers, parent.creationalContext, + parent.annotations, parent.javaMember, parent.position); + } - InstanceImpl(Type type, Set<Annotation> qualifiers, CreationalContextImpl<?> creationalContext) { - if (type instanceof ParameterizedType) { - ParameterizedType parameterizedType = (ParameterizedType) type; - if (Provider.class.isAssignableFrom(Types.getRawType(parameterizedType.getRawType()))) { - this.type = parameterizedType.getActualTypeArguments()[0]; - } else { - this.type = type; - } - } else { - this.type = type; - } - this.qualifiers = qualifiers != null ? qualifiers : Collections.emptySet(); + InstanceImpl(InjectableBean<?> targetBean, Type injectionPointType, Type requiredType, Set<Annotation> requiredQualifiers, + CreationalContextImpl<?> creationalContext, Set<Annotation> annotations, Member javaMember, int position) { + this.injectionPointType = injectionPointType; + this.requiredType = requiredType; + this.requiredQualifiers = requiredQualifiers != null ? requiredQualifiers : Collections.emptySet(); this.creationalContext = creationalContext; - - if (this.qualifiers.isEmpty() && Object.class.equals(type)) { + if (this.requiredQualifiers.isEmpty() && Object.class.equals(requiredType)) { // Do not prefetch the beans for Instance<Object> with no qualifiers - this.beans = null; + this.resolvedBeans = null; } else { - this.beans = resolve(); + this.resolvedBeans = resolve(); } + this.targetBean = targetBean; + this.annotations = annotations; + this.javaMember = javaMember; + this.position = position; } @Override @@ -87,23 +99,23 @@ public T get() { @Override public Instance<T> select(Annotation... qualifiers) { - Set<Annotation> newQualifiers = new HashSet<>(this.qualifiers); + Set<Annotation> newQualifiers = new HashSet<>(this.requiredQualifiers); Collections.addAll(newQualifiers, qualifiers); - return new InstanceImpl<>(type, newQualifiers, creationalContext); + return new InstanceImpl<>(this, requiredType, newQualifiers); } @Override public <U extends T> Instance<U> select(Class<U> subtype, Annotation... qualifiers) { - Set<Annotation> newQualifiers = new HashSet<>(this.qualifiers); + Set<Annotation> newQualifiers = new HashSet<>(this.requiredQualifiers); Collections.addAll(newQualifiers, qualifiers); - return new InstanceImpl<>(subtype, newQualifiers, creationalContext); + return new InstanceImpl<>(this, subtype, newQualifiers); } @Override public <U extends T> Instance<U> select(TypeLiteral<U> subtype, Annotation... qualifiers) { - Set<Annotation> newQualifiers = new HashSet<>(this.qualifiers); + Set<Annotation> newQualifiers = new HashSet<>(this.requiredQualifiers); Collections.addAll(newQualifiers, qualifiers); - return new InstanceImpl<>(subtype.getType(), newQualifiers, creationalContext); + return new InstanceImpl<>(this, subtype.getType(), newQualifiers); } @Override @@ -131,17 +143,29 @@ void destroy() { private T getBeanInstance(InjectableBean<T> bean) { CreationalContextImpl<T> ctx = creationalContext.child(); - // TODO current injection point? - T instance = bean.get(ctx); + InjectionPoint prev = InjectionPointProvider.CURRENT.get(); + InjectionPointProvider.CURRENT + .set(new InjectionPointImpl(injectionPointType, requiredType, requiredQualifiers, targetBean, annotations, + javaMember, position)); + T instance; + try { + instance = bean.get(ctx); + } finally { + if (prev != null) { + InjectionPointProvider.CURRENT.set(prev); + } else { + InjectionPointProvider.CURRENT.remove(); + } + } return instance; } private Set<InjectableBean<?>> beans() { - return beans != null ? beans : resolve(); + return resolvedBeans != null ? resolvedBeans : resolve(); } private Set<InjectableBean<?>> resolve() { - return ArcContainerImpl.instance().getResolvedBeans(type, qualifiers.toArray(EMPTY_ANNOTATION_ARRAY)); + return ArcContainerImpl.instance().getResolvedBeans(requiredType, requiredQualifiers.toArray(EMPTY_ANNOTATION_ARRAY)); } class InstanceIterator implements Iterator<T> { @@ -170,4 +194,14 @@ public T next() { } + private static Type getRequiredType(Type type) { + if (type instanceof ParameterizedType) { + ParameterizedType parameterizedType = (ParameterizedType) type; + if (Provider.class.isAssignableFrom(Types.getRawType(parameterizedType.getRawType()))) { + return parameterizedType.getActualTypeArguments()[0]; + } + } + throw new IllegalArgumentException("Not a valid type: " + type); + } + } diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceProvider.java index 7a6fe1a8bcd..6605ccaa0bc 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceProvider.java @@ -17,6 +17,7 @@ package io.quarkus.arc; import java.lang.annotation.Annotation; +import java.lang.reflect.Member; import java.lang.reflect.Type; import java.util.Set; import javax.enterprise.context.spi.CreationalContext; @@ -29,17 +30,26 @@ public class InstanceProvider<T> implements InjectableReferenceProvider<Instance<T>> { private final Type requiredType; - private final Set<Annotation> qualifiers; + private final InjectableBean<?> targetBean; + private final Set<Annotation> annotations; + private final Member javaMember; + private final int position; - public InstanceProvider(Type type, Set<Annotation> qualifiers) { + public InstanceProvider(Type type, Set<Annotation> qualifiers, InjectableBean<?> targetBean, Set<Annotation> annotations, + Member javaMember, int position) { this.requiredType = type; this.qualifiers = qualifiers; + this.targetBean = targetBean; + this.annotations = annotations; + this.javaMember = javaMember; + this.position = position; } @Override public Instance<T> get(CreationalContext<Instance<T>> creationalContext) { - return new InstanceImpl<T>(requiredType, qualifiers, CreationalContextImpl.unwrap(creationalContext)); + return new InstanceImpl<T>(targetBean, requiredType, qualifiers, CreationalContextImpl.unwrap(creationalContext), + annotations, javaMember, position); } } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java index c935d56ea7e..ab60da7613e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java @@ -27,12 +27,14 @@ import java.util.Set; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Default; +import javax.enterprise.inject.Instance; import javax.enterprise.inject.spi.AnnotatedConstructor; import javax.enterprise.inject.spi.AnnotatedField; import javax.enterprise.inject.spi.AnnotatedParameter; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.InjectionPoint; +import javax.enterprise.util.TypeLiteral; import javax.inject.Inject; import javax.inject.Singleton; import org.junit.Rule; @@ -43,7 +45,7 @@ public class InjectionPointMetadataTest { @Rule public ArcTestContainer container = new ArcTestContainer(Controller.class, Controlled.class); - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes", "serial" }) @Test public void testInjectionPointMetadata() { ArcContainer arc = Arc.container(); @@ -83,7 +85,7 @@ public void testInjectionPointMetadata() { // Constructor InjectionPoint ctorInjectionPoint = controller.controlledCtor.injectionPoint; assertNotNull(ctorInjectionPoint); - assertEquals(Controlled.class, methodInjectionPoint.getType()); + assertEquals(Controlled.class, ctorInjectionPoint.getType()); assertTrue(ctorInjectionPoint.getAnnotated() instanceof AnnotatedParameter); assertEquals(bean, ctorInjectionPoint.getBean()); AnnotatedParameter<Controller> ctorParam = (AnnotatedParameter<Controller>) ctorInjectionPoint.getAnnotated(); @@ -94,6 +96,27 @@ public void testInjectionPointMetadata() { assertEquals(1, ctorParam.getAnnotations().size()); assertTrue(ctorParam.getDeclaringCallable() instanceof AnnotatedConstructor); assertEquals(Controller.class, ctorParam.getDeclaringCallable().getJavaMember().getDeclaringClass()); + + // Instance + InjectionPoint instanceInjectionPoint = controller.instanceControlled.get().injectionPoint; + assertNotNull(instanceInjectionPoint); + assertEquals(Controlled.class, instanceInjectionPoint.getType()); + qualifiers = instanceInjectionPoint.getQualifiers(); + assertEquals(1, qualifiers.size()); + assertEquals(Default.class, qualifiers.iterator().next().annotationType()); + bean = instanceInjectionPoint.getBean(); + assertNotNull(bean); + assertTrue(bean.getTypes().stream().anyMatch(t -> t.equals(Controller.class))); + assertNotNull(instanceInjectionPoint.getAnnotated()); + assertTrue(instanceInjectionPoint.getAnnotated() instanceof AnnotatedField); + annotatedField = (AnnotatedField) instanceInjectionPoint.getAnnotated(); + assertEquals("instanceControlled", annotatedField.getJavaMember().getName()); + assertEquals(new TypeLiteral<Instance<Controlled>>() { + }.getType(), annotatedField.getBaseType()); + assertTrue(annotatedField.isAnnotationPresent(Inject.class)); + assertTrue(annotatedField.getAnnotation(Singleton.class) == null); + assertTrue(annotatedField.getAnnotations(Singleton.class).isEmpty()); + assertEquals(1, annotatedField.getAnnotations().size()); } @Singleton @@ -106,6 +129,9 @@ static class Controller { Controlled controlledCtor; + @Inject + Instance<Controlled> instanceControlled; + @Inject public Controller(BeanManager beanManager, @Singleton Controlled controlled) { this.controlledCtor = controlled;

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java', 'independent-projects/arc/runtime/src/main/java/io/quarkus/arc/CurrentInjectionPointProvider.java', 'independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceProvider.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java', 'independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java', 'independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanManagerImpl.java', 'independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceImpl.java']

{'.java': 8}